Added grid columns
Code cleanup and added base grid columns