Revert "Revert "Revert "Revert "Single pane for 10" Settings""""

This reverts commit 5eb7734bc42d26c18abf02e5541e9155657f657e.