Minor bug fixes, Migration to Thymeleaf