diff --git a/backend/annotation/serializers.py b/backend/annotation/serializers.py
index 3f253165..0974abbd 100644
--- a/backend/annotation/serializers.py
+++ b/backend/annotation/serializers.py
@@ -17,12 +17,14 @@ class AnnotationBaseSerializer(serializers.ModelSerializer):
     """
 
     createdAt = serializers.DateTimeField(source="created_at", read_only=True)
-    createdBy = serializers.SerializerMethodField(method_name="get_createdBy", read_only=True)
+    createdBy = serializers.SerializerMethodField(
+        method_name="get_created_by", read_only=True
+    )
     removedAt = serializers.DateTimeField(
         source="removed_at", allow_null=True, read_only=True
     )
-    removedBy = serializers.PrimaryKeyRelatedField(
-        source="removed_by", allow_null=True, read_only=True
+    removedBy = serializers.SerializerMethodField(
+        method_name="get_removed_by", allow_null=True, read_only=True
     )
     removable = serializers.SerializerMethodField(read_only=True)
 
@@ -45,10 +47,15 @@ def get_removable(self, annotation) -> bool:
         """This should be overridden in subclasses."""
         raise NotImplementedError("Subclasses must implement get_removable method.")
 
-    def get_createdBy(self, annotation) -> str | None:
+    def get_created_by(self, annotation) -> str | None:
         """Returns the full name of the user who created the annotation."""
         return annotation.created_by.get_full_name()
 
+    def get_removed_by(self, annotation) -> str | None:
+        """Returns the full name of the user who removed the annotation, or None if not removed."""
+        if annotation.removed_by:
+            return annotation.removed_by.get_full_name()
+        return None
 
 
 class KnowledgeBaseAnnotationSerializer(AnnotationBaseSerializer):
@@ -95,6 +102,7 @@ def validate_id(self, value):
             f"KnowledgeBaseAnnotation item with ID {value} does not exist."
         )
 
+
 class LabelSerializer(serializers.ModelSerializer):
     """
     Serializer for Label model.
@@ -156,6 +164,7 @@ def get_removable(self, annotation: LabelAnnotation) -> bool:
 
         return False
 
+
 class SelectedLabelSerializer(serializers.Serializer):
     """Serializer for a selected label in the save labels input."""
 
diff --git a/backend/annotation/serializers_test.py b/backend/annotation/serializers_test.py
index de578b5e..30cdd8be 100644
--- a/backend/annotation/serializers_test.py
+++ b/backend/annotation/serializers_test.py
@@ -1,7 +1,6 @@
 import pytest
 from typing import Any
 
-from django.utils import timezone
 from django.contrib.auth.models import Permission
 from rest_framework.test import APIRequestFactory
 
@@ -11,7 +10,6 @@
     LabelAnnotationSerializer,
     SaveLabelsInputSerializer,
 )
-from problem.serializers import ProblemSerializer
 
 
 @pytest.mark.django_db
diff --git a/backend/problem/views/problem.py b/backend/problem/views/problem.py
index e27b871e..d26b3813 100644
--- a/backend/problem/views/problem.py
+++ b/backend/problem/views/problem.py
@@ -96,12 +96,8 @@ def _get_problem_response(self, request: Request, pk: int | None) -> Response:
 
         serializer = self.get_serializer(problem)
 
-        kb_annotations = KnowledgeBaseAnnotation.objects.filter(
-            problem=problem, removed_at__isnull=True
-        )
-        label_annotations = LabelAnnotation.objects.filter(
-            problem=problem, removed_at__isnull=True
-        )
+        kb_annotations = KnowledgeBaseAnnotation.objects.filter(problem=problem)
+        label_annotations = LabelAnnotation.objects.filter(problem=problem)
 
         # kbAnnotations and labelAnnotations are not included in the
         # ProblemSerializer because they require additional context for
