Settings: Settings revamp (1 of 2)

Change-Id: I80cf17071993a79822eb110148733c73b48637bc