Settings: More candy/clean-up

Change-Id: I8a95ef37aa8569009d5657f2d0afcf0bdabc4d0b