Clean up and fix some overlay issues