Done some work on the timeline view