some view changes, some bugs still exits