diff --git a/src/components/Timeline.jsx b/src/components/Timeline.jsx
index fb8e713..eacec4c 100644
--- a/src/components/Timeline.jsx
+++ b/src/components/Timeline.jsx
@@ -11,6 +11,8 @@ import TimelineZoomControls from './TimelineZoomControls.jsx';
 import TimelineLogic from '../js/timeline/timeline.js';
 import TimelineLabels from './TimelineLabels.jsx';
 import TimelineMarkers from './TimelineMarkers.jsx'
+import TimelineEvents from './TimelineEvents.jsx';
+import TimelineCategories from './TimelineCategories.jsx';
 
 class Timeline extends React.Component {
   constructor(props) {
@@ -59,14 +61,14 @@ class Timeline extends React.Component {
     if (this.timeline) {
       return this.timeline.moveTime(dir);
     }
-    return '';
+    return null;
   }
 
   onApplyZoom(zoom) {
     if (this.timeline) {
       return this.timeline.applyZoom(zoom);
     }
-    return '';
+    return null;
   }  
 
   renderSVG() {
@@ -84,7 +86,15 @@ class Timeline extends React.Component {
         <TimelineHandles dims={dims} onMoveTime={(dir) => { this.onMoveTime(dir) }} />
         <TimelineZoomControls zoomLevels={this.props.app.zoomLevels} dims={dims} onApplyZoom={(zoom) => { this.onApplyZoom(zoom); }} />
         <TimelineLabels dims={dims} timelabels={this.props.app.timerange} />
+        <TimelineCategories categories={this.props.domain.categories} />
         <TimelineMarkers selected={this.props.app.selected} getEventX={(e) => this.timeline.getEventX(e)} getEventY={(e) => this.timeline.getEventY(e)} />
+        <TimelineEvents
+          events={this.props.domain.events}
+          getEventX={(e) => this.timeline.getEventX(e)}
+          getEventY={(e) => this.timeline.getEventY(e)}
+          getCategoryColor={this.props.methods.getCategoryColor}
+          onSelect={this.props.methods.onSelect}
+        />
       </svg>
     ); 
   }
diff --git a/src/components/TimelineCategories.jsx b/src/components/TimelineCategories.jsx
new file mode 100644
index 0000000..fc84ed9
--- /dev/null
+++ b/src/components/TimelineCategories.jsx
@@ -0,0 +1,31 @@
+import React from 'react';
+
+class TimelineCategories extends React.Component {
+
+  getY(idx) {
+    const h = 76;
+    console.log((idx + 1) * h / this.props.categories.length)
+    return (idx + 1) * h / this.props.categories.length;
+  }
+
+  renderCategory(cat, idx) {
+    return (
+      <g class="tick" opacity="1" transform={`translate(0,${this.getY(idx)})`}>
+        <line stroke="red" x2="-720"></line>
+        <text fill="blue" x="-723" dy="0.32em">{cat.category}</text>
+      </g>
+    );
+  }
+
+  render () {
+    console.log(this.props.categories)
+    return (
+      <g transform="translate(840, 0)" class="yAxis" fill="none" font-size="10" font-family="sans-serif" text-anchor="end">
+        <path class="domain" stroke="currentColor" d="M-720,38.5H0.5V76.5H-720"></path>
+        {this.props.categories.map((cat, idx) => { return this.renderCategory(cat, idx); })}
+      </g>    
+    );        
+  }
+}
+
+export default TimelineCategories;
\ No newline at end of file
diff --git a/src/components/TimelineEvents.jsx b/src/components/TimelineEvents.jsx
new file mode 100644
index 0000000..9b8462e
--- /dev/null
+++ b/src/components/TimelineEvents.jsx
@@ -0,0 +1,41 @@
+import React from 'react';
+
+class TimelineEvents extends React.Component {
+
+  getAllEventsAtOnce(eventPoint) {
+    const timestamp = eventPoint.timestamp;
+    const category = eventPoint.category;
+    return this.props.events
+      .filter(event => (event.timestamp === timestamp && category === event.category))
+  }
+
+  renderEvent(event) {
+    return (
+      <circle
+        className="event"
+        cx={0}
+        cy={0}
+        style={{
+          'transform': `translate(${this.props.getEventX(event)}px, ${this.props.getEventY(event)}px)`,
+          'transition': 'transform 0.5s ease'
+        }}
+        r={5}        
+        fill={this.props.getCategoryColor(event.category)}
+        onClick={() => {this.props.onSelect(this.getAllEventsAtOnce(event))}}
+      >
+      </circle>
+    )
+  }
+
+  render () {
+    return (
+      <g
+        clipPath={"url(#clip)"}
+      >
+        {this.props.events.map(event => this.renderEvent(event))}
+      </g>
+    );
+  }
+}
+
+export default TimelineEvents;
\ No newline at end of file
diff --git a/src/js/timeline/timeline.js b/src/js/timeline/timeline.js
index c475d1f..7745341 100644
--- a/src/js/timeline/timeline.js
+++ b/src/js/timeline/timeline.js
@@ -12,13 +12,10 @@ export default function(svg, newApp, ui, methods) {
   d3.timeFormatDefaultLocale(esLocale);
 
   const domain = {
-    events: [],
-    categories: [],
-    narratives: []
+    categories: []
   }
   const app = {
     timerange: newApp.timerange,
-    selected: []
   }
 
   // Dimension of the client
@@ -64,17 +61,9 @@ export default function(svg, newApp, ui, methods) {
     .attr('transform', `translate(0, 105)`)
     .attr('class', 'axis axisHourText');
 
-  dom.axis.y = dom.svg.append('g')
+  /*dom.axis.y = dom.svg.append('g')
     .attr('transform', `translate(${WIDTH}, 0)`)
-    .attr('class', 'yAxis');
-
-  /*
-   * Plottable elements
-   */
-
-  dom.body = dom.svg.append("g").attr("clip-path", "url(#clip)");
-  dom.events = dom.body.append('g');
-
+    .attr('class', 'yAxis');*/
 
   /*
    * Initialize axis function and element group
@@ -95,9 +84,9 @@ export default function(svg, newApp, ui, methods) {
     .tickSize(0)
     .tickFormat(d3.timeFormat('%H:%M'));
 
-  axis.y =
+  /*axis.y =
     d3.axisLeft(scale.y)
-    .tickValues([]);
+    .tickValues([]);*/
 
   updateAxis();
 
@@ -127,19 +116,6 @@ export default function(svg, newApp, ui, methods) {
     });
   }
   addResizeListener();
-  
-
-  /**
-   * Given an event, get all the filtered events that happen simultaneously
-   * @param {object} eventPoint: regular eventPoint data
-   */
-  function getAllEventsAtOnce(eventPoint) {
-    const timestamp = eventPoint.timestamp;
-    const category = eventPoint.category;
-    return domain.events
-      .filter(event => (event.timestamp === timestamp && category === event.category))
-  }
-
 
   /*
    * Get y height of eventPoint, considering the ordinal Y scale
@@ -225,7 +201,9 @@ export default function(svg, newApp, ui, methods) {
       const newDomainF = d3.timeSecond.offset(app.timerange[1], timeShift);
 
       scale.x.domain([newDomain0, newDomainF]);
-      render();
+//      render();
+      app.timerange = scale.x.domain();
+      methods.onUpdateTimerange(scale.x.domain());
     })
     .on('end', () => {
       toggleTransition(true);
@@ -233,60 +211,6 @@ export default function(svg, newApp, ui, methods) {
       methods.onUpdateTimerange(scale.x.domain());
     });
 
-
-  /**
-   * Highlight event circle on hover
-   */
-  function handleMouseOver() {
-    d3.select(this)
-      .attr('r', 7)
-      .classed('mouseover', true);
-  }
-
-
-  /**
-   * Unhighlight event when mouse out
-   */
-  function handleMouseOut() {
-    d3.select(this)
-      .attr('r', 5)
-      .classed('mouseover', false);
-  }
-
-  /**
-   * Return event circles of different groups
-   */
-  function renderEvents() {
-    const eventsDom = dom.events
-      .selectAll('.event')
-      .data(domain.events, d => d.id);
-
-    eventsDom
-      .exit()
-      .remove();
-
-    eventsDom
-      .transition()
-      .duration(transitionDuration)
-      .attr('cx', eventPoint => getEventX(eventPoint));
-
-    eventsDom
-      .enter()
-      .append('circle')
-      .attr('class', 'event')
-      .attr('cx', eventPoint => getEventX(eventPoint))
-      .attr('cy', eventPoint => getEventY(eventPoint))
-      .style('fill', eventPoint => methods.getCategoryColor(eventPoint.category))
-      .on('click', eventPoint => methods.onSelect(getAllEventsAtOnce(eventPoint)))
-      .on('mouseover', handleMouseOver)
-      .on('mouseout', handleMouseOut)
-      .transition()
-      .delay(300)
-      .duration(200)
-      .attr('r', 5);
-  }
-
-
   /**
    * Render axis on timeline and viewbox boundaries
    */
@@ -307,11 +231,11 @@ export default function(svg, newApp, ui, methods) {
       .duration(transitionDuration)
       .call(axis.x1);
 
-    axis.y.tickSize(WIDTH - margin.left);
+    /*axis.y.tickSize(WIDTH - margin.left);
 
     dom.axis.y
       .call(axis.y)
-      .call(drag);
+      .call(drag);*/
   }
 
   /**
@@ -320,21 +244,18 @@ export default function(svg, newApp, ui, methods) {
    * @param {Object} app: Redux state app subtree
    */
   function updateAxis() {
-    const groupStep = (106 - 30) / domain.categories.length;
     let groupYs = Array.apply(null, Array(domain.categories.length));
     groupYs = groupYs.map((g, i) => {
-      //return 30 + i * groupStep;
-      const h = 106 - 30
-      return (i + 1) * h / groupYs.length - 15;
+      const h = 76;
+      return (i + 1) * h / groupYs.length;
     });
-
     scale.y = d3.scaleOrdinal()
       .domain(domain.categories)
       .range(groupYs);
 
-    axis.y =
+    /*axis.y =
       d3.axisLeft(scale.y)
-        .tickValues(domain.categories.map(c => c.category));
+        .tickValues(domain.categories.map(c => c.category));*/
   }
 
 
@@ -350,13 +271,10 @@ export default function(svg, newApp, ui, methods) {
 
     if (isNewDomain) {
       domain.categories = newDomain.categories;
-      domain.events = newDomain.events;
-      domain.narratives = newDomain.narratives;
     }
 
     if (isNewAppProps) {
       app.timerange = newApp.timerange;
-      app.selected = newApp.selected.slice(0);
     }
 
     if (isNewDomain || isNewAppProps) render();
@@ -365,7 +283,6 @@ export default function(svg, newApp, ui, methods) {
   function render() {
     updateAxis();
     renderAxis();
-    renderEvents();
   }
 
   return {