LUN-1657: moving admin formfields fields around