Remove extra nav fallback and combine into one