Revamp Settings

Change-Id: I78e56eab45979ebd2903cf7884d0b6206fd1d4b3