Minor fixes to view management.
5 files changed