Recompiled templates to pickup Jackie's changes