fixed some bug in views
merge