Trying to get JS to work
Merge

Merge branch 'validation'
Simple formatting issue
Merge branch 'validation'