Revert "Revamped navigation bar logic - port forward"

This reverts commit bbc260da624d9622d7eeacd407128d841d10f7e5.