completing form validation constraints
Merge branch 'paulyves' into development