Improvements to view routing