Add back rowHeight calcs