template overhaul
fix for integration test