Fixing a bug with the hashes & making the templates coherent.