add new style & solve some bugs