Add load form data, update get form data, minor reorg