Use partials, add comment deletion