fixes https://trello.com/c/vRHoqhLW and https://trello.com/c/RmqW6D2O
formatting
Merge branch 'davington' into dev
replace original nav with renderer nav; sovles https://trello.com/c/WJhGCcco
Merge branch 'jpeak5' into dev
Merge branch 'dev' into davington