Added initial navigator wrapper