More CSS cleanup