Update router with objects

Updated router with objects.
Updated proposedPlanView with window.