More CSS tweaks, probably the last for a while