Form field parameters reorg