More refactoring + Navbar is now a custom tag