fix some bugs and remove cssWrapper