Some more CSS tweaks related to issue 6419