changes to router for view/edit consolidation