Made all required fields required and fixed up client side validation message