better comments panel handling