Improved Navbar, changed attribute handling