Settings: Update and clean up the settings app

Change-Id: I8e6ab2451b116c8039d270f80829fe0a1cfedeb3