[642] Redesign the way comments are rendered