Revert "Merge Navigation Bar and Pie Controls button config (1/2)"

This reverts commit ccc345a4121ac82d90d45098d3869823dd8b125a.