naviagtion fixes