Revert "Enable/Disable NavBar [1/2]"

This reverts commit 3a53a7267b96b7b4a1c32b43621f88b0c9e2adc1.