move all references to session vars to navigator