More nav link fixes