Feature/comments template