Tidied template files - reduced switching between PHP and HTML, simplified PHP formatting a bit
Merge pull request #68 from grantpalin/master

Some code formatting, simplification