Merge branch 'master' into views
Using model for rendering topBar

topbarView not working yet
Topbar now shows and the buttons are functional
Merge branch 'views'