Squares sized properly to compensate for margin; now the correct amount per row