Form validation and minor UI fixes
Merge branch 'staging'