A few more changes to cell layouts. Still hunting the constraint issue