Template fixes

Template fixes addressing Alex's comments and other things I put to one side on the first pass.

Includes a fix to autocompilation (which was broken due to a name change)

What to do about the contact link? Shall I take it out until we do this page? Link to some existing page?