#7: Fixed some alignment problems.  The row heights are better, but
still not quite right, I think.  And even if they were, alignment with 2
rows is bad still.