diff --git a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.html b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.html
index 47cddac6..c8d4c473 100644
--- a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.html
+++ b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.html
@@ -1,4 +1,112 @@
-<ul>
-    <li>Annotation history: who did what when?</li>
-    <li>Ability to 'gold'/'ungold' sentences</li>
+@let events = filteredEvents();
+
+@if (events === null) {
+<p class="text-muted small fst-italic" i18n>Loading…</p>
+} @else {
+<div
+    class="d-flex align-items-center justify-content-between mb-2 gap-2 flex-wrap"
+>
+    <div class="d-flex gap-2 flex-wrap">
+        <div
+            class="btn-group btn-group-sm"
+            role="group"
+            aria-label="Filter by event kind"
+            i18n-aria-label
+        >
+            <input
+                type="checkbox"
+                class="btn-check"
+                id="filter-added"
+                [checked]="showAdded()"
+                (change)="showAdded.set(!showAdded())"
+            />
+            <label class="btn btn-outline-success" for="filter-added">
+                <fa-icon [icon]="faPlus" class="me-2" />
+                <ng-container i18n>Added</ng-container>
+            </label>
+            <input
+                type="checkbox"
+                class="btn-check"
+                id="filter-removed"
+                [checked]="showRemoved()"
+                (change)="showRemoved.set(!showRemoved())"
+            />
+            <label class="btn btn-outline-danger" for="filter-removed">
+                <fa-icon [icon]="faMinus" class="me-2" />
+                <ng-container i18n>Removed</ng-container>
+            </label>
+        </div>
+        <div
+            class="btn-group btn-group-sm"
+            role="group"
+            aria-label="Filter by annotation type"
+            i18n-aria-label
+        >
+            <input
+                type="checkbox"
+                class="btn-check"
+                id="filter-labels"
+                [checked]="showLabels()"
+                (change)="showLabels.set(!showLabels())"
+            />
+            <label class="btn btn-outline-secondary" for="filter-labels">
+                <fa-icon [icon]="faTag" class="me-2" />
+                <ng-container i18n>Labels</ng-container>
+            </label>
+            <input
+                type="checkbox"
+                class="btn-check"
+                id="filter-kb"
+                [checked]="showKB()"
+                (change)="showKB.set(!showKB())"
+            />
+            <label class="btn btn-outline-secondary" for="filter-kb">
+                <fa-icon [icon]="faBook" class="me-2" />
+                <ng-container i18n>KB items</ng-container>
+            </label>
+        </div>
+    </div>
+    <span class="text-muted small" i18n>
+        Showing {{ events.length }}/{{ totalCount() }} annotations
+    </span>
+</div>
+@if (events.length === 0) {
+<p class="text-muted small fst-italic" i18n>
+    No annotations match the current filters.
+</p>
+} @else {
+<ul class="list-unstyled d-flex flex-column gap-2 mb-0">
+    @for (event of events; track $index) {
+    @let added = event.eventKind === "added";
+    @let isLabel = event.annotationKind === "label";
+    <li>
+        <div class="card border-0 shadow-sm overflow-hidden d-flex flex-row">
+            <div
+                class="text-white d-flex align-items-center justify-content-center px-2 flex-shrink-0"
+                [class]="added ? 'bg-success' : 'bg-danger'"
+            >
+                <fa-icon [icon]="added ? faPlus : faMinus" />
+            </div>
+            <div
+                class="card-body py-2 px-3 d-flex align-items-center justify-content-start gap-3"
+            >
+                <fa-icon [icon]="isLabel ? faTag : faBook" />
+                <span class="flex-grow-1">
+                    <strong>{{ event.actor }}</strong>
+                    {{ event.eventKind }}
+                    {{ isLabel ? "a label" : "a knowledge base item" }}:
+                    <span
+                        [class]="isLabel ? 'label-pill ms-1' : 'font-monospace'"
+                    >
+                        {{ event.description }}
+                    </span>
+                </span>
+                <span class="text-muted small text-end flex-shrink-0">
+                    {{ event.timestamp | date : "medium" }}
+                </span>
+            </div>
+        </div>
+    </li>
+    }
 </ul>
+} }
diff --git a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.scss b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.scss
index e69de29b..8b137891 100644
--- a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.scss
+++ b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.scss
@@ -0,0 +1 @@
+
diff --git a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.spec.ts b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.spec.ts
index 600e4afc..f5ab6eb5 100644
--- a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.spec.ts
+++ b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.spec.ts
@@ -1,7 +1,19 @@
 import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { of } from "rxjs";
 
