Merge pull request #16 from Izakey/develop

Resolve commits from Thymeleaf templating PR