Added form validation && Fixed some errors