initial clean up of the grid layout (still needs some work)