Improved navbar
Improved navbar