Clean template by removing an extra div.
Rename templates that make Bootstrap going crazy with span in it.