Fix: Movement of grid behaves as expected. Performance is still far off