1. add comments logic
2. fix modal issue