Added validation to forms