update docs, tighten navigation
squash build conflict