Revert "Derp"

This reverts commit f65b1661329ae9216c32f8d1092bd3dc4c33fb3a.
Revert "Single pane for 10" Settings"

This reverts commit 9c5debb2bbcb5501c48866b17f286f82e0a43a15.