Deal with clicks on the right edge which have an x value greater than the canvas width.  Draw boxes around the rows as well as the columns.