Derp Fix: ReOrder Settings

Change-Id: If5fa47052c12af40e433c0c15246999c181a4bdf