Add form elements for adding comments
Add form elements for adding comments, remove old code