Revert "Revert "Add comment widget""

This reverts commit 68515f4a9414c4e6f36e786ac17f25ef69fa3b87.