Migrated CSS changes from master.