IMG-683 fix layout issues and mismatched comments