Clean up layouts slightly