Navbar refactor

NICE!