update nav, fixes #7, #8, #9