Fixed almost everything in grid