Added confirm dialog to navigation
Apply and fix navigation