Modified layout, comments are now comments