Merge last modifications from Smarty to Twig

Change structuration of caddie form, no impact
Correction on banner administration