added additional markup to nav, fixes #14