Code review

Don't merge, I'm using this as a code review branch.
wrap link in proper <a> tags. That way, they become clickable for other use.