Smarter composition of templates for main_content/main_awards
Misc fixes, mostly oEmbed