Neatening up the html templating a bit
Merge pull request #172 from rumblesan/html-cleanup

Neatening up the html templating a bit by Guy John aka @rumblesan