Many views fixes