More navbar improvements