OP-1491 Artwork fixes + wizard support - work in progress