cherry picking css fix