Adding some form validation logic + minor UX changes