Added messaging and form submit