Cleaned up Navbar layout
Merge branch 'steve' into stage