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

This reverts commit 5b502a0a5bcc8a8b3d98d5c1e819bdf933876aa9.