Updated Navigation to include proper fallback