Fixed issue with form in containers + added comment and email notify