removing old timeline code
fixing view bugs
brutally hacking in the timeline