Some dirty layout fixes. Finished with batch intersect pair for now