fixing problems with data and grid,

re-factoring
and translate
fixing problems with data and grid,

re-factoring
and translate