Styleguide and minor CSS refactoring

Tweeks to the template files were mostly just renaming some classes or elements, or tweaking markup in minor ways to increase consistency throughout the site.
Small style thing - its convention to put the else on a new line. so like:
``` 
if (things) {
   // stuff
}
else {
   // other stuff
}```