Adjustments to the Unsupported Collector and small UI changes.