Settings: Update

Revert "Single pane for 10" Settings"

This reverts commit 56f51a8927f53bee81145fe29e63af8a87e6fd1b.

- cleanup

- derp