Clean up the layout some more