Added comment toggling