Navbar improve
Merge with steven