Updated extract_grid_panel()