LUN-1657: moving admin formfields fields around
Merge pull request #37 from pbs/LUN-1657

LUN-1657: moving admin formfields fields around