Adding timeline layout
Syncing changes before messing around