* Removed redundant styles and fixed
* Fixed a 2.3.3 backward compatibility issue