Navbar cosmetics are set
Merge branch 'master' into angular
page loads with selected item selected