Clean up the content layouts