Time zone and template tweak