UI improvements in comments mode