Integrated into the original settings design, except using tabs rather than list & stacked widgets.  Works but visuals need updating.
Cleaned up comments and dead code.