bug fixes and improved drawing for grouped cells