fix up layouts