Rearrange headers in settings

Change-Id: Ibd65ca0eca1ac0d96d80f2d9af3776273de1f4ec