refactored navigator to support overlays