Modified a few navigation paths to be a little more intuitive