Aggregates for nillable attributes + layout fixes