More robust markup and layout for comments.