refactored class names to include rows and columns