Tweak some comment layouts