Editing and tweaks to templates