Minor changes: add NavHelper.