Item section completely moved to thymeleaf + few enhancements