Make cells square, generalize cell width
Simplify drawing code