Clean up the layout