Replaced JSP references with Thymeleaf's