Reorganize Settings

* Reworked order of display related options to make more sense
* Reworked order of NavBar options to better group together
* Reworked Lockscreen options to group better
* Changed 4x MSAA discription to make more sense
* Cleaned up a shit ton of whitespace/tab/spacing errors

Change-Id: I42867140c0aef75e919a9b8f9cf2323b0a8f46a3