diff --git a/src/plugins/events/components/EventTimelineView.vue b/src/plugins/events/components/EventTimelineView.vue
index a0ae91d41a..dea7118af1 100644
--- a/src/plugins/events/components/EventTimelineView.vue
+++ b/src/plugins/events/components/EventTimelineView.vue
@@ -21,11 +21,7 @@
 -->
 
 <template>
-  <div
-    ref="events"
-    class="c-events-tsv c-timeline-holder c-events-tsv__contents"
-    :style="{ left: leftOffset + 'px' }"
-  />
+  <div ref="events" class="c-events-tsv js-events-tsv" :style="{ left: leftOffset + 'px' }" />
 </template>
 
 <script>
@@ -40,11 +36,10 @@ import { useAlignment } from '../../../ui/composables/alignmentContext.js';
 import eventData from '../mixins/eventData.js';
 
 const PADDING = 1;
-const ROW_HEIGHT = 100;
-const CONTAINER_CLASS = 'c-events-tsv-container';
+const CONTAINER_CLASS = 'c-events-tsv__container';
 const NO_ITEMS_CLASS = 'c-events-tsv__no-items';
 const EVENT_WRAPPER_CLASS = 'c-events-tsv__event-wrapper';
-const EVENT_SELECTED_CLASS = '.c-event-selected';
+const EVENT_SELECTED_CLASS = 'is-selected';
 const ID_PREFIX = 'wrapper-';
 const AXES_PADDING = 20;
 
