diff --git a/CHANGELOG.md b/CHANGELOG.md
index da2b8ce84..7b1a68eb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Change Log for SD.Next
 
+## Update for 07/01/2023
+
+Small quality-of-life updates and bugfixes:
+
+- change lora and lyco dir without server restart
+- additional filename template fields: `uuid`, `seq`, `image_hash`  
+- image `Zip` button gone and its not optional setting that applies to standard `Save` button
+- folder `Show` button is present only when working on localhost,  
+  otherwise its replaced with `Copy` that places image URLs on clipboard so they can be used in other apps
+
 ## Update for 06/30/2023
 
 A bit bigger update this time, but contained to specific areas...
diff --git a/README.md b/README.md
index 3bae124bc..eb9bcbac2 100644
--- a/README.md
+++ b/README.md
@@ -14,13 +14,13 @@ Individual features are not listed here, instead check [Changelog](CHANGELOG.md)
 
 ## Platform support
 
-- **nVidia** GPUs using **CUDA** libraries on both *Windows and Linux*
-- **AMD** GPUs using **ROCm** libraries on *Linux*  
+- *nVidia* GPUs using **CUDA** libraries on both *Windows and Linux*
+- *AMD* GPUs using **ROCm** libraries on *Linux*  
   Support will be extended to *Windows* once AMD releases ROCm for Windows
-- Any GPU compatibile with **DirectX** on *Windows* using **DirectML** libraries  
+- Any GPU compatibile with *DirectX* on *Windows* using **DirectML** libraries  
   This includes support for AMD GPUs that are not supported by native ROCm libraries
-- **Intel Arc** GPUs using Intel OneAPI **Ipex/XPU** libraries  
-- **Apple M1/M2** on *OSX* using built-in support in Torch with **MPS** optimizations
+- *Intel Arc* GPUs using *Intel OneAPI* **Ipex/XPU** libraries  
+- *Apple M1/M2* on *OSX* using built-in support in Torch with **MPS** optimizations
 
 ## Install
 
diff --git a/TODO.md b/TODO.md
index 1235590f8..e4e96d848 100644
--- a/TODO.md
+++ b/TODO.md
@@ -56,3 +56,4 @@ Tech that can be integrated as part of the core workflow...
 - image watermark
 - image `imagehash` phash and hdash
 - custom exif tags
+- replace lightbox with iv-viewer
diff --git a/html/black-orange.jpg b/html/black-orange.jpg
index 25ec4a22d..19c5d5d66 100644
Binary files a/html/black-orange.jpg and b/html/black-orange.jpg differ
diff --git a/html/locale_en.json b/html/locale_en.json
index 4c79c7587..3e69cd207 100644
--- a/html/locale_en.json
+++ b/html/locale_en.json
@@ -355,7 +355,7 @@
   {"id":"","label":"Always save all generated images","localized":"","hint":""},
   {"id":"","label":"File format for generated images","localized":"","hint":"Select file format for images"},
   {"id":"","label":"Include metadata in saved images","localized":"","hint":"Save image create parameters as metadata tags inside image file"},
-  {"id":"","label":"Images filename pattern","localized":"","hint":"Use following tags to define how filenames for images are chosen: [steps], [cfg], [prompt_hash], [prompt], [prompt_no_styles], [prompt_spaces], [width], [height], [styles], [sampler], [seed], [model_hash], [model_name], [prompt_words], [date], [datetime], [datetime<Format>], [datetime<Format><Time Zone>], [job_timestamp]; leave empty for default"},
+  {"id":"","label":"Images filename pattern","localized":"","hint":"Use following tags to define how filenames for images are chosen:<br><pre>seq, uuid<br>date, datetime, job_timestamp<br>generation_number, batch_number<br>model, model_shortname<br>model_hash, model_name<br>sampler, seed, steps, cfg<br>clip_skip, denoising<br>hasprompt, prompt, styles<br>prompt_hash, prompt_no_styles<br>prompt_spaces, prompt_words<br>height, width, image_hash<br></pre>"},
   {"id":"","label":"Add number to filename when saving","localized":"","hint":""},
   {"id":"","label":"Always save all generated image grids","localized":"","hint":""},
   {"id":"","label":"File format for grids","localized":"","hint":""},
