diff --git a/client/src/@types/index.ts b/client/src/@types/index.ts
index e5bc7540..7eef3382 100644
--- a/client/src/@types/index.ts
+++ b/client/src/@types/index.ts
@@ -58,3 +58,4 @@ export interface ActionOptions {
 }
 
 export type ActivityProperty = 'myHighlights' | 'myBookmarks' | 'mySubmissions' | 'myAnswers';
+export type InstrumentActivityProperty = 'highlights' | 'bookmarks';
diff --git a/client/src/__generated__/gql.ts b/client/src/__generated__/gql.ts
index 2b69f278..95203551 100644
--- a/client/src/__generated__/gql.ts
+++ b/client/src/__generated__/gql.ts
@@ -36,7 +36,7 @@ const documents = {
     "\n              fragment ContentBlockHighlightsWithIdOnlyFragment on ContentBlockNode {\n                highlights {\n                  id\n                }\n              }\n            ": types.ContentBlockHighlightsWithIdOnlyFragmentFragmentDoc,
     "\n        mutation UpdateInstrumentBookmark($input: UpdateInstrumentBookmarkInput!) {\n          updateInstrumentBookmark(input: $input) {\n            success\n          }\n        }\n      ": types.UpdateInstrumentBookmarkDocument,
     "\n        mutation UpdateContentBookmark($input: UpdateContentBookmarkInput!) {\n          updateContentBookmark(input: $input) {\n            success\n          }\n        }\n      ": types.UpdateContentBookmarkDocument,
-    "\n    query MyActivitiesQuery {\n      myActivities {\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  ": types.MyActivitiesQueryDocument,
+    "\n    query MyActivitiesQuery {\n      myActivities {\n        instruments {\n          id\n          slug\n          title\n          path\n          highlights {\n            ...HighlightParts\n          }\n          bookmarks {\n            ... on InstrumentBookmarkNode {\n              path\n            }\n          }\n        }\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  ": types.MyActivitiesQueryDocument,
     "\n    query ChapterQuery($id: ID!) {\n      chapter(id: $id) {\n        path\n      }\n    }\n  ": types.ChapterQueryDocument,
     "\n    query ContentBlockQuery($id: ID!) {\n      contentBlock(id: $id) {\n        path\n      }\n    }\n  ": types.ContentBlockQueryDocument,
     "\n  fragment InstrumentParts on InstrumentNode {\n    id\n    title\n    intro\n    slug\n    language\n    bookmarks {\n      uuid\n      note {\n        id\n        text\n      }\n    }\n    type {\n      id\n      name\n      category {\n        id\n        name\n        foreground\n        background\n      }\n      type\n    }\n    contents\n    highlights {\n      ...HighlightParts\n    }\n  }\n": types.InstrumentPartsFragmentDoc,
@@ -156,7 +156,7 @@ export function graphql(source: "\n        mutation UpdateContentBookmark($input
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n    query MyActivitiesQuery {\n      myActivities {\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  "): (typeof documents)["\n    query MyActivitiesQuery {\n      myActivities {\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  "];
+export function graphql(source: "\n    query MyActivitiesQuery {\n      myActivities {\n        instruments {\n          id\n          slug\n          title\n          path\n          highlights {\n            ...HighlightParts\n          }\n          bookmarks {\n            ... on InstrumentBookmarkNode {\n              path\n            }\n          }\n        }\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  "): (typeof documents)["\n    query MyActivitiesQuery {\n      myActivities {\n        instruments {\n          id\n          slug\n          title\n          path\n          highlights {\n            ...HighlightParts\n          }\n          bookmarks {\n            ... on InstrumentBookmarkNode {\n              path\n            }\n          }\n        }\n        topics {\n          id\n          title\n          modules {\n            id\n            slug\n            title\n            metaTitle\n            myHighlights {\n              ...HighlightParts\n            }\n            myBookmarks {\n              ... on ChapterBookmarkNode {\n                chapter {\n                  path\n                }\n                path\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ContentBlockBookmarkNode {\n                id\n                uuid\n                path\n                contentBlock {\n                  id\n                  path\n                }\n                note {\n                  id\n                  text\n                }\n              }\n              ... on ModuleBookmarkNode {\n                path\n                note {\n                  id\n                  text\n                }\n              }\n            }\n            mySubmissions {\n              id\n              text\n              assignment {\n                id\n                title\n                path\n                module {\n                  slug\n                }\n              }\n            }\n            myAnswers {\n              id\n              survey {\n                path\n                id\n                title\n              }\n            }\n          }\n        }\n      }\n    }\n  "];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/__generated__/graphql.ts b/client/src/__generated__/graphql.ts
index 84a7ec12..0d248505 100644
--- a/client/src/__generated__/graphql.ts
+++ b/client/src/__generated__/graphql.ts
@@ -43,7 +43,8 @@ export type Scalars = {
 
 export type ActivityNode = {
   __typename?: 'ActivityNode';
-  topics?: Maybe<Array<TopicNode>>;
+  instruments: Array<InstrumentNode>;
+  topics: Array<TopicNode>;
 };
 
 export type AddCommentInput = {
@@ -791,6 +792,7 @@ export type InstrumentBookmarkNode = Node & {
   id: Scalars['ID']['output'];
   instrument: InstrumentNode;
   note?: Maybe<NoteNode>;
+  path: Scalars['String']['output'];
   user: PrivateUserNode;
   uuid?: Maybe<Scalars['UUID']['output']>;
 };
@@ -814,6 +816,7 @@ export type InstrumentNode = Node & {
   id: Scalars['ID']['output'];
   intro: Scalars['String']['output'];
   language?: Maybe<Scalars['String']['output']>;
+  path: Scalars['String']['output'];
   /** Der Name der Seite, wie er in URLs angezeigt werden soll, z.B. http://domain.com/blog/[my-slug]/ */
   slug: Scalars['String']['output'];
   /** Der Seitentitel, der öffentlich angezeigt werden soll */
@@ -2791,10 +2794,13 @@ export type UpdateContentBookmarkMutation = { __typename?: 'Mutation', updateCon
 export type MyActivitiesQueryQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type MyActivitiesQueryQuery = { __typename?: 'Query', myActivities?: { __typename?: 'ActivityNode', topics?: Array<{ __typename?: 'TopicNode', id: string, title: string, modules?: Array<{ __typename?: 'ModuleNode', id: string, slug: string, title: string, metaTitle: string, myHighlights: Array<(
+export type MyActivitiesQueryQuery = { __typename?: 'Query', myActivities?: { __typename?: 'ActivityNode', instruments: Array<{ __typename?: 'InstrumentNode', id: string, slug: string, title: string, path: string, highlights?: Array<(
+        { __typename?: 'HighlightNode' }
+        & { ' $fragmentRefs'?: { 'HighlightPartsFragment': HighlightPartsFragment } }
+      ) | null> | null, bookmarks?: Array<{ __typename?: 'InstrumentBookmarkNode', path: string } | null> | null }>, topics: Array<{ __typename?: 'TopicNode', id: string, title: string, modules?: Array<{ __typename?: 'ModuleNode', id: string, slug: string, title: string, metaTitle: string, myHighlights: Array<(
           { __typename?: 'HighlightNode' }
           & { ' $fragmentRefs'?: { 'HighlightPartsFragment': HighlightPartsFragment } }
-        )>, myBookmarks?: Array<{ __typename?: 'ChapterBookmarkNode', path?: string | null, chapter: { __typename?: 'ChapterNode', path?: string | null }, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | { __typename?: 'ContentBlockBookmarkNode', id: string, uuid?: any | null, path?: string | null, contentBlock: { __typename?: 'ContentBlockNode', id: string, path?: string | null }, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | { __typename?: 'InstrumentBookmarkNode' } | { __typename?: 'ModuleBookmarkNode', path?: string | null, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | null> | null, mySubmissions?: Array<{ __typename?: 'StudentSubmissionNode', id: string, text: string, assignment: { __typename?: 'AssignmentNode', id: string, title: string, path: string, module: { __typename?: 'ModuleNode', slug: string } } } | null> | null, myAnswers?: Array<{ __typename?: 'AnswerNode', id: string, survey: { __typename?: 'SurveyNode', path: string, id: string, title: string } } | null> | null }> | null }> | null } | null };
+        )>, myBookmarks?: Array<{ __typename?: 'ChapterBookmarkNode', path?: string | null, chapter: { __typename?: 'ChapterNode', path?: string | null }, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | { __typename?: 'ContentBlockBookmarkNode', id: string, uuid?: any | null, path?: string | null, contentBlock: { __typename?: 'ContentBlockNode', id: string, path?: string | null }, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | { __typename?: 'InstrumentBookmarkNode' } | { __typename?: 'ModuleBookmarkNode', path?: string | null, note?: { __typename?: 'NoteNode', id: string, text: string } | null } | null> | null, mySubmissions?: Array<{ __typename?: 'StudentSubmissionNode', id: string, text: string, assignment: { __typename?: 'AssignmentNode', id: string, title: string, path: string, module: { __typename?: 'ModuleNode', slug: string } } } | null> | null, myAnswers?: Array<{ __typename?: 'AnswerNode', id: string, survey: { __typename?: 'SurveyNode', path: string, id: string, title: string } } | null> | null }> | null }> } | null };
 
 export type ChapterQueryQueryVariables = Exact<{
   id: Scalars['ID']['input'];
@@ -2877,7 +2883,7 @@ export const AddHighlightDocument = {"kind":"Document","definitions":[{"kind":"O
 export const AddContentHighlightDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AddContentHighlight"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AddContentHighlightInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"addContentHighlight"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"highlight"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"page"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]} as unknown as DocumentNode<AddContentHighlightMutation, AddContentHighlightMutationVariables>;
 export const UpdateInstrumentBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateInstrumentBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateInstrumentBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateInstrumentBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<UpdateInstrumentBookmarkMutation, UpdateInstrumentBookmarkMutationVariables>;
 export const UpdateContentBookmarkDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateContentBookmark"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateContentBookmarkInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"updateContentBookmark"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"success"}}]}}]}}]} as unknown as DocumentNode<UpdateContentBookmarkMutation, UpdateContentBookmarkMutationVariables>;
-export const MyActivitiesQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyActivitiesQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myActivities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"topics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"modules"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"metaTitle"}},{"kind":"Field","name":{"kind":"Name","value":"myHighlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}},{"kind":"Field","name":{"kind":"Name","value":"myBookmarks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"uuid"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"mySubmissions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"module"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"myAnswers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"survey"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"page"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]} as unknown as DocumentNode<MyActivitiesQueryQuery, MyActivitiesQueryQueryVariables>;
+export const MyActivitiesQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"MyActivitiesQuery"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"myActivities"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"instruments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"highlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}},{"kind":"Field","name":{"kind":"Name","value":"bookmarks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"topics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"modules"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"metaTitle"}},{"kind":"Field","name":{"kind":"Name","value":"myHighlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}},{"kind":"Field","name":{"kind":"Name","value":"myBookmarks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"uuid"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleBookmarkNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"mySubmissions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"module"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"myAnswers"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"survey"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"page"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]} as unknown as DocumentNode<MyActivitiesQueryQuery, MyActivitiesQueryQueryVariables>;
 export const ChapterQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ChapterQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"chapter"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]} as unknown as DocumentNode<ChapterQueryQuery, ChapterQueryQueryVariables>;
 export const ContentBlockQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"ContentBlockQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"id"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"contentBlock"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"id"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"path"}}]}}]}}]} as unknown as DocumentNode<ContentBlockQueryQuery, ContentBlockQueryQueryVariables>;
 export const InstrumentQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"InstrumentQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"instrument"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"InstrumentParts"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"HighlightParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"HighlightNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"contentIndex"}},{"kind":"Field","name":{"kind":"Name","value":"paragraphIndex"}},{"kind":"Field","name":{"kind":"Name","value":"selectionLength"}},{"kind":"Field","name":{"kind":"Name","value":"contentUuid"}},{"kind":"Field","name":{"kind":"Name","value":"startPosition"}},{"kind":"Field","name":{"kind":"Name","value":"color"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}},{"kind":"Field","name":{"kind":"Name","value":"text"}},{"kind":"Field","name":{"kind":"Name","value":"page"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ContentBlockNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ModuleNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"path"}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"ChapterNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"path"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"InstrumentParts"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"InstrumentNode"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"intro"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"language"}},{"kind":"Field","name":{"kind":"Name","value":"bookmarks"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"uuid"}},{"kind":"Field","name":{"kind":"Name","value":"note"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"type"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"category"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"foreground"}},{"kind":"Field","name":{"kind":"Name","value":"background"}}]}},{"kind":"Field","name":{"kind":"Name","value":"type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"contents"}},{"kind":"Field","name":{"kind":"Name","value":"highlights"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"HighlightParts"}}]}}]}}]} as unknown as DocumentNode<InstrumentQueryQuery, InstrumentQueryQueryVariables>;
diff --git a/client/src/components/profile/ActivityList.vue b/client/src/components/profile/ActivityList.vue
index e10b21a4..fd0cbc65 100644
--- a/client/src/components/profile/ActivityList.vue
+++ b/client/src/components/profile/ActivityList.vue
@@ -1,9 +1,6 @@
 <template>
-  <div>
-    <div
-      v-for="topic in topics"
-      :key="topic.id"
-    >
+  <div class="activity-list">
+    <template v-for="topic in topics">
       <template v-for="module in topic.modules">
         <div
           class="activity__module"
@@ -11,17 +8,16 @@
           :key="module.id"
         >
           <h4 class="heading-4">Thema: {{ topic.title }} - {{ module.metaTitle }}: {{ module.title }}</h4>
-          <div
+          <activity-entry
+            :to="`/${path(item)}`"
             v-for="item in module[property]"
             :key="item.id"
           >
-            <activity-entry :to="`/${path(item)}`">
-              <slot :item="item"></slot>
-            </activity-entry>
-          </div>
+            <slot :item="item"></slot>
+          </activity-entry>
         </div>
       </template>
-    </div>
+    </template>
   </div>
 </template>
 
diff --git a/client/src/components/profile/InstrumentActivityList.vue b/client/src/components/profile/InstrumentActivityList.vue
new file mode 100644
index 00000000..85f766a2
--- /dev/null
+++ b/client/src/components/profile/InstrumentActivityList.vue
@@ -0,0 +1,31 @@
+<template>
+  <div class="activity-list">
+    <template v-for="instrument in instruments">
+      <div
+        class="activity__module"
+        v-if="instrument[property].length"
+        :key="instrument.id"
+      >
+        <h4 class="heading-4">{{ instrument.title }}</h4>
+        <activity-entry
+          :to="`/${instrument.path}`"
+          v-for="item in instrument[property]"
+          :key="item.id"
+          ><slot :item="item"></slot
+        ></activity-entry>
+      </div>
+    </template>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { InstrumentActivityProperty } from '@/@types';
+import { InstrumentNode } from '@/__generated__/graphql';
+import ActivityEntry from '@/components/profile/ActivityEntry.vue';
+
+export interface Props {
+  instruments: InstrumentNode[];
+  property: InstrumentActivityProperty;
+}
+defineProps<Props>();
+</script>
diff --git a/client/src/pages/activity.vue b/client/src/pages/activity.vue
index c724b6df..d3c0ee2f 100644
--- a/client/src/pages/activity.vue
+++ b/client/src/pages/activity.vue
@@ -32,7 +32,19 @@
       >
     </div>
     <div class="activity__activities">
-      <h2>Activities go here</h2>
+      <instrument-activity-list
+        property="highlights"
+        :instruments="instruments"
+        v-if="selectedCategory === HIGHLIGHTS"
+        v-slot="{ item }"
+      >
+        <mark
+          class="highlight"
+          :class="[`highlight--${item?.color}`]"
+          >{{ item?.text }}</mark
+        >
+        <div v-if="item.note">Notiz: {{ item.note.text }}</div>
+      </instrument-activity-list>
       <activity-list
         :topics="highlightTopics"
         property="myHighlights"
@@ -46,6 +58,15 @@
         >
         <div v-if="item.note">Notiz: {{ item.note.text }}</div>
       </activity-list>
+      <instrument-activity-list
+        property="bookmarks"
+        :instruments="instruments"
+        v-if="selectedCategory === BOOKMARKS"
+        v-slot="{ item }"
+      >
+        <div>Lesezeichen: {{ item.id }}</div>
+        <div v-if="item.note">Notiz: {{ item.note.text }}</div>
+      </instrument-activity-list>
       <activity-list
         :topics="bookmarkTopics"
         property="myBookmarks"
@@ -71,105 +92,6 @@
       >
         Übung: {{ item.survey.title }}
       </activity-list>
-      <!-- <div -->
-      <!--   v-for="topic in highlightTopics" -->
-      <!--   :key="topic?.id" -->
-      <!-- > -->
-      <!--   <h4>{{ topic?.title }}</h4> -->
-      <!--   <template v-for="module in topic?.modules"> -->
-      <!--     <div -->
-      <!--       class="activity__module" -->
-      <!--       v-if="module?.myHighlights?.length" -->
-      <!--       :key="module?.id" -->
-      <!--     > -->
-      <!--       <div -->
-      <!--         v-for="highlight in module.myHighlights" -->
-      <!--         :key="highlight.id" -->
-      <!--       > -->
-      <!--         <activity-entry :to="`/${highlight.page.path}`"> -->
-      <!--           <mark -->
-      <!--             class="highlight" -->
-      <!--             :class="[`highlight--${highlight?.color}`]" -->
-      <!--             >{{ highlight?.text }}</mark -->
-      <!--           > -->
-      <!--         </activity-entry> -->
-      <!--       </div> -->
-      <!--     </div> -->
-      <!--   </template> -->
-      <!-- </div> -->
-      <!-- <div v-if="selectedCategory === BOOKMARKS"> -->
-      <!--   <div -->
-      <!--     v-for="topic in bookmarkTopics" -->
-      <!--     :key="topic?.id" -->
-      <!--   > -->
-      <!--     <h4>{{ topic?.title }}</h4> -->
-      <!--     <template v-for="module in topic?.modules"> -->
-      <!--       <div -->
-      <!--         class="activity__module" -->
-      <!--         v-if="module?.myBookmarks?.length" -->
-      <!--         :key="module?.id" -->
-      <!--       > -->
-      <!--         <div -->
-      <!--           v-for="bookmark in module?.myBookmarks" -->
-      <!--           :key="bookmark?.id" -->
-      <!--         > -->
-      <!--           <pre>{{ bookmark }}</pre> -->
-      <!--           <activity-entry :to="`/${bookmark.path}`"> > Lesezeichen: {{ bookmark.id }} </activity-entry> -->
-      <!--         </div> -->
-      <!--       </div> -->
-      <!--     </template> -->
-      <!--   </div> -->
-      <!-- </div> -->
-      <!-- <div v-if="selectedCategory === ASSIGNMENTS"> -->
-      <!--   <h3>ASSIGNMENTS</h3> -->
-      <!--   <div -->
-      <!--     v-for="topic in submissionsTopics" -->
-      <!--     :key="topic?.id" -->
-      <!--   > -->
-      <!--     <h4>{{ topic?.title }}</h4> -->
-      <!--     <template v-for="module in topic?.modules"> -->
-      <!--       <div -->
-      <!--         class="activity__module" -->
-      <!--         v-if="module?.mySubmissions?.length" -->
-      <!--         :key="module.id" -->
-      <!--       > -->
-      <!--         <div -->
-      <!--           v-for="submission in module?.mySubmissions" -->
-      <!--           :key="submission?.id" -->
-      <!--         > -->
-      <!--           <pre>{{ submission }}</pre> -->
-      <!--           <activity-entry :to="`/module/${submission.assignment.module.slug}#${submission.assignment.id}`"> -->
-      <!--             Submission {{ submission?.text }}</activity-entry -->
-      <!--           > -->
-      <!--         </div> -->
-      <!--       </div> -->
-      <!--     </template> -->
-      <!--   </div> -->
-      <!-- </div> -->
-      <!-- <div v-if="selectedCategory === SURVEYS"> -->
-      <!--   <h3>SURVEYS</h3> -->
-      <!--   <div -->
-      <!--     v-for="topic in answersTopics" -->
-      <!--     :key="topic?.id" -->
-      <!--   > -->
-      <!--     <h4>{{ topic?.title }}</h4> -->
-      <!--     <template v-for="module in topic?.modules"> -->
-      <!--       <div -->
-      <!--         v-if="module?.myAnswers?.length" -->
-      <!--         :key="module.id" -->
-      <!--       > -->
-      <!--         <div -->
-      <!--           class="activity__module" -->
-      <!--           v-for="answer in module?.myAnswers" -->
-      <!--           :key="answer.id" -->
-      <!--         > -->
-      <!--           <pre>{{ answer }}</pre> -->
-      <!--           <activity-entry :to="{ name: 'profile' }"> Übung: {{ answer?.survey.title }}</activity-entry> -->
-      <!--         </div> -->
-      <!--       </div> -->
-      <!--     </template> -->
-      <!--   </div> -->
-      <!-- </div> -->
     </div>
   </div>
 </template>
@@ -179,6 +101,7 @@ import { graphql } from '@/__generated__';
 import { useQuery } from '@vue/apollo-composable';
 import { ref, computed } from 'vue';
 import ActivityList from '@/components/profile/ActivityList.vue';
+import InstrumentActivityList from '@/components/profile/InstrumentActivityList.vue';
 import { TopicNode } from '@/__generated__/graphql';
 
 const HIGHLIGHTS = 'highlights';
@@ -188,10 +111,25 @@ const SURVEYS = 'surveys';
 
 const selectedCategory = ref(HIGHLIGHTS);
 
+// todo: use fragments to simplify cache updates
 const { result } = useQuery(
   graphql(`
     query MyActivitiesQuery {
       myActivities {
+        instruments {
+          id
+          slug
+          title
+          path
+          highlights {
+            ...HighlightParts
+          }
+          bookmarks {
+            ... on InstrumentBookmarkNode {
+              path
+            }
+          }
+        }
         topics {
           id
           title
@@ -262,6 +200,7 @@ const { result } = useQuery(
   `)
 );
 const topics = computed(() => result.value?.myActivities?.topics || []);
+const instruments = computed(() => result.value?.myActivities?.instruments || []);
 const highlightTopics = computed(() => {
   return topics.value.filter((topic: TopicNode) => topic.modules?.some((module) => module?.myHighlights?.length));
 });
@@ -278,6 +217,10 @@ const answersTopics = computed(() => {
 
 <style lang="postcss">
 .activity {
+  &__activities {
+    padding-top: var(--section-spacing);
+  }
+
   &__heading {
     margin-bottom: var(--section-spacing);
   }
diff --git a/server/basicknowledge/models.py b/server/basicknowledge/models.py
index c5062468..24e975ed 100644
--- a/server/basicknowledge/models.py
+++ b/server/basicknowledge/models.py
@@ -80,8 +80,7 @@ class BasicKnowledge(StrictHierarchyPage):
 
     parent_page_types = ["books.book"]
 
-    intro = RichTextField(
-        features=DEFAULT_RICH_TEXT_FEATURES, default="", blank=True)
+    intro = RichTextField(features=DEFAULT_RICH_TEXT_FEATURES, default="", blank=True)
 
     contents = StreamField(
         [
@@ -116,3 +115,7 @@ class BasicKnowledge(StrictHierarchyPage):
         FieldPanel("intro"),
         FieldPanel("contents"),
     ]
+
+    @property
+    def route(self):
+        return f"instrument/{self.slug}"
diff --git a/server/basicknowledge/queries.py b/server/basicknowledge/queries.py
index dfc5a43b..3cef4a98 100644
--- a/server/basicknowledge/queries.py
+++ b/server/basicknowledge/queries.py
@@ -45,6 +45,7 @@ class InstrumentNode(DjangoObjectType):
     contents = GenericStreamFieldType()
     language = graphene.String()
     highlights = graphene.List("notes.schema.HighlightNode")
+    path = graphene.String(required=True)
 
     class Meta:
         model = BasicKnowledge
@@ -73,6 +74,10 @@ class InstrumentNode(DjangoObjectType):
     def resolve_highlights(root: BasicKnowledge, info, **kwargs):
         return root.highlights.filter(user=info.context.user)
 
+    @staticmethod
+    def resolve_path(root: BasicKnowledge, info, **kwargs):
+        return root.route
+
 
 class InstrumentQuery(object):
     instrument = graphene.Field(
diff --git a/server/notes/schema.py b/server/notes/schema.py
index 0ff12d6d..a3c1c857 100644
--- a/server/notes/schema.py
+++ b/server/notes/schema.py
@@ -76,6 +76,7 @@ class ChapterBookmarkNode(DjangoObjectType):
 class InstrumentBookmarkNode(DjangoObjectType):
     uuid = graphene.UUID()
     note = graphene.Field(NoteNode)
+    path = graphene.String(required=True)
 
     class Meta:
         model = InstrumentBookmark
@@ -83,6 +84,10 @@ class InstrumentBookmarkNode(DjangoObjectType):
         filter_fields = []
         interfaces = (relay.Node,)
 
+    @staticmethod
+    def resolve_path(root: InstrumentBookmark, info, **kwargs):
+        return root.instrument.route
+
 
 class BookmarkNode(graphene.Union):
     class Meta:
diff --git a/server/schema.graphql b/server/schema.graphql
index 52bc1506..6e3ec22e 100644
--- a/server/schema.graphql
+++ b/server/schema.graphql
@@ -425,6 +425,7 @@ type InstrumentBookmarkNode implements Node {
   note: NoteNode
   uuid: UUID
   instrument: InstrumentNode!
+  path: String!
 }
 
 """
@@ -450,6 +451,7 @@ type InstrumentNode implements Node {
   type: InstrumentTypeNode
   language: String
   highlights: [HighlightNode]
+  path: String!
 }
 
 type InstrumentTypeNode implements Node {
@@ -969,7 +971,8 @@ type InstrumentNodeEdge {
 }
 
 type ActivityNode {
-  topics: [TopicNode!]
+  topics: [TopicNode!]!
+  instruments: [InstrumentNode!]!
 }
 
 """Debugging information for the current query."""
diff --git a/server/users/schema/queries.py b/server/users/schema/queries.py
index 46923977..52c8fcb6 100644
--- a/server/users/schema/queries.py
+++ b/server/users/schema/queries.py
@@ -33,8 +33,9 @@ class UsersQuery(object):
         return BasicKnowledge.objects.filter(instrumentbookmark__user=info.context.user)
 
     def resolve_my_activities(self, info, **kwargs):
-        topics = Topic.objects.all()
-        return {"topics": topics}
+        topics = Topic.objects.live()
+        instruments = BasicKnowledge.objects.live()
+        return {"topics": topics, "instruments": instruments}
 
 
 class AllUsersQuery(object):
diff --git a/server/users/schema/types.py b/server/users/schema/types.py
index be2809b2..79dfea2b 100644
--- a/server/users/schema/types.py
+++ b/server/users/schema/types.py
@@ -242,4 +242,9 @@ class UpdateError(graphene.ObjectType):
 
 
 class ActivityNode(graphene.ObjectType):
-    topics = graphene.List(graphene.NonNull("books.schema.nodes.TopicNode"))
+    topics = graphene.List(
+        graphene.NonNull("books.schema.nodes.TopicNode"), required=True
+    )
+    instruments = graphene.List(
+        graphene.NonNull("basicknowledge.queries.InstrumentNode"), required=True
+    )