fix layout issues with comments