Almost there. More nav tweaks.