Rearrange Settings

Change-Id: Ia868ad88a4ccc659342c44e99a2bff2bbfc0db63