Move some settings around