Update data so name does not equal identifier
update grid/aggregate layout, code cleanup