Merge "Improving layout of aggregation suggestions"