diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index a107f55..61a2c11 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -270,16 +270,16 @@ class Timeline extends React.Component {
               />
               <TimelineMarkers
                 selected={this.props.app.selected}
-                getEventX={(e) => this.getEventX(e)}
-                getEventY={(e) => this.getEventY(e)}
+                getEventX={this.getDatetimeX}
+                getCategoryY={this.getCategoryY}
                 transitionDuration={this.state.transitionDuration}
               />
               <TimelineEvents
                 datetimes={this.props.domain.datetimes}
                 styleDatetime={this.styleDatetime}
                 narrative={this.props.app.narrative}
-                getDatetimeX={this.getDatetimeX}
-                getCategoryY={this.state.scaleY}
+                getEventX={this.getEventX}
+                getCategoryY={this.getCategoryY}
                 getCategoryColor={this.props.methods.getCategoryColor}
                 transitionDuration={this.state.transitionDuration}
                 onSelect={this.props.methods.onSelect}
diff --git a/src/components/presentational/DatetimeDot.js b/src/components/presentational/DatetimeDot.js
index 3167821..a0d4b6e 100644
--- a/src/components/presentational/DatetimeDot.js
+++ b/src/components/presentational/DatetimeDot.js
@@ -11,7 +11,7 @@ export default ({
   <g
     className='datetime'
     transform={`translate(${x}, ${y})`}
-    onClick={() => onSelect(datetime.events)}
+    onClick={() => onSelect(events)}
   >
     <circle
       className="event"
diff --git a/src/components/presentational/TimelineMarkers.js b/src/components/presentational/TimelineMarkers.js
index 7126015..f780947 100644
--- a/src/components/presentational/TimelineMarkers.js
+++ b/src/components/presentational/TimelineMarkers.js
@@ -1,6 +1,6 @@
 import React from 'react';
 
-const TimelineMarkers = ({ getEventX, getEventY, transitionDuration, selected }) => {
+const TimelineMarkers = ({ getEventX, getCategoryY, transitionDuration, selected }) => {
   function renderMarker(event) {
     return (
       <circle
@@ -8,11 +8,11 @@ const TimelineMarkers = ({ getEventX, getEventY, transitionDuration, selected })
         cx={0}
         cy={0}
         style={{
-          'transform': `translate(${getEventX(event)}px, ${getEventY(event)}px)`,
+          'transform': `translate(${getEventX(event)}px, ${getCategoryY(event.category)}px)`,
           '-webkit-transition': `transform ${transitionDuration / 1000}s ease`,
           '-moz-transition': 'none',
           'opacity': 0.9
-        }}        
+        }}
         r="10"
       >
       </circle>
@@ -28,4 +28,4 @@ const TimelineMarkers = ({ getEventX, getEventY, transitionDuration, selected })
   );
 }
 
-export default TimelineMarkers;
\ No newline at end of file
+export default TimelineMarkers;