more clean up of nav structure, link blocks, spacing