Move some of the "various settings" in their proper sections.