Rearranged setting headers

- There isn't a damn thing "personal" about these headers. This looks better anyways!

Change-Id: I19a15626c93b7b7cb47dcdd78e5e8a02fd73b5b8