Reorganize Settings Menu

Change-Id: I02678d6a083d32d0542e6e61c8ff1215ee2ef43c