Re-added/fixed missing 'comment-container'