Revert "Further adjustments on navigation bar"

This reverts commit 7edcd8f83e3288a8c548698689cb5bdc8556dc56.