Fix bad markup nesting causing a link in link. Silent error
Add link icon to toc entries to make it more obvious that all of them are links
Refactoring