New layout with collapses and drilldown