navigation changes -> fixing up a couple of mistakes