Updated some links for correct navigation - part 2