fixing action bar, data grid, data source