working on the grid layout
merged