renamed navigator to Navigator