Settings: Reflowed to separate device vs app settings

A lot of things were rearranged in this commit. Please post on the
forums or on Github issues if a serious issue comes up due to the
rearrangement.