Navbar HTML fixes, starting HTML refactoring.