Feature/logic out of templates

Still a few more templates to fix, WIP.
Do you think `@article.type.underscore.humanize.titleize` is repeated enough to warrant placing it in a helper or model method? Since it's only used in the views I'd side towards a helper method.