Cleanup Overlays,MDPI fixes