removed old timeline
Refacture code for the new timeline display
Fixed new timeline