Misc fixes / tweaks
Improved form validation flexibility
Misc fixes
Some refactoring
Extra form field options
Misc fixes
Misc fixes