Navbar template cleanup and formatting :cat: