First round of Admin revisions.
Some more revisions.
Merge branch 'field-reorg'