Tiedied up form markup
Fixed annoying bug in form.js