Data sources bug fixes and UI improvements (#1565) #4830

Job	Run time
build-windows-macos (windows-latest)	25m 16s
build-windows-macos (macos-latest)	38m 48s
Get-CI-Image-Tag / Get-CI-Image-Tag	5s
build	15m 14s
	1h 19m 23s

Provide feedback