Changes to header og form and validation.js
Conflict resolved