Settings: Settings revamp (2 of 2)

Change-Id: I6b7a6b46230ab8cb7f737a3327f76b08aa65a6c7