Field type cleanup
Moved User Groups above Users
Global Sets cleanup