Fixed the Queue Saving Dialog and Other Madness

#815