added admin popup and finsihed queue