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

This reverts commit bb5f50f357adfd4b9abba86dda4fc80e5764e4ee.