Added images, improved queue handling