Added comment delete button
Cleared up a minor merge conflict