Context nav link fixes