have created partials for Navigator (unchaged) and added helper method