Add URIs to links
Fix missing emblem