Structure changes, adding grid display