New navigator wrapper