Let's try this navigation idea pull request again