diff --git a/e2e-tests/tests/timeline-view-editing.test.ts b/e2e-tests/tests/timeline-view-editing.test.ts
index 5b9e39ea52..3c4dd7fd81 100644
--- a/e2e-tests/tests/timeline-view-editing.test.ts
+++ b/e2e-tests/tests/timeline-view-editing.test.ts
@@ -50,6 +50,7 @@ test.describe.serial('Timeline View Editing', () => {
   test('Add an activity to the parent plan', async () => {
     await plan.showPanel(PanelNames.TIMELINE_ITEMS);
     await plan.addActivity('PickBanana');
+    await plan.addActivity('PeelBanana');
   });
 
   test('Change the start time of the activity', async () => {
@@ -105,26 +106,116 @@ test.describe.serial('Timeline View Editing', () => {
     // Look for back button indicating that the row editor is active
     expect(page.locator('.section-back-button ').first()).toBeDefined();
 
-    const existingLayerCount = await page.locator('.timeline-layer').count();
-
     // Give the row a name
     await page.locator('input[name="name"]').first().fill(rowName);
     await page.locator('input[name="name"]').first().blur();
+  });
+
+  test('Add an activity layer', async () => {
+    const activityLayerEditor = page.getByLabel('Activity Layer-editor');
+    const existingLayerCount = await activityLayerEditor.locator('.timeline-layer-editor').count();
 
-    // Add a layer
-    await page.getByRole('button', { name: 'New Layer' }).click();
-    const newLayerCount = await page.locator('.timeline-layer').count();
+    // Add an activity layer
+    await activityLayerEditor.getByRole('button', { name: 'New Activity Layer' }).click();
+    const newLayerCount = await activityLayerEditor.locator('.timeline-layer-editor').count();
     expect(newLayerCount - existingLayerCount).toEqual(1);
 
-    // Expect an activity layer to be created by default
-    expect(await page.locator('select[name="chartType"]').last().inputValue()).toBe('activity');
+    // Expect the activity layer to include all activities
+    expect(await activityLayerEditor.locator('.timeline-layer-editor').first()).toHaveText('All Activities');
+  });
 
-    // Expect the filter list to open
-    await page.getByPlaceholder('Search').last().click();
-    await expect(page.locator('.menu-slot > .header')).toBeDefined();
+  test('Edit an activity layer', async () => {
+    const activityLayerEditor = page.getByLabel('Activity Layer-editor');
+
+    // Open the activity filter builder
+    await activityLayerEditor
+      .locator('.timeline-layer-editor')
+      .first()
+      .getByLabel('activity-filter-builder-trigger')
+      .click();
+
+    // Expect that the modal is present
+    const modal = activityLayerEditor.getByLabel('activity-filter-builder');
+    expect(modal).toBeDefined();
+
+    // Expect that layer name is showing in the name input
+    expect(modal.locator('input[name="layer-name"]')).toHaveValue('All Activities');
+
+    // Expect that the resulting types list is not empty
+    const resultingTypesList = modal.locator('.resulting-types-list');
+    const allActivityTypesCount = await resultingTypesList.locator('.activity-type-result').count();
+    expect(allActivityTypesCount).toBeGreaterThan(0);
+
+    // Expect that manually selecting types cause the types to appear in the resulting types list
+    await modal.locator("input[name='manual-types-filter-input']").click();
+    expect(await modal.locator('.manual-types-menu').first()).toBeDefined();
+    await modal.getByRole('menuitem', { name: 'ChangeProducer' }).click();
+    await modal.getByRole('menuitem', { name: 'ControllableDurationActivity' }).click();
+    await page.keyboard.press('Escape');
+
+    expect(await resultingTypesList.getByText('ChangeProducer')).toBeDefined();
+    expect(await resultingTypesList.getByText('ControllableDurationActivity')).toBeDefined();
+
+    // Expect that dynamic types can be added
+    await modal.getByLabel('dynamic-types').getByRole('button', { name: 'Add Filter' }).click();
+    expect(await modal.getByLabel('dynamic-types').getByRole('listitem').count()).toBe(1);
+    await modal.getByLabel('dynamic-types').getByRole('listitem').locator("input[name='filter-value']").fill('banana');
+    expect(await resultingTypesList.locator('.activity-type-result').count()).toEqual(11);
+
+    // Expect that global filters can be added
+    await modal.getByLabel('global-filters').getByRole('button', { name: 'Add Filter' }).click();
+    expect(await modal.getByLabel('global-filters').getByRole('listitem').count()).toBe(1);
+    // Select parameter field
+    await modal.getByLabel('global-filters').locator("select[aria-label='field']").selectOption('Parameter');
+    // Select specific parameter
+    await modal.getByLabel('global-filters').getByText('Select Parameter').click();
+    await modal.getByLabel('global-filters').getByText('quantity (int)').click();
+    // Select operator
+    await modal.getByLabel('global-filters').locator("select[aria-label='operator']").selectOption('equals');
+    // Fill filter value input
+    await modal.getByLabel('global-filters').getByRole('listitem').locator("input[name='filter-value']").fill('10');
+    // Ensure that only one instance (PickBanana) is listed
+    expect(await modal.getByText('1 instance')).toBeDefined();
+
+    // Expect that type subfilters can be added
+    const activityResult = resultingTypesList.getByRole('listitem', { name: 'activity-type-result-PickBanana' });
+    await activityResult.getByRole('button', { name: 'Add Filter' }).click();
+    expect(await activityResult.getByRole('listitem').count()).toBe(1);
+    // Select name field
+    await activityResult.locator("select[aria-label='field']").selectOption('Name');
+    // Select operator
+    await activityResult.locator("select[aria-label='operator']").selectOption('includes');
+    // Fill filter value input
+    await activityResult.getByRole('listitem').locator("input[name='filter-value']").fill('foo');
+    // Ensure that only one instance (PickBanana) is listed
+    expect(await modal.getByText('0 instances')).toBeDefined();
+
+    // Expect that type subfilters can be removed
+    await activityResult.getByRole('button', { name: 'Remove filter' }).click();
+    expect(await modal.getByText('1 instance')).toBeDefined();
+
+    // Expect that global filters can be removed
+    await modal.getByLabel('global-filters').getByRole('button', { name: 'Remove filter' }).click();
+    expect(await modal.getByText('2 instances')).toBeDefined();
+
+    // Expect that dynamic types can be removed
+    await modal.getByLabel('dynamic-types').getByRole('button', { name: 'Remove filter' }).click();
+    expect(await resultingTypesList.locator('.activity-type-result').count()).toEqual(2);
+
+    // Expect that manual types can be cleared
+    await modal.locator("input[name='manual-types-filter-input']").click();
+    await modal.getByRole('menuitem', { name: 'ChangeProducer' }).click();
+    await page.keyboard.press('Escape');
+    await modal.getByRole('button', { name: 'Remove Types' }).click();
+    expect(await resultingTypesList.locator('.activity-type-result').count()).toEqual(allActivityTypesCount);
+
+    // Close the modal
+    await page.pause();
+    await modal.getByRole('button', { name: 'close' }).click();
+  });
 
-    // Add all activities
-    await page.locator('button', { hasText: /Select [0-9]* activit/ }).click();
+  test('Change activity layer settings', async () => {
+    const activityLayerEditor = await page.getByLabel('Activity Layer-editor');
 
     // Expect to not see an activity tree group in this row
     expect(await page.locator('.timeline-row-wrapper', { hasText: rowName }).locator('.activity-tree').count()).toBe(0);
@@ -141,9 +232,7 @@ test.describe.serial('Timeline View Editing', () => {
     ).toBe(1);
 
     // Delete an activity layer
-    await page.getByRole('button', { name: 'Layer Settings' }).last().click();
-    await page.getByText('Delete Layer').click();
-    const finalLayerCount = await page.locator('.timeline-layer').count();
-    expect(finalLayerCount - newLayerCount).toEqual(-1);
+    await activityLayerEditor.locator('.timeline-layer-editor').first().getByRole('button', { name: 'Delete' }).click();
+    expect(await activityLayerEditor.locator('.timeline-layer-editor').count()).toBe(0);
   });
 });
diff --git a/src/components/timeline/form/TimelineEditor/ActivityFilterBuilder.svelte b/src/components/timeline/form/TimelineEditor/ActivityFilterBuilder.svelte
index 7929e0498e..08196e96bd 100644
--- a/src/components/timeline/form/TimelineEditor/ActivityFilterBuilder.svelte
+++ b/src/components/timeline/form/TimelineEditor/ActivityFilterBuilder.svelte
@@ -14,6 +14,7 @@
   import type { ValueSchemaVariant } from '../../../../types/schema';
   import type { ActivityLayerFilter, ActivityLayerFilterSubfieldSchema } from '../../../../types/timeline';
   import { compare, getTarget, lowercase } from '../../../../utilities/generic';
+  import { pluralize } from '../../../../utilities/text';
   import {
     applyActivityLayerFilter,
     getMatchingTypesForActivityLayerFilter,
@@ -341,8 +342,8 @@
 <div bind:this={rootRef} class="w-100" style:display="grid">
   <slot name="trigger" />
   {#if shown}
-    <!-- TODO maybe pass in dimensions? -->
     <Draggable
+      ariaLabel="activity-filter-builder"
       className="st-menu activity-filter-builder"
       initialWidth={filterWidth}
       initialHeight={filterHeight}
@@ -356,11 +357,12 @@
             autocomplete="off"
             class="st-input cancel-drag"
             name="layer-name"
+            aria-label="layer-name"
             placeholder="Enter a name for this filter..."
             style="width: 220px"
             on:input={onLayerNameChange}
           />
-          <button on:click|stopPropagation={hide} class="st-button icon">
+          <button on:click|stopPropagation={hide} class="st-button icon" aria-label="close">
             <CloseIcon />
           </button>
         </MenuHeader>
@@ -368,7 +370,7 @@
       <div class="body">
         <CssGrid columns="0.7fr 3px 0.3fr" columnMinSizes={{ 0: 500, 1: 3, 2: 300 }} class="activity-filter-grid">
           <div class="filters">
-            <div class="filter-section">
+            <div class="filter-section" aria-label="manual-types">
               <div class="filter-section-header st-typography-medium">
                 Manually Select Types
                 {#if dirtyFilter.static_types?.length}
@@ -387,6 +389,7 @@
                     <div class="search-icon" slot="left"><SearchIcon /></div>
                     <input
                       bind:this={manualInputRef}
+                      name="manual-types-filter-input"
                       class="st-input w-100 manual-types-filter-input"
                       placeholder="Select types"
                       bind:value={manualInputValue}
@@ -441,7 +444,7 @@
                 {/if}
               </div>
             </div>
-            <div class="filter-section">
+            <div class="filter-section" aria-label="dynamic-types">
               <div class="filter-section-header st-typography-medium">
                 <div class="filter-section-title">
                   Dynamically Select Types
@@ -450,6 +453,7 @@
                 <button
                   class="st-button icon"
                   on:click={() => onAddDynamicFilter('dynamic_type_filters')}
+                  aria-label="Add Filter"
                   use:tooltip={{ content: 'Add Filter' }}
                 >
                   <FilterWithPlusIcon />
@@ -457,7 +461,7 @@
               </div>
               {#if dirtyFilter.dynamic_type_filters?.length}
                 <div class="filter-section-content">
-                  <div class="dynamic-filter-content">
+                  <div class="dynamic-filter-content" role="list">
                     {#each dirtyFilter.dynamic_type_filters as filter, i (filter.id)}
                       <DynamicFilter
                         {filter}
@@ -482,7 +486,7 @@
                 </div>
               {/if}
             </div>
-            <div class="filter-section">
+            <div class="filter-section" aria-label="global-filters">
               <div class="filter-section-header st-typography-medium">
                 <div class="filter-section-title">
                   Global Filters
@@ -490,6 +494,7 @@
                 </div>
                 <button
                   class="st-button icon"
+                  aria-label="Add Filter"
                   on:click={() => onAddDynamicFilter('global_filters')}
                   use:tooltip={{ content: 'Add Filter' }}
                 >
@@ -498,7 +503,7 @@
               </div>
               {#if dirtyFilter.global_filters?.length}
                 <div class="filter-section-content">
-                  <div class="dynamic-filter-content">
+                  <div class="dynamic-filter-content" role="list">
                     {#each dirtyFilter.global_filters as filter, i (filter.id)}
                       <DynamicFilter
                         {filter}
@@ -539,7 +544,7 @@
               Resulting Types
               <div class="resulting-types-info-container">
                 <div class="resulting-types-info"><DirectiveIcon /> {matchingTypes.length} types</div>
-                <div class="resulting-types-info"><SpanIcon /> {instanceCount} instances</div>
+                <div class="resulting-types-info"><SpanIcon /> {instanceCount} instance{pluralize(instanceCount)}</div>
               </div>
             </div>
             <Input>
@@ -553,6 +558,7 @@
                     slot="right"
                     on:click={() => onAddTypeSubfilter(type.name)}
                     class="st-button icon"
+                    aria-label="Add Filter"
                     use:tooltip={{ content: 'Add Filter' }}
                   >
                     <FilterWithPlusIcon />
diff --git a/src/components/timeline/form/TimelineEditor/ActivityTypeResult.svelte b/src/components/timeline/form/TimelineEditor/ActivityTypeResult.svelte
index 5f932eb7eb..3e212952b3 100644
--- a/src/components/timeline/form/TimelineEditor/ActivityTypeResult.svelte
+++ b/src/components/timeline/form/TimelineEditor/ActivityTypeResult.svelte
@@ -15,7 +15,7 @@
   }>();
 </script>
 
-<div class="activity-type-result">
+<div class="activity-type-result" role="listitem" aria-label="activity-type-result-{name}">
   <div class="top-row">
     <div class="title st-typography-medium">
       <DirectiveIcon />
diff --git a/src/components/timeline/form/TimelineEditor/Draggable.svelte b/src/components/timeline/form/TimelineEditor/Draggable.svelte
index 59988df4ec..3bc817e44f 100644
--- a/src/components/timeline/form/TimelineEditor/Draggable.svelte
+++ b/src/components/timeline/form/TimelineEditor/Draggable.svelte
@@ -4,6 +4,7 @@
   import { draggable, type DragOptions } from '@neodrag/svelte';
   import Resizable from './Resizable.svelte';
 
+  export let ariaLabel: string = '';
   export let dragOptions: DragOptions = {};
   export let className: string = '';
   export let initialWidth: number = 500;
@@ -26,6 +27,7 @@
 </script>
 
 <div
+  aria-label={ariaLabel}
   bind:this={rootRef}
   use:draggable={{
     bounds: 'body',
diff --git a/src/components/timeline/form/TimelineEditor/DynamicFilter.svelte b/src/components/timeline/form/TimelineEditor/DynamicFilter.svelte
index 620aab4dee..85da5ee264 100644
--- a/src/components/timeline/form/TimelineEditor/DynamicFilter.svelte
+++ b/src/components/timeline/form/TimelineEditor/DynamicFilter.svelte
@@ -175,7 +175,7 @@
   $: currentValueAsStringOrNumber = currentValue as string | number;
 </script>
 
-<div class="dynamic-filter">
+<div class="dynamic-filter" role="listitem">
   {#if verb}
     <div class="st-typography-body verb">{verb}</div>
   {/if}
@@ -204,12 +204,13 @@
   </select>
   <div class="dynamic-filter-value">
     {#if currentType === 'string'}
-      <input class="st-input w-100" bind:value={currentValue} />
+      <input name="filter-value" aria-label="value" class="st-input w-100" bind:value={currentValue} />
     {:else if currentOperator === 'is_within' || currentOperator === 'is_not_within'}
       {#if Array.isArray(currentValue)}
         <div class="range-input">
           <Input class="dynamic-filter-input">
             <input
+              name="filter-value-min"
               aria-label="value-min"
               class="st-input w-100"
               type="number"
@@ -222,6 +223,7 @@
           <div class="st-typography-label">To</div>
           <Input class="dynamic-filter-input">
             <input
+              name="filter-value-max"
               aria-label="value-max"
               class="st-input w-100"
               type="number"
@@ -235,20 +237,20 @@
       {/if}
     {:else if currentType === 'int' || currentType === 'real'}
       <Input class="dynamic-filter-input">
-        <input aria-label="value" bind:value={currentValue} class="st-input w-100" type="number" />
+        <input name="filter-value" aria-label="value" bind:value={currentValue} class="st-input w-100" type="number" />
         <div class="parameter-right" slot="right">
           <ParameterUnits unit={currentUnit} />
         </div>
       </Input>
     {:else if currentType === 'duration'}
       <Input class="dynamic-filter-input">
-        <input aria-label="value" bind:value={currentValue} class="st-input w-100" type="number" />
+        <input name="filter-value" aria-label="value" bind:value={currentValue} class="st-input w-100" type="number" />
         <div class="parameter-right" slot="right">
           <ParameterUnits unit="ms" />
         </div>
       </Input>
     {:else if currentType === 'boolean'}
-      <select aria-label="value" class="st-select w-100" bind:value={currentValue}>
+      <select name="filter-value" aria-label="value" class="st-select w-100" bind:value={currentValue}>
         <option value={true}>True</option>
         <option value={false}>False</option>
       </select>
@@ -270,6 +272,7 @@
       )}
       <div style:width="100%">
         <TagsInput
+          name="filter-value"
           options={currentValuePossibilities}
           selected={currentValueTags}
           on:change={onTagsInputChange}
diff --git a/src/components/timeline/form/TimelineEditor/EditorSection.svelte b/src/components/timeline/form/TimelineEditor/EditorSection.svelte
index 19c306f08d..bb7c5e7be2 100644
--- a/src/components/timeline/form/TimelineEditor/EditorSection.svelte
+++ b/src/components/timeline/form/TimelineEditor/EditorSection.svelte
@@ -21,7 +21,10 @@
   }>();
 </script>
 
-<fieldset class={classNames('editor-section', { 'editor-section-draggable': isDragContainer })}>
+<fieldset
+  aria-label="{item}-editor"
+  class={classNames('editor-section', { 'editor-section-draggable': isDragContainer })}
+>
   <div class="editor-section-header">
     <div class="st-typography-medium">{pluralizedItem}</div>
     {#if creatable}
@@ -36,6 +39,7 @@
           </button>
         {/if}
         <button
+          aria-label={`New ${item}`}
           on:click|stopPropagation={() => dispatch('create')}
           use:tooltip={{ content: `New ${item}`, placement: 'top' }}
           class="st-button icon"
diff --git a/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte b/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
index d7c69eb80f..996a6ae678 100644
--- a/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
+++ b/src/components/timeline/form/TimelineEditor/TimelineLayerEditor.svelte
@@ -133,6 +133,7 @@
         bind:this={filterMenu}
       >
         <button
+          aria-label="activity-filter-builder-trigger"
           slot="trigger"
           on:click|stopPropagation={toggleFilterMenu}
           class="st-button icon w-100"
diff --git a/src/components/timeline/form/TimelineEditorPanel.svelte b/src/components/timeline/form/TimelineEditorPanel.svelte
index 6669cc3aea..e1ce91d401 100644
--- a/src/components/timeline/form/TimelineEditorPanel.svelte
+++ b/src/components/timeline/form/TimelineEditorPanel.svelte
@@ -670,30 +670,6 @@
             <div />
           {/if}
         </EditorSection>
-
-        <!-- <fieldset class="editor-section editor-section-draggable">
-          <div class="editor-section-header editor-section-header-with-button">
-            <div class="st-typography-medium">Rows</div>
-            <div>
-              {#if rows.length}
-                <button
-                  on:click|stopPropagation={removeAllTimelineRows}
-                  use:tooltip={{ content: 'Delete All Rows', placement: 'top' }}
-                  class="st-button icon"
-                >
-                  <RemoveAllIcon />
-                </button>
-              {/if}
-              <button
-                on:click={addTimelineRow}
-                use:tooltip={{ content: 'New Row', placement: 'top' }}
-                class="st-button icon"
-              >
-                <PlusIcon />
-              </button>
-            </div>
-          </div>
-        </fieldset> -->
       {/if}
     {:else}
       <!-- Row editing -->