Improve grid tables