add some fixes in views