modified some view
fix some bugs