Fix typo in template.
Merge branch 'refs/heads/master' into redesign
Some minor layout and styling fixes.