Minor
Form shows invalid fields when form is submitted
Merge branch 'form' into dev