Rearrange settings menu

After reverting back to a stock Settings app, this is where
I start fresh.  It will progress from here.

Change-Id: I2e6ac2327159aa6a3798a7816ea7c9ac7df13d7f