added links and ill-advised span-nesting