Refactored queue-cards