Optimisation - Change list template with table.