refactored more grid definitions
more refactoring on definition drawing