Adding better form validation