Clean up the layouts