Connected data source to UI
Cleanup