fix the view bug and change the data a little bit