Move settings around a bit