CON-2178: comments layout bugs