Implement comment preview
Some tiny improvments around comment preview