Further template updates. Fixed a few style issues.