Completed productTemplate overhaul