Move toward better use of router and views.