Improve link and term formatting.