Rearrange settings headers/dashboard

Change-Id: I82aaa65dc05d35ffc343ed4407f3a88cb4b3df91