Reworking cell height logic.  Putting it in the cell seems wrong