Rework import/create into modals
Update NavigationController to use import/create modals