Modifications to grid, addition of new container class. Variable fixes