Tidy up Navbar, and footer