Navbar improvements
New routes
Code legibility improved