Made the Navigator work