Fix placement of squares