Adding message and form validation