Revert "Revert "fix nav bar""

This reverts commit d44113746fe809d94c094b80df643b99cc3dd797.