Cleanup of requirements
Improved form functionality.