cleaning up layouts