fixed navigation to be correct