More CSS tweaks related to issue 7004