replace original nav with renderer nav; sovles https://trello.com/c/WJhGCcco
Merge branch 'jpeak5' into dev