add comment styling + fix N+1 query