Re-arrange settings options

Change-Id: Id4740209a98b1ebfc5435e7985a07fe6f2fa42d5