Merge "Fix GH grid sizing to match spec" into main