Some reorganizations of code
Now, use the 'shuffle' filter from Twig-Extensions