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

This reverts commit b764339d3c357fb35a46e04383397a2b0ed0ea00.