New prefs and re-ordered for better organization