updated queue and batch views