Form validation features finalized
Merge origin/master