added data provider and fixed widgets
added data provider and fixed widgets