Change view switching to occur in the router. Fix switching off of report detail