app_navigation improvement