improvements to comments layout