Added entry view

Split timeline view into layout and view
Fixed checking out to correct branch