+import { ProblemService } from "@/services/problem.service";
+import { Dataset, EntailmentLabel, KnowledgeBaseAnnotation, KnowledgeBaseRelationship, LabelAnnotation, Problem } from "@/types";
 import { AnnotationCommentsComponent } from "./annotation-comments.component";
 
+const baseAnnotationFields = {
+    id: 1,
+    session: 1,
+    notes: "",
+    removable: false,
+    removedAt: null,
+    removedBy: null,
+};
+
 describe("AnnotationCommentsComponent", () => {
     let component: AnnotationCommentsComponent;
     let fixture: ComponentFixture<AnnotationCommentsComponent>;
@@ -9,14 +21,119 @@ describe("AnnotationCommentsComponent", () => {
     beforeEach(async () => {
         await TestBed.configureTestingModule({
             imports: [AnnotationCommentsComponent],
+            providers: [
+                { provide: ProblemService, useValue: {} },
+            ],
         }).compileComponents();
+    });
 
+    // Needed to override the problem$ observable in the providers.
+    function recreateComponent(kbAnnotations: KnowledgeBaseAnnotation[] = [], labelAnnotations: LabelAnnotation[] = []) {
+        const mockProblem: Problem = {
+            id: 1,
+            base: null,
+            premises: [],
+            hypothesis: null,
+            entailmentLabel: EntailmentLabel.UNKNOWN,
+            dataset: Dataset.USER,
+            extraData: null,
+            kbAnnotations,
+            labelAnnotations,
+        };
+
+        TestBed.overrideProvider(ProblemService, { useValue: { problem$: of(mockProblem) } });
         fixture = TestBed.createComponent(AnnotationCommentsComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
-    });
+    }
+
+
 
     it("should create", () => {
+        recreateComponent();
         expect(component).toBeTruthy();
     });
+
+    it("emits an 'added' event for each annotation", () => {
+        recreateComponent(
+            [],
+            [
+                {
+                    ...baseAnnotationFields,
+                    createdAt: "2024-01-01T10:00:00Z",
+                    createdBy: "Alice",
+                    label: { id: 1, text: "negation", description: "" },
+                    attachedByCurrentUser: false,
+                },
+            ]
+        );
+
+        const events = component.filteredEvents()!;
+        expect(events.length).toBe(1);
+        expect(events[0]).toEqual(
+            jasmine.objectContaining({
+                eventKind: "added",
+                annotationKind: "label",
+                actor: "Alice",
+                description: "negation",
+            })
+        );
+    });
+
+    it("emits a 'removed' event when removedAt is set", () => {
+        recreateComponent(
+            [
+                {
+                    ...baseAnnotationFields,
+                    createdAt: "2024-01-01T10:00:00Z",
+                    createdBy: "Bob",
+                    removedAt: "2024-01-02T10:00:00Z",
+                    removedBy: "3",
+                    entity1: "cat",
+                    relationship: KnowledgeBaseRelationship.EQUAL,
+                    entity2: "feline",
+                },
+            ],
+            []
+        );
+
+        const events = component.filteredEvents()!;
+        expect(events.length).toBe(2);
+        const removed = events.find((e) => e.eventKind === "removed");
+        expect(removed).toEqual(
+            jasmine.objectContaining({
+                eventKind: "removed",
+                annotationKind: "knowledgeBase",
+                description: "cat = feline",
+            })
+        );
+    });
+
+    it("sorts events by timestamp descending", () => {
+        recreateComponent(
+            [],
+            [
+                {
+                    ...baseAnnotationFields,
+                    id: 1,
+                    createdAt: "2024-01-01T10:00:00Z",
+                    createdBy: "Alice",
+                    label: { id: 1, text: "first", description: "" },
+                    attachedByCurrentUser: false,
+                },
+                {
+                    ...baseAnnotationFields,
+                    id: 2,
+                    createdAt: "2024-01-03T10:00:00Z",
+                    createdBy: "Bob",
+                    label: { id: 2, text: "latest", description: "" },
+                    attachedByCurrentUser: false,
+                },
+            ]
+        );
+
+        const events = component.filteredEvents()!;
+        expect(events[0].description).toBe("latest");
+        expect(events[1].description).toBe("first");
+    });
 });
diff --git a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.ts b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.ts
index 1a6625cb..61669390 100644
--- a/frontend/src/app/annotate/annotation-comments/annotation-comments.component.ts
+++ b/frontend/src/app/annotate/annotation-comments/annotation-comments.component.ts
@@ -1,10 +1,104 @@
-import { Component } from "@angular/core";
+import { Component, computed, inject, signal } from "@angular/core";
+import { CommonModule } from "@angular/common";
+import { FontAwesomeModule } from "@fortawesome/angular-fontawesome";
+import { faPlus, faMinus, faBook, faTag } from "@fortawesome/free-solid-svg-icons";
+import { map } from "rxjs";
+import { toSignal } from "@angular/core/rxjs-interop";
+
+import { ProblemService } from "@/services/problem.service";
+import {
+    KnowledgeBaseAnnotation,
+    KnowledgeBaseRelationship,
+    LabelAnnotation,
+} from "@/types";
+
+type AnnotationEventKind = "added" | "removed";
+type AnnotationKind = "label" | "knowledgeBase";
+
+export interface AnnotationEvent {
+    eventKind: AnnotationEventKind;
+    annotationKind: AnnotationKind;
+    timestamp: string;
+    actor: string;
+    description: string;
+}
+
+const relationshipSymbols: Record<KnowledgeBaseRelationship, string> = {
+    [KnowledgeBaseRelationship.EQUAL]: "=",
+    [KnowledgeBaseRelationship.NOT_EQUAL]: "≠",
+    [KnowledgeBaseRelationship.SUBSET]: "⊂",
+    [KnowledgeBaseRelationship.SUPERSET]: "⊃",
+};
+
+function annotationToEvent(annotation: LabelAnnotation | KnowledgeBaseAnnotation): AnnotationEvent[] {
+    const isLabelAnnotation = "label" in annotation;
+    const description = isLabelAnnotation ? annotation.label.text : `${annotation.entity1} ${relationshipSymbols[annotation.relationship]} ${annotation.entity2}`;
+    const annotationKind: AnnotationKind = isLabelAnnotation ? "label" : "knowledgeBase";
+    const events: AnnotationEvent[] = [{
+        eventKind: "added",
+        annotationKind,
+        timestamp: annotation.createdAt,
+        actor: annotation.createdBy,
+        description,
+    }];
+    if (annotation.removedAt && annotation.removedBy) {
+        events.push({
+            eventKind: "removed",
+            annotationKind,
+            timestamp: annotation.removedAt,
+            actor: annotation.removedBy,
+            description,
+        });
+    }
+    return events;
+}
 
 @Component({
     selector: "la-annotation-comments",
     standalone: true,
-    imports: [],
+    imports: [CommonModule, FontAwesomeModule],
     templateUrl: "./annotation-comments.component.html",
     styleUrl: "./annotation-comments.component.scss",
 })
-export class AnnotationCommentsComponent {}
+export class AnnotationCommentsComponent {
+    private problemService = inject(ProblemService);
+
+    private allEvents = toSignal(
+        this.problemService.problem$.pipe(
+            map((problem) => {
+                if (!problem) {
+                    return [];
+                }
+                return [
+                    ...problem.kbAnnotations.flatMap(annotationToEvent),
+                    ...problem.labelAnnotations.flatMap(annotationToEvent),
+                ].sort((a, b) => b.timestamp.localeCompare(a.timestamp));
+            })
+        ),
+        { initialValue: null }
+    );
+
+    public showAdded = signal(true);
+    public showRemoved = signal(true);
+    public showLabels = signal(true);
+    public showKB = signal(true);
+
+    public filteredEvents = computed(() => {
+        const events = this.allEvents();
+        if (events === null) {
+            return null;
+        }
+        return events.filter(
+            (e) =>
+                (e.eventKind === "added" ? this.showAdded() : this.showRemoved()) &&
+                (e.annotationKind === "label" ? this.showLabels() : this.showKB())
+        );
+    });
+
+    public totalCount = computed(() => this.allEvents()?.length ?? 0);
+
+    public faPlus = faPlus;
+    public faMinus = faMinus;
+    public faBook = faBook;
+    public faTag = faTag;
+}
diff --git a/frontend/src/app/annotate/annotation-input/annotation-input.component.ts b/frontend/src/app/annotate/annotation-input/annotation-input.component.ts
index 28f89975..8d6f4556 100644
--- a/frontend/src/app/annotate/annotation-input/annotation-input.component.ts
+++ b/frontend/src/app/annotate/annotation-input/annotation-input.component.ts
@@ -187,20 +187,23 @@ export class AnnotationInputComponent implements OnInit {
             kbItems: new FormArray<KBItemForm>(kbItems),
         });
     }
