Renamed DataSourceEdit to DataSourceEditPopup, for clarity
Tweaked the header of DataSourceControl, combining name & edit labels, and changing the background color