add grid item names
merge with ljn company branch