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

This reverts commit 32efe284c03445974beceddcc9b9fcb48d47c150.