Added validation before submit and relevant feedback