Full DI and fix for sticky headers