+
     private buildKbForms(inputKbItems: KnowledgeBaseAnnotation[]): KBItemForm[] {
-        return inputKbItems.map(item => new FormGroup({
-            id: new FormControl<number | null>(item.id, {
-                nonNullable: true
-            }),
-            entity1: new FormControl<string>(item.entity1, {
-                nonNullable: true
-            }),
-            entity2: new FormControl<string>(item.entity2, {
-                nonNullable: true
-            }),
-            relationship: new FormControl<KnowledgeBaseRelationship>(item.relationship, {
-                nonNullable: true
-            })
-        }));
+        return inputKbItems
+            .filter(item => item.removedAt === null)
+            .map(item => new FormGroup({
+                id: new FormControl<number | null>(item.id, {
+                    nonNullable: true
+                }),
+                entity1: new FormControl<string>(item.entity1, {
+                    nonNullable: true
+                }),
+                entity2: new FormControl<string>(item.entity2, {
+                    nonNullable: true
+                }),
+                relationship: new FormControl<KnowledgeBaseRelationship>(item.relationship, {
+                    nonNullable: true
+                })
+            }));
     }
 }
diff --git a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts
index 78c47856..28ea6aab 100644
--- a/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts
+++ b/frontend/src/app/annotate/annotation-input/problem-details/problem-details.component.ts
@@ -79,7 +79,7 @@ export class ProblemDetailsComponent {
             baseProblemId: problem.base?.toString() ?? null,
             dataset: problem.dataset,
             entailmentLabel: problem.entailmentLabel,
-            labelAnnotations: problem.labelAnnotations ?? [],
+            labelAnnotations: problem.labelAnnotations.filter(a => a.removedAt === null) ?? [],
         };
 
         switch (problem.dataset) {
diff --git a/frontend/src/app/annotate/annotation-menu/annotation-menu.component.html b/frontend/src/app/annotate/annotation-menu/annotation-menu.component.html
index 6383f4aa..7f30c091 100644
--- a/frontend/src/app/annotate/annotation-menu/annotation-menu.component.html
+++ b/frontend/src/app/annotate/annotation-menu/annotation-menu.component.html
@@ -47,7 +47,7 @@
     <li [ngbNavItem]="4">
         <button ngbNavLink>
             <fa-icon [icon]="faPenNib" class="me-2" aria-hidden="true" />
-            <span i18n>Comments / History</span>
+            <span i18n>Annotation log</span>
         </button>
         <ng-template ngbNavContent>
             <la-annotation-comments />