modify style and fix some bug