Merge comments with expand and collapse. Collapse last item needs to be fixed.

Merge comments with expand and collapse. Collapse last item needs to be fixed.