SLight refactor of settings form