modified some view
merge code