+ move fields into settings