UI overhaul; Batches now display properly