Removing settings cruft, moving some settings up in order to make them more visible.