Queues and CustomFields admin page cleanups