began to replace tables with grids
Merge branch 'master' into master2