Rework container detail view