remove $extra_classes and css update