Small template overhaul