Added some client side form validation