diff --git a/javascript/black-orange.css b/javascript/black-orange.css
index 79464fb6b..6f07773f7 100644
--- a/javascript/black-orange.css
+++ b/javascript/black-orange.css
@@ -1,5 +1,5 @@
 /* generic html tags */
-:root { --font: system-ui, "Segoe UI", "Roboto", "sans-serif"; }
+:root { --font: "Source Sans Pro", 'ui-sans-serif', 'system-ui', "Roboto", sans-serif; }
 html { font-size: 16px; }
 body, button, input, select, textarea { font-family: var(--font);}
 button { font-size: 1.2rem; }
@@ -86,7 +86,8 @@ svg.feather.feather-image, .feather .feather-image { display: none }
 #txt2img_cfg_scale { min-width: 200px; }
 #txt2img_checkboxes, #img2img_checkboxes { background-color: transparent; }
 #txt2img_checkboxes, #img2img_checkboxes { margin-bottom: 0.2em; }
-#txt2img_gallery, #img2img_gallery, #extras_gallery { background: black !important; padding: 0; margin: 0; object-fit: contain; box-shadow: none; min-height: 0; }
+#txt2img_gallery, #img2img_gallery, #extras_gallery { padding: 0; margin: 0; object-fit: contain; box-shadow: none; min-height: 0; }
+
 #extras_upscale { margin-top: 10px }
 #txt2img_progress_row > div { min-width: var(--left-column); max-width: var(--left-column); }
 #txt2img_results, #img2img_results, #extras_results { background-color: black; padding: 0; }
