Add form and comments