Navigation changes

@jtamiace is that `\` meant to be there?