Improvements to view controller management.