@@ -295,7 +290,7 @@ export default {
       let existingContainer = this.$el.querySelector(`.${CONTAINER_CLASS}`);
       if (existingContainer) {
         eventContainer = existingContainer;
-        eventContainer.style.maxWidth = `${containerWidth}px`;
+        // eventContainer.style.maxWidth = `${containerWidth}px`;
       } else {
         if (this.destroyEventsContainer) {
           this.destroyEventsContainer();
@@ -315,7 +310,7 @@ export default {
             },
             template: `<swim-lane :is-nested="isNested" :hide-label="true">
                         <template v-slot:object>
-                          <div class="c-events-tsv-container"/>
+                          <div class="c-events-tsv__container"/>
                         </template>
                        </swim-lane>`
           },
@@ -329,8 +324,8 @@ export default {
         this.$refs.events.appendChild(component.$el);
 
         eventContainer = component.$el.querySelector(`.${CONTAINER_CLASS}`);
-        eventContainer.style.maxWidth = `${containerWidth}px`;
-        eventContainer.style.height = `${containerHeight}px`;
+        // eventContainer.style.maxWidth = `${containerWidth}px`;
+        // eventContainer.style.height = `${containerHeight}px`;
       }
 
       return eventContainer;
@@ -348,7 +343,7 @@ export default {
       }
     },
     plotNoItems(containerElement) {
-      const textElement = document.createElement('text');
+      const textElement = document.createElement('div');
       textElement.classList.add(NO_ITEMS_CLASS);
       textElement.innerHTML = 'No events within timeframe';
 
@@ -357,7 +352,7 @@ export default {
     getEventWrapper(item) {
       const id = `${ID_PREFIX}${item.time}`;
 
-      return this.$el.querySelector(`.c-events-tsv__contents div[id=${id}]`);
+      return this.$el.querySelector(`.js-events-tsv div[id=${id}]`);
     },
     plotEvents(item, containerElement) {
       const existingEventWrapper = this.getEventWrapper(item);
@@ -433,8 +428,6 @@ export default {
       eventWrapper.style.left = `${this.xScale(event.time)}px`;
       const eventTickElement = document.createElement('div');
       eventTickElement.classList.add('c-events-tsv__event-handle');
-      eventTickElement.style.width = '2px';
-      eventTickElement.style.height = `${String(ROW_HEIGHT - 10)}px`;
       if (this.titleKey) {
         const textToShow = event[this.titleKey];
         eventWrapper.addEventListener('mouseover', () => {
@@ -492,6 +485,7 @@ export default {
       }
     },
     toggleEventSelection(clickedEvent) {
+      console.log(clickedEvent);
       this.selectedEvent?.classList.remove(EVENT_SELECTED_CLASS);
       clickedEvent.classList.add(EVENT_SELECTED_CLASS);
       this.selectedEvent = clickedEvent;
diff --git a/src/plugins/events/components/events-view.scss b/src/plugins/events/components/events-view.scss
index 5927497877..53d74ace9f 100644
--- a/src/plugins/events/components/events-view.scss
+++ b/src/plugins/events/components/events-view.scss
@@ -1,13 +1,23 @@
 .c-events-tsv {
+    $m: $interiorMargin;
     overflow: hidden;
+    @include abs();
+
+    &__container {
+        // Holds event lines
+        background: $colorPlotBg;
+        box-shadow: inset $colorPlotAreaBorder 0 0 0 1px; // Using box-shadow instead of border to not affect box size
+        position: absolute;
+        top: $m; right: 0; bottom: $m; left: 0;
+    }
 
     &__event-wrapper {
         // Wraps an individual event line
         // Also holds the hover flyout element
         $c: $colorEventLine;
-        $lineW: 2px;
-        $hitAreaW: 6px;
-        $m: $interiorMargin;
+        $lineW: $eventLineW;
+        $hitAreaW: 7px;
+        $m: $interiorMarginSm;
         background-color: rgba($c, 0.6);
         cursor: pointer;
         position: absolute;
@@ -38,7 +48,10 @@
     }
 
     &__no-items {
-        fill: $colorBodyFg !important;
+        position: absolute;
+        left: $interiorMargin;
+        top: 50%;
+        transform: translateY(-50%);
     }
 }
 
diff --git a/src/plugins/timeline/timeline.scss b/src/plugins/timeline/timeline.scss
index 30511877d0..730ca8e4c2 100644
--- a/src/plugins/timeline/timeline.scss
+++ b/src/plugins/timeline/timeline.scss
@@ -38,22 +38,25 @@
 .c-timeline {
     &__objects {
         display: contents;
+
+        .c-swimlane {
+            min-height: 100px; // TEMP!! Will be replaced when heights are set by user
+        }
     }
 
     &__overlay-lines {
         //background: rgba(deeppink, 0.2);
         @include abs();
-        pointer-events: none; /* Allows clicks to pass through */
-        z-index: 10; /* Ensure it sits atop swimlanes */
+        pointer-events: none; // Allows clicks to pass through
+        z-index: 10; // Ensure it sits atop swimlanes
     }
 
     &__extended-line {
-        opacity: 0.3;
         position: absolute;
         top: 20px; // Offset down to line up with time axis ticks line
-        width: 2px;
-        pointer-events: auto;
-        background-color: $colorEventLine; //$colorBodyFg; /* Use desired color */
+        width: $eventLineW;
+        pointer-events: auto; // TODO: don't think we want this, extended lines shouldn't be accepting pointer events
+        background-color: $colorEventLineExtended;
     }
 
     &__extended-line-hovered {
diff --git a/src/styles/_constants-darkmatter.scss b/src/styles/_constants-darkmatter.scss
index 2d75f179f6..bf709609fb 100644
--- a/src/styles/_constants-darkmatter.scss
+++ b/src/styles/_constants-darkmatter.scss
@@ -519,6 +519,7 @@ $colorInProgressFgEm: $colorTimeRealtimeFg;
 $colorGanttSelectedBorder: rgba(#fff, 0.3);
 $colorEventLine: $colorBodyFg;
 $colorEventLineExtended: rgba($colorEventLine, 0.3);
+$eventLineW: 1px;
 
 // Tree
 $colorTreeBg: transparent;
diff --git a/src/styles/_constants-espresso.scss b/src/styles/_constants-espresso.scss
index b67105c409..dffe6a0612 100644
--- a/src/styles/_constants-espresso.scss
+++ b/src/styles/_constants-espresso.scss
@@ -484,6 +484,7 @@ $colorInProgressFgEm: $colorTimeRealtimeFg;
 $colorGanttSelectedBorder: rgba(#fff, 0.3);
 $colorEventLine: $colorBodyFg;
 $colorEventLineExtended: rgba($colorEventLine, 0.3);
+$eventLineW: 1px;
 
 // Tree
 $colorTreeBg: transparent;
diff --git a/src/styles/_constants-maelstrom.scss b/src/styles/_constants-maelstrom.scss
index 6482406e71..c98618c88b 100644
--- a/src/styles/_constants-maelstrom.scss
+++ b/src/styles/_constants-maelstrom.scss
@@ -500,6 +500,7 @@ $colorInProgressFgEm: $colorTimeRealtimeFg;
 $colorGanttSelectedBorder: rgba(#fff, 0.3);
 $colorEventLine: $colorBodyFg;
 $colorEventLineExtended: rgba($colorEventLine, 0.3);
+$eventLineW: 1px;
 
 // Tree
 $colorTreeBg: transparent;
diff --git a/src/styles/_constants-snow.scss b/src/styles/_constants-snow.scss
index f4f10b4513..381094e010 100644
--- a/src/styles/_constants-snow.scss
+++ b/src/styles/_constants-snow.scss
@@ -483,6 +483,7 @@ $colorInProgressFgEm: $colorCurrentFgEm;
 $colorGanttSelectedBorder: #fff;
 $colorEventLine: $colorBodyFg;
 $colorEventLineExtended: rgba($colorEventLine, 0.3);
+$eventLineW: 1px;
 
 // Tree
 $colorTreeBg: transparent;
diff --git a/src/ui/components/swim-lane/SwimLane.vue b/src/ui/components/swim-lane/SwimLane.vue
index fa99d130ba..8d3008656c 100644
--- a/src/ui/components/swim-lane/SwimLane.vue
+++ b/src/ui/components/swim-lane/SwimLane.vue
@@ -55,11 +55,7 @@
         />
       </div>
     </div>
-    <div
-      class="c-swimlane__lane-object"
-      :style="{ 'min-height': minHeight }"
-      :class="{ 'u-contents': showUcontents }"
-    >
+    <div class="c-swimlane__lane-object" :class="{ 'u-contents': showUcontents }">
       <slot name="object"></slot>
     </div>
   </div>
diff --git a/src/ui/components/swim-lane/swimlane.scss b/src/ui/components/swim-lane/swimlane.scss
index d2c17f0538..f24074c42b 100644
--- a/src/ui/components/swim-lane/swimlane.scss
+++ b/src/ui/components/swim-lane/swimlane.scss
@@ -24,7 +24,7 @@
   display: grid;
   grid-template-columns: 100px 100px 1fr;
   grid-column-gap: 1px;
-  grid-row-gap: 1px; // Is this being used?
+  grid-row-gap: 1px; // Used for grid within a swimlane for Plan views
   width: 100%;
 
   &.is-status--draft {
@@ -43,6 +43,7 @@
 
   &__lane-object {
     background: rgba(black, 0.1);
+    height: 100%;
 
     .c-plan {
       display: contents;