Remove unnecessary tags
Improve the template code as I discover Thymeleaf features.