cleanup nav and file setup
Merge branch 'develop'
update navigation