diff --git a/javascript/extraNetworks.js b/javascript/extraNetworks.js
index 254bbac7d..378348d33 100644
--- a/javascript/extraNetworks.js
+++ b/javascript/extraNetworks.js
@@ -24,11 +24,12 @@ function setupExtraNetworksForTab(tabname) {
   });
   intersectionObserver = new IntersectionObserver((entries) => {
     // if (entries[0].intersectionRatio <= 0) onHidden();
+    const en = gradioApp().getElementById(`${tabname}_extra_networks`);
     if (entries[0].intersectionRatio > 0) {
       for (el of Array.from(gradioApp().querySelectorAll('.extra-network-cards'))) {
         const rect = el.getBoundingClientRect();
+        en.style.transition = 'width 0.2s ease';
         if (rect.top > 0) {
-          const en = gradioApp().getElementById(`${tabname}_extra_networks`);
           if (!en) return
           if (window.opts.extra_networks_card_cover == 'cover') {
             en.style.zIndex = 0;
@@ -54,6 +55,9 @@ function setupExtraNetworksForTab(tabname) {
           }
         }
       }
+    } else {
+      en.style.width = 0;
+      gradioApp().getElementById(`${tabname}_settings`).parentNode.style.width = 'unset'
     }
   });
   intersectionObserver.observe(search); // monitor visibility of 
diff --git a/javascript/logMonitor.js b/javascript/logMonitor.js
index 6a8149a50..3d163e911 100644
--- a/javascript/logMonitor.js
+++ b/javascript/logMonitor.js
@@ -33,7 +33,7 @@ async function logMonitorCreate() {
   if (!el) return;
   el.classList.add('log-monitor');
   el.innerHTML = `
-    <table style="width: 100%">
+    <table style="width: 100%;">
       <thead style="display: block; text-align: left; border-bottom: solid 1px var(--button-primary-border-color)">
         <tr>
           <th style="width: 170px">Time</th>
diff --git a/javascript/logo.png b/javascript/logo.png
new file mode 100644
index 000000000..228af4b0e
Binary files /dev/null and b/javascript/logo.png differ
diff --git a/javascript/style.css b/javascript/style.css
index fc1097f12..c216e545f 100644
--- a/javascript/style.css
+++ b/javascript/style.css
@@ -7,7 +7,6 @@ div.compact{ gap: 1em; }
 div.gradio-html.min{ min-height: 0; }
 .block.gradio-checkbox { margin: 0.75em 1.5em 0 0; }
 .block.gradio-dropdown, .block.gradio-slider, .block.gradio-checkbox, .block.gradio-textbox, .block.gradio-radio, .block.gradio-checkboxgroup, .block.gradio-number, .block.gradio-colorpicker { border-width: 0 !important; box-shadow: none !important;}
-.block.gradio-gallery{ background: var(--input-background-fill); }
 .block.padded:not(.gradio-accordion) { padding: 0 !important; }
 .compact{ background: transparent !important; padding: 0 !important; }
 .dark .gradio-dropdown ul.options li.item:not(:has(.hide)) { background-color: var(--neutral-900); }
@@ -25,7 +24,8 @@ div.gradio-html.min{ min-height: 0; }
 .gradio-dropdown.multiselect div.wrap-inner {	overflow-x: hidden; overflow-y: auto; max-height: 50vh; overflow-wrap: anywhere; }
 .gradio-html div.wrap{ height: 100%; }
 .gradio-slider input[type="number"]{ width: 6em; }
-.hidden{ display: none; }
+.hidden { display: none; }
+footer { display: none; }
 
 /* general styled components */
 .gradio-button.tool{ max-width: 2.3em;  min-width: 2.3em !important; height: 2.3em; align-self: end; line-height: 1em; border-radius: 0.5em; }
@@ -100,7 +100,7 @@ button.custom-button{
 }
 
 #txt2img_gallery img, #img2img_gallery img, #extras_gallery img { object-fit: scale-down; width: -webkit-fill-available !important; }
-
+#txt2img_footer, #img2img_footer, #extras_footer{ height: fit-content; display: none; }
 #txt2img_generate_box, #img2img_generate_box { gap: 0.5em; flex-wrap: wrap-reverse; }
 #txt2img_actions_column, #img2img_actions_column { gap: 0.5em; }
 #txt2img_generate_box > button, #img2img_generate_box > button { height: 2.2em; line-height: 0; }
@@ -546,10 +546,10 @@ table.settings-value-table td{
 .extra-network-cards .card { height: fit-content; margin: 0.5em; position: relative; scroll-snap-align: start; scroll-margin-top: 0; }
 .extra-network-cards .card .overlay { position: absolute; bottom: 0; padding: 0.2em; z-index: 10; width: 100%; background: none; }
 .extra-network-cards .card:hover .overlay { background: rgba(0, 0, 0, 0.40); }
-.extra-network-cards .card .overlay .name { font-size: 1.2em; font-weight: bold; line-break: anywhere; text-shadow: 1px 1px black; }
+.extra-network-cards .card .overlay .name { font-size: 1.2em; font-weight: bold; line-break: anywhere; text-shadow: 1px 1px black; color: white; }
 .extra-network-cards .card .overlay .actions { font-size: 1.8em; display: none; text-align-last: justify; cursor: pointer; word-spacing: -6px; }
 .extra-network-cards .card:hover .overlay .actions { display: block; }
-.extra-network-cards .card .overlay .description { line-break: anywhere; display: none; }
+.extra-network-cards .card .overlay .description { line-break: anywhere; display: none; color: white; }
 .extra-network-cards .card:hover .overlay .description { display: block; }
 .extra-network-cards .card .preview { box-shadow: var(--button-shadow); min-height: 30px; }
 .extra-network-cards .card:hover .preview { box-shadow: none; }
@@ -585,3 +585,4 @@ div.controlnet_main_options { display: grid; grid-template-columns: 1fr 1fr; gri
   font-size: 0.85em;
 }
 .log-monitor td, .log-monitor th { padding-left: 1em; }
+.logo { background-image: url("logo.png") !important; background-repeat: no-repeat !important; background-position: center !important; background-size: contain !important; }
diff --git a/javascript/ui.js b/javascript/ui.js
index adbeb4271..a70cd0fcc 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -8,6 +8,14 @@ function set_theme(theme) {
   if (!gradioURL.includes('?__theme=')) window.location.replace(`${gradioURL}?__theme=${theme}`);
 }
 
+function clip_gallery_urls(gallery) {
+  const files = gallery.map((v) => v.data);
+  navigator.clipboard.writeText(JSON.stringify(files)).then(
+    () => console.log('clipboard set:', files),
+    (err) => console.log('clipboard error:', files, err)
+  );
+}
+
 function all_gallery_buttons() {
   const allGalleryButtons = gradioApp().querySelectorAll('[style="display: block;"].tabitem div[id$=_gallery].gradio-gallery .thumbnails > .thumbnail-item.thumbnail-small');
   const visibleGalleryButtons = [];
@@ -113,9 +121,18 @@ function create_submit_args(args) {
 
 function showSubmitButtons(tabname, show) {}
 
+function clearGallery(tabname) {
+  const gallery = gradioApp().getElementById(`${tabname}_gallery`)
+  gallery.classList.remove('logo');
+  gallery.style.height = window.innerHeight - gallery.getBoundingClientRect().top - 200 + 'px'
+  const footer = gradioApp().getElementById(`${tabname}_footer`)
+  footer.style.display = 'flex';
+}
+
 function submit(...args) {
   console.log('Submit txt2img');
   rememberGallerySelection('txt2img_gallery');
+  clearGallery('txt2img');
   const id = randomId();
   requestProgress(id, null, gradioApp().getElementById('txt2img_gallery'));
   const res = create_submit_args(args);
@@ -126,6 +143,7 @@ function submit(...args) {
 function submit_img2img(...args) {
   console.log('Submit img2img');
   rememberGallerySelection('img2img_gallery');
+  clearGallery('img2img');
   const id = randomId();
   requestProgress(id, null, gradioApp().getElementById('img2img_gallery'));
   const res = create_submit_args(args);
@@ -134,6 +152,13 @@ function submit_img2img(...args) {
   return res;
 }
 
+function submit_postprocessing(...args) {
+  console.log('Submit extras');
+  clearGallery('extras');
+  return args
+}
+
+
 function modelmerger(...args) {
   const id = randomId();
   const res = create_submit_args(args);
diff --git a/modules/cmd_args.py b/modules/cmd_args.py
index 1f9b5dc43..3c0c2ee6c 100644
--- a/modules/cmd_args.py
+++ b/modules/cmd_args.py
@@ -119,5 +119,4 @@ def compatibility_args(opts, args):
     opts.onchange("lyco_dir", lambda: setattr(args, "lyco_dir", opts.lyco_dir))
 
     args = parser.parse_args()
-    print('HERE', args.lora_dir, opts.lora_dir)
     return args
diff --git a/modules/images.py b/modules/images.py
index 8111fdfc3..efa1f7a3d 100644
--- a/modules/images.py
+++ b/modules/images.py
@@ -282,32 +282,32 @@ def sanitize_filename_part(text, replace_spaces=True):
 
 class FilenameGenerator:
     replacements = {
-        'uuid': lambda self: str(uuid.uuid4()),
-        'image_hash': lambda self: self.image_hash(),
-        'seed': lambda self: self.seed if self.seed is not None else '',
-        'steps': lambda self: self.p and self.p.steps,
+        'batch_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.batch_index + 1,
         'cfg': lambda self: self.p and self.p.cfg_scale,
-        'width': lambda self: self.image.width,
-        'height': lambda self: self.image.height,
-        'styles': lambda self: self.p and sanitize_filename_part(", ".join([style for style in self.p.styles if not style == "None"]) or "None", replace_spaces=False),
-        'sampler': lambda self: self.p and sanitize_filename_part(self.p.sampler_name, replace_spaces=False),
-        'model_hash': lambda self: getattr(self.p, "sd_model_hash", shared.sd_model.sd_model_hash),
-        'model_name': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.model_name, replace_spaces=False),
-        'model': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.name_for_extra, replace_spaces=False),
-        'model_shortname': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.name_for_extra, replace_spaces=False),
+        'clip_skip': lambda self: self.p and self.p.clip_skip,
         'date': lambda self: datetime.datetime.now().strftime('%Y-%m-%d'),
         'datetime': lambda self, *args: self.datetime(*args),  # accepts formats: [datetime], [datetime<Format>], [datetime<Format><Time Zone>]
+        'denoising': lambda self: self.p.denoising_strength if self.p and self.p.denoising_strength else NOTHING_AND_SKIP_PREVIOUS_TEXT,
+        'generation_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.n_iter == 1 and self.p.batch_size == 1 else self.p.iteration * self.p.batch_size + self.p.batch_index + 1,
+        'hasprompt': lambda self, *args: self.hasprompt(*args),  # accepts formats:[hasprompt<prompt1|default><prompt2>..]
+        'height': lambda self: self.image.height,
+        'image_hash': lambda self: self.image_hash(),
         'job_timestamp': lambda self: getattr(self.p, "job_timestamp", shared.state.job_timestamp),
+        'model': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.name_for_extra, replace_spaces=False),
+        'model_shortname': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.name_for_extra, replace_spaces=False),
+        'model_hash': lambda self: getattr(self.p, "sd_model_hash", shared.sd_model.sd_model_hash),
+        'model_name': lambda self: sanitize_filename_part(shared.sd_model.sd_checkpoint_info.model_name, replace_spaces=False),
         'prompt_hash': lambda self: hashlib.sha256(self.prompt.encode()).hexdigest()[0:8],
-        'prompt': lambda self: sanitize_filename_part(self.prompt),
         'prompt_no_styles': lambda self: self.prompt_no_style(),
         'prompt_spaces': lambda self: sanitize_filename_part(self.prompt, replace_spaces=False),
         'prompt_words': lambda self: self.prompt_words(),
-        'batch_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.batch_size == 1 else self.p.batch_index + 1,
-        'generation_number': lambda self: NOTHING_AND_SKIP_PREVIOUS_TEXT if self.p.n_iter == 1 and self.p.batch_size == 1 else self.p.iteration * self.p.batch_size + self.p.batch_index + 1,
-        'hasprompt': lambda self, *args: self.hasprompt(*args),  # accepts formats:[hasprompt<prompt1|default><prompt2>..]
-        'clip_skip': lambda self: self.p and self.p.clip_skip,
-        'denoising': lambda self: self.p.denoising_strength if self.p and self.p.denoising_strength else NOTHING_AND_SKIP_PREVIOUS_TEXT,
+        'prompt': lambda self: sanitize_filename_part(self.prompt),
+        'sampler': lambda self: self.p and sanitize_filename_part(self.p.sampler_name, replace_spaces=False),
+        'seed': lambda self: self.seed if self.seed is not None else '',
+        'steps': lambda self: self.p and self.p.steps,
+        'styles': lambda self: self.p and sanitize_filename_part(", ".join([style for style in self.p.styles if not style == "None"]) or "None", replace_spaces=False),
+        'uuid': lambda self: str(uuid.uuid4()),
+        'width': lambda self: self.image.width,
     }
     default_time_format = '%Y%m%d%H%M%S'
 
@@ -356,8 +356,6 @@ class FilenameGenerator:
 
     def prompt_words(self):
         words = [x for x in re_nonletters.split(self.prompt or "") if len(x) > 0]
-        if len(words) == 0:
-            words = ["empty"]
         return sanitize_filename_part(" ".join(words[0:shared.opts.directories_max_prompt_words]), replace_spaces=False)
 
     def datetime(self, *args):
diff --git a/modules/postprocessing.py b/modules/postprocessing.py
index a8bc3a09e..932b82289 100644
--- a/modules/postprocessing.py
+++ b/modules/postprocessing.py
@@ -16,6 +16,7 @@ def run_postprocessing(extras_mode, image, image_folder: List[tempfile.NamedTemp
     image_names = []
     image_ext = []
     outputs = []
+    params = {}
     if extras_mode == 1:
         for img in image_folder:
             if isinstance(img, Image.Image):
diff --git a/modules/shared.py b/modules/shared.py
index 00982fb2a..8d68e7fe7 100644
--- a/modules/shared.py
+++ b/modules/shared.py
@@ -363,6 +363,7 @@ options_templates.update(options_section(('saving-images', "Image Options"), {
     "samples_filename_pattern": OptionInfo("[seq]-[prompt_words]", "Images filename pattern", component_args=hide_dirs),
     "directories_max_prompt_words": OptionInfo(8, "Max prompt words for [prompt_words] pattern", gr.Slider, {"minimum": 1, "maximum": 99, "step": 1, **hide_dirs}),
     "save_images_add_number": OptionInfo(True, "Add number to filename when saving", component_args=hide_dirs),
+    "samples_save_zip": OptionInfo(True, "Create zip archive when downloading multiple images"),
     "grid_save": OptionInfo(True, "Always save all generated image grids"),
     "grid_format": OptionInfo('jpg', 'File format for grids', gr.Dropdown, lambda: {"choices": ["jpg", "png", "webp", "tiff", "jp2"]}),
     "grid_extended_filename": OptionInfo(True, "Add extended info (seed, prompt) to filename when saving grid"),
diff --git a/modules/ui_common.py b/modules/ui_common.py
index ccd76024b..8e642d9f1 100644
--- a/modules/ui_common.py
+++ b/modules/ui_common.py
@@ -66,7 +66,7 @@ def delete_files(js_data, images, _html_info, _do_make_zip, index):
     return images, plaintext_to_html(f"Deleted: {filenames[0] if len(filenames) > 0 else 'none'}")
 
 
-def save_files(js_data, images, html_info, do_make_zip, index):
+def save_files(js_data, images, html_info, index):
     os.makedirs(shared.opts.outdir_save, exist_ok=True)
 
     class PObject: # pylint: disable=too-few-public-methods
@@ -125,7 +125,7 @@ def save_files(js_data, images, html_info, do_make_zip, index):
             if txt_fullfn:
                 filenames.append(os.path.basename(txt_fullfn))
                 fullfns.append(txt_fullfn)
-    if do_make_zip:
+    if shared.opts.samples_save_zip and len(fullfns) > 1:
         zip_filepath = os.path.join(shared.opts.outdir_save, "images.zip")
         from zipfile import ZipFile
         with ZipFile(zip_filepath, "w") as zip_file:
@@ -160,17 +160,20 @@ def create_output_panel(tabname, outdir):
 
     with gr.Column(variant='panel', elem_id=f"{tabname}_results"):
         with gr.Group(elem_id=f"{tabname}_gallery_container"):
-            result_gallery = gr.Gallery(value=['html/logo.png'], label='Output', show_label=False, elem_id=f"{tabname}_gallery").style(preview=False, container=False, columns=[1,2,3,4,5,6]) # <576px, <768px, <992px, <1200px, <1400px, >1400px
+            result_gallery = gr.Gallery(value=[], label='Output', show_label=False, elem_id=f"{tabname}_gallery", elem_classes="logo").style(preview=False, container=False, columns=[1,2,3,4,5,6]) # <576px, <768px, <992px, <1200px, <1400px, >1400px
 
-        with gr.Column():
+        with gr.Column(elem_id=f"{tabname}_footer", elem_classes="gallery_footer"):
             with gr.Row(elem_id=f"image_buttons_{tabname}", elem_classes="image-buttons"):
-                open_folder_button = gr.Button('Show', visible=not shared.cmd_opts.hide_ui_dir_config)
+                if not shared.cmd_opts.listen:
+                    open_folder_button = gr.Button('Show', visible=not shared.cmd_opts.hide_ui_dir_config, elem_id=f'open_folder_{tabname}')
+                    open_folder_button.click(fn=lambda: open_folder(shared.opts.outdir_samples or outdir), inputs=[], outputs=[])
+                else:
+                    clip_files = gr.Button('Copy', elem_id=f'open_folder_{tabname}')
+                    clip_files.click(fn=None, _js='clip_gallery_urls', inputs=[result_gallery], outputs=[])
                 save = gr.Button('Save', elem_id=f'save_{tabname}')
-                save_zip = gr.Button('Zip', elem_id=f'save_zip_{tabname}')
                 delete = gr.Button('Delete', elem_id=f'delete_{tabname}')
                 buttons = parameters_copypaste.create_buttons(["img2img", "inpaint", "extras"])
 
-            open_folder_button.click(fn=lambda: open_folder(shared.opts.outdir_samples or outdir), inputs=[], outputs=[])
             download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False, elem_id=f'download_files_{tabname}')
             with gr.Group():
                 html_info = gr.HTML(elem_id=f'html_info_{tabname}', elem_classes="infotext", visible=False) # contains raw infotext as returned by wrapped call
@@ -179,20 +182,17 @@ def create_output_panel(tabname, outdir):
                 html_log = gr.HTML(elem_id=f'html_log_{tabname}')
                 generation_info = gr.Textbox(visible=False, elem_id=f'generation_info_{tabname}')
                 generation_info_button = gr.Button(visible=False, elem_id=f"{tabname}_generation_info_button")
+
                 generation_info_button.click(fn=update_generation_info, _js="(x, y, z) => [x, y, selected_gallery_index()]", show_progress=False, # triggered on gallery change from js
                     inputs=[generation_info, html_info, html_info],
                     outputs=[html_info, html_info_formatted],
                 )
-                save.click(fn=call_queue.wrap_gradio_call(save_files), _js="(x, y, z, q1, q2) => [x, y, z, false, selected_gallery_index()]", show_progress=False,
-                    inputs=[generation_info, result_gallery, html_info, html_info, html_info],
+                save.click(fn=call_queue.wrap_gradio_call(save_files), _js="(x, y, z, i) => [x, y, z, selected_gallery_index()]", show_progress=False,
+                    inputs=[generation_info, result_gallery, html_info, html_info],
                     outputs=[download_files, html_log],
                 )
-                save_zip.click(fn=call_queue.wrap_gradio_call(save_files), _js="(x, y, z, q1, q2) => [x, y, z, true, selected_gallery_index()]",
-                    inputs=[generation_info, result_gallery, html_info, html_info, html_info],
-                    outputs=[download_files, html_log],
-                )
-                delete.click(fn=call_queue.wrap_gradio_call(delete_files), _js="(x, y, z, q1, q2) => [x, y, z, true, selected_gallery_index()]",
-                    inputs=[generation_info, result_gallery, html_info, html_info, html_info],
+                delete.click(fn=call_queue.wrap_gradio_call(delete_files), _js="(x, y, z, i) => [x, y, z, selected_gallery_index()]",
+                    inputs=[generation_info, result_gallery, html_info, html_info],
                     outputs=[result_gallery, html_log],
                 )
 
diff --git a/modules/ui_postprocessing.py b/modules/ui_postprocessing.py
index 8a52d0c2c..b8a82d538 100644
--- a/modules/ui_postprocessing.py
+++ b/modules/ui_postprocessing.py
@@ -60,6 +60,7 @@ def create_ui():
         outputs=[_dummy, html_info_formatted, exif_info, gen_info],
     )
     submit.click(
+        _js="submit_postprocessing",
         fn=call_queue.wrap_gradio_gpu_call(submit_click, extra_outputs=[None, '']),
         inputs=[
             tab_index,