Many cleanup and fixes in views