Button Settings menu reorder

Change-Id: I5b0bbde4e7f4ea8b80a32a81aa01888621299515