Improve switching between views.