Logo links to homepage
Fix YAML escaping of page data
Remove a couple of span tags