Revert "Revert "Add an option to enable/disable the Navigation Bar (2/2)""

This reverts commit 64e22e40c759fa0a709360986bb39bf43d2255ec.