Add new style Fix some bugs