more CSS upgrades