fix bug and modify style