Refactored the timeline display