Minor changes in the code.
Add data provider selector to the gui