Smoke fixed according to havana behavior and fixed template a bit