Repair some styling conflicts