Fixed Grid issues again