Move some settings from general to editing