Re-organize queue screen layout