Improved view controller