Added better form validation :)