Move the comment display into it's own template.