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

This reverts commit 190f5453aa214992f3874f3a08b9f3f94e2b265b.