Fix markup
Add links
Merge pull request #91 from crazymaster/master

Improve site