Template updates to show linked data annotations

Also some improvements to showing observations