More style/template changes, in progress.
Merge pull request #15 from matiasb/more-stylish

More style/template changes, in progress.