Move more things to settings