WIP comment layout
Refactor comment view to make layout generic