many details in aggregation changed

also a lot of layout changes