did some work on grid layout