Improvements to view handling.
Improvements to view handling.