some fixes in views