corrections to timeline code
branch merge
Code cleanup, resize and update fixes to timeline