js validation on fields
Merge branch 'Styling' into development