Added some structure to toolbar templates.