Clean up layouts