Continuing to tweak templates