Move more stuff out of Preferences