Fix Build
Revert "Fix Build"

This reverts commit 2c26437f6f70a14f9e6304633e58c9ec026e95db.
Revert "Revert "Single pane for 10" Settings""

This reverts commit 6ce8b0078a1616a8a7aa28cd70a64cd137bfa25a.