MacGui: merge some improvements from Controller.m to the queue controller.