Bugfix #84, bugfix with timeline creation, style fixes.

__Code Review:__
http://mrccodereview.cloudapp.net/ui#review:id=1125