refactory queue view
refactory queue view