diff --git a/ui/index.html b/ui/index.html
index d57d0437..fdaf42af 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -8,7 +8,7 @@
     <link rel="stylesheet" href="/media/css/themes.css?v=1">
     <link rel="stylesheet" href="/media/css/auto-save.css?v=1">
     <link rel="stylesheet" href="/media/css/main.css?v=1">
-    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=1">
+    <link rel="stylesheet" href="/media/css/modifier-thumbnails.css?v=2">
     <link rel="stylesheet" href="/media/css/fontawesome-all.min.css?v=1">
     <link rel="stylesheet" href="/media/css/drawingboard.min.css">
     <script src="/media/js/jquery-3.6.1.min.js"></script>
@@ -18,7 +18,7 @@
 <div id="container">
     <div id="top-nav">
         <div id="logo">
-            <h1>Stable Diffusion UI <small>v2.3.2 <span id="updateBranchLabel"></span></small></h1>
+            <h1>Stable Diffusion UI <small>v2.3.3 <span id="updateBranchLabel"></span></small></h1>
         </div>
         <ul id="top-nav-items">
             <li class="dropdown">
@@ -197,22 +197,23 @@
                         </select>
                     </li>
                     <li class="pl-5"><input id="show_only_filtered_image" name="show_only_filtered_image" type="checkbox" checked> <label for="show_only_filtered_image">Show only the corrected/upscaled image</label></li>
-                    <br/>
-                    <li><small>The system-related settings have been moved to the top-right corner.</small></li>
                 </ul>
             </div>
 
             <div id="editor-modifiers" class="panel-box">
+                <button id="modifier-settings-btn" title="Add custom modifiers"><i class="fa fa-gear"></i></button>
                 <h4 class="collapsible">Image Modifiers (art styles, tags etc)</h4>
                 <div id="editor-modifiers-entries" class="collapsible-content">
-                    <label for="preview-image">Image Style:</label>
-                    <select id="preview-image" name="preview-image" value="portrait">
-                        <option value="portrait" selected="">Face</option>
-                        <option value="landscape">Landscape</option>
-                    </select>
-                    &nbsp;
-                    <label for="modifier-card-size-slider">Thumbnail Size:</label>
-                    <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
+                    <div id="editor-modifiers-entries-toolbar">
+                        <label for="preview-image">Image Style:</label>
+                        <select id="preview-image" name="preview-image" value="portrait">
+                            <option value="portrait" selected="">Face</option>
+                            <option value="landscape">Landscape</option>
+                        </select>
+                        &nbsp;
+                        <label for="modifier-card-size-slider">Thumbnail Size:</label>
+                        <input id="modifier-card-size-slider" name="modifier-card-size-slider" value="0" type="range" min="-3" max="5">
+                    </div>
                 </div>
             </div>
         </div>
@@ -238,6 +239,16 @@
         </div>
     </div>
 
+    <div id="modifier-settings-config" style="display:none">
+        <div>
+            <span id="modifier-settings-config-close-btn">X</span>
+            <h1>Modifier Settings</h1>
+            <p>Set your custom modifiers (one per line)</p>
+            <textarea id="custom-modifiers-input" placeholder="Enter your custom modifiers, one-per-line"></textarea>
+            <p><small><b>Tip:</b> You can include special characters like {} () [] and |. You can also put multiple comma-separated phrases in a single line, to make a single modifier that combines all of those.</small></p>
+        </div>
+    </div>
+
     <div class="line-separator">&nbsp;</div>
 
     <div id="footer" class="panel-box">
@@ -255,9 +266,9 @@
 <script src="media/js/plugins.js?v=1"></script>
 <script src="media/js/utils.js?v=3"></script>
 <script src="media/js/inpainting-editor.js?v=1"></script>
-<script src="media/js/image-modifiers.js"></script>
+<script src="media/js/image-modifiers.js?v=3"></script>
 <script src="media/js/auto-save.js?v=1"></script>
-<script src="media/js/main.js?v=3"></script>
+<script src="media/js/main.js?v=4"></script>
 <script src="media/js/themes.js?v=1"></script>
 <script>
 async function init() {
diff --git a/ui/media/css/modifier-thumbnails.css b/ui/media/css/modifier-thumbnails.css
index 22af3083..8b930dd5 100644
--- a/ui/media/css/modifier-thumbnails.css
+++ b/ui/media/css/modifier-thumbnails.css
@@ -214,3 +214,36 @@
     margin-bottom: 0.5em;
     vertical-align: middle;
 }
+#modifier-settings-btn {
+    float: right;
+}
+
+#modifier-settings-config {
+    position: fixed;
+    background: rgba(32, 33, 36, 50%);
+    top: 0px;
+    left: 0px;
+    width: 100vw;
+    height: 100vh;
+    z-index: 1000;
+}
+
+#modifier-settings-config > div {
+    background: var(--background-color2);
+    max-width: 600px;
+    margin: auto;
+    margin-top: 100px;
+    border-radius: 6px;
+    padding: 30px;
+    text-align: center;
+}
+#modifier-settings-config-close-btn {
+    float: right;
+    cursor: pointer;
+    padding: 10px;
+    transform: translate(50%, -50%) scaleX(130%);
+}
+#modifier-settings-config textarea {
+    width: 90%;
+    height: 150px;
+}
\ No newline at end of file
diff --git a/ui/media/js/image-modifiers.js b/ui/media/js/image-modifiers.js
index cb051583..592ee70b 100644
--- a/ui/media/js/image-modifiers.js
+++ b/ui/media/js/image-modifiers.js
@@ -1,14 +1,20 @@
 let activeTags = []
 let modifiers = []
+let customModifiersGroupElement = undefined
 
 let editorModifierEntries = document.querySelector('#editor-modifiers-entries')
 let editorModifierTagsList = document.querySelector('#editor-inputs-tags-list')
 let editorTagsContainer = document.querySelector('#editor-inputs-tags-container')
 let modifierCardSizeSlider = document.querySelector('#modifier-card-size-slider')
 let previewImageField = document.querySelector('#preview-image')
+let modifierSettingsBtn = document.querySelector('#modifier-settings-btn')
+let modifierSettingsOverlay = document.querySelector('#modifier-settings-config')
+let customModifiersTextBox = document.querySelector('#custom-modifiers-input')
+let customModifierEntriesToolbar = document.querySelector('#editor-modifiers-entries-toolbar')
 
 const modifierThumbnailPath = 'media/modifier-thumbnails'
 const activeCardClass = 'modifier-card-active'
+const CUSTOM_MODIFIERS_KEY = "customModifiers"
 
 function createModifierCard(name, previews) {
     const modifierCard = document.createElement('div')
@@ -56,6 +62,70 @@ function createModifierCard(name, previews) {
     return modifierCard
 }
 
+function createModifierGroup(modifierGroup, initiallyExpanded) {
+    const title = modifierGroup.category
+    const modifiers = modifierGroup.modifiers
+
+    const titleEl = document.createElement('h5')
+    titleEl.className = 'collapsible'
+    titleEl.innerText = title
+
+    const modifiersEl = document.createElement('div')
+    modifiersEl.classList.add('collapsible-content', 'editor-modifiers-leaf')
+
+    if (initiallyExpanded === true) {
+        titleEl.className += ' active'
+        modifiersEl.style.display = 'block'
+    }
+
+    modifiers.forEach(modObj => {
+        const modifierName = modObj.modifier
+        const modifierPreviews = modObj?.previews?.map(preview => `${modifierThumbnailPath}/${preview.path}`)
+
+        const modifierCard = createModifierCard(modifierName, modifierPreviews)
+
+        if(typeof modifierCard == 'object') {
+            modifiersEl.appendChild(modifierCard)
+
+            modifierCard.addEventListener('click', () => {
+                if (activeTags.map(x => x.name).includes(modifierName)) {
+                    // remove modifier from active array
+                    activeTags = activeTags.filter(x => x.name != modifierName)
+                    modifierCard.classList.remove(activeCardClass)
+
+                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
+                } else {
+                    // add modifier to active array
+                    activeTags.push({
+                        'name': modifierName,
+                        'element': modifierCard.cloneNode(true),
+                        'originElement': modifierCard,
+                        'previews': modifierPreviews
+                    })
+
+                    modifierCard.classList.add(activeCardClass)
+
+                    modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
+                }
+
+                refreshTagsList()
+            })
+        }
+    })
+
+    let brk = document.createElement('br')
+    brk.style.clear = 'both'
+    modifiersEl.appendChild(brk)
+
+    let e = document.createElement('div')
+    e.appendChild(titleEl)
+    e.appendChild(modifiersEl)
+
+    editorModifierEntries.insertBefore(e, customModifierEntriesToolbar.nextSibling)
+
+    return e
+}
+
 async function loadModifiers() {
     try {
         let res = await fetch('/get/modifiers')
@@ -64,66 +134,10 @@ async function loadModifiers() {
 
             modifiers = res; // update global variable
 
+            res.reverse()
+
             res.forEach((modifierGroup, idx) => {
-                const title = modifierGroup.category
-                const modifiers = modifierGroup.modifiers
-
-                const titleEl = document.createElement('h5')
-                titleEl.className = 'collapsible'
-                titleEl.innerText = title
-
-                const modifiersEl = document.createElement('div')
-                modifiersEl.classList.add('collapsible-content', 'editor-modifiers-leaf')
-
-                if (idx == 0) {
-                    titleEl.className += ' active'
-                    modifiersEl.style.display = 'block'
-                }
-
-                modifiers.forEach(modObj => {
-                    const modifierName = modObj.modifier
-                    const modifierPreviews = modObj?.previews?.map(preview => `${modifierThumbnailPath}/${preview.path}`)
-
-                    const modifierCard = createModifierCard(modifierName, modifierPreviews)
-
-                    if(typeof modifierCard == 'object') {
-                        modifiersEl.appendChild(modifierCard)
-
-                        modifierCard.addEventListener('click', () => {
-                            if (activeTags.map(x => x.name).includes(modifierName)) {
-                                // remove modifier from active array
-                                activeTags = activeTags.filter(x => x.name != modifierName)
-                                modifierCard.classList.remove(activeCardClass)
-                                
-                                modifierCard.querySelector('.modifier-card-image-overlay').innerText = '+'
-                            } else {
-                                // add modifier to active array
-                                activeTags.push({
-                                    'name': modifierName,
-                                    'element': modifierCard.cloneNode(true),
-                                    'originElement': modifierCard,
-                                    'previews': modifierPreviews
-                                })
-
-                                modifierCard.classList.add(activeCardClass)
-
-                                modifierCard.querySelector('.modifier-card-image-overlay').innerText = '-'
-                            }
-
-                            refreshTagsList()
-                        })
-                    }
-                })
-
-                let brk = document.createElement('br')
-                brk.style.clear = 'both'
-                modifiersEl.appendChild(brk)
-
-                let e = document.createElement('div')
-                e.appendChild(titleEl)
-                e.appendChild(modifiersEl)
-
-                editorModifierEntries.appendChild(e)
+                createModifierGroup(modifierGroup, idx === res.length - 1)
             })
 
             createCollapsibles(editorModifierEntries)
@@ -131,6 +145,8 @@ async function loadModifiers() {
     } catch (e) {
         console.log('error fetching modifiers', e)
     }
+
+    loadCustomModifiers()
 }
 
 function refreshTagsList() {
@@ -228,3 +244,51 @@ function resizeModifierCards(val) {
 
 modifierCardSizeSlider.onchange = () => resizeModifierCards(modifierCardSizeSlider.value)
 previewImageField.onchange = () => changePreviewImages(previewImageField.value)
+
+modifierSettingsBtn.addEventListener('click', function() {
+    modifierSettingsOverlay.style.display = 'block'
+})
+document.getElementById("modifier-settings-config-close-btn").addEventListener('click', () => {
+    modifierSettingsOverlay.style.display = 'none'
+})
+modifierSettingsOverlay.addEventListener('click', (event) => {
+    if (event.target.id == modifierSettingsOverlay.id) {
+        modifierSettingsOverlay.style.display = 'none'
+    }
+})
+
+function saveCustomModifiers() {
+    localStorage.setItem(CUSTOM_MODIFIERS_KEY, customModifiersTextBox.value.trim())
+
+    loadCustomModifiers()
+}
+
+function loadCustomModifiers() {
+    let customModifiers = localStorage.getItem(CUSTOM_MODIFIERS_KEY, '')
+    customModifiersTextBox.value = customModifiers
+
+    if (customModifiersGroupElement !== undefined) {
+        customModifiersGroupElement.remove()
+    }
+
+    if (customModifiers && customModifiers.trim() !== '') {
+        customModifiers = customModifiers.split('\n')
+        customModifiers = customModifiers.filter(m => m.trim() !== '')
+        customModifiers = customModifiers.map(function(m) {
+            return {
+                "modifier": m
+            }
+        })
+
+        let customGroup = {
+            'category': 'Custom Modifiers',
+            'modifiers': customModifiers
+        }
+
+        customModifiersGroupElement = createModifierGroup(customGroup, true)
+
+        createCollapsibles(customModifiersGroupElement)
+    }
+}
+
+customModifiersTextBox.addEventListener('change', saveCustomModifiers)
diff --git a/ui/media/js/main.js b/ui/media/js/main.js
index 3d6887d9..e82627cc 100644
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@@ -522,7 +522,7 @@ async function doMakeImage(task) {
 
         if (typeof renderRequest?.stream !== 'string') {
             console.log('Endpoint response: ', renderRequest)
-            throw new Error('Endpoint response does not contains a response stream url.')
+            throw new Error(renderRequest.detail || 'Endpoint response does not contains a response stream url.')
         }
 
         task['taskStatusLabel'].innerText = "Waiting"
@@ -536,12 +536,23 @@ async function doMakeImage(task) {
             }
         } while (Date.now() < (serverState.time + SERVER_STATE_VALIDITY_DURATION) && serverState.task !== renderRequest.task)
 
-        if (serverState.session !== 'pending' && serverState.session !== 'running' && serverState.session !== 'buffer') {
-            if (serverState.session === 'stopped') {
+        switch(serverState.session) {
+            case 'pending':
+            case 'running':
+            case 'buffer':
+                // Normal expected messages.
+                break
+            case 'completed':
+                console.warn('Server %o render request %o completed unexpectedly', serverState, renderRequest)
+                break // Continue anyway to try to read cached result.
+            case 'error':
+                console.error('Server %o render request %o has failed', serverState, renderRequest)
+                break // Still valid, Update UI with error message
+            case 'stopped':
+                console.log('Server %o render request %o was stopped', serverState, renderRequest)
                 return false
-            }
-
-            throw new Error('Unexpected server task state: ' + serverState.session || 'Undefined')
+            default:
+                throw new Error('Unexpected server task state: ' + serverState.session || 'Undefined')
         }
 
         while (serverState.task === renderRequest.task && serverState.session === 'pending') {
@@ -711,7 +722,7 @@ async function checkTasks() {
         setStatus('request', 'done', 'success')
         setTimeout(checkTasks, 500)
         stopImageBtn.style.display = 'none'
-        makeImageBtn.innerHTML = 'Make Image'
+        renameMakeImageButton()
 
         currentTask = null
 
@@ -728,7 +739,7 @@ async function checkTasks() {
     setStatus('request', 'fetching..')
 
     stopImageBtn.style.display = 'block'
-    makeImageBtn.innerHTML = 'Enqueue Next Image'
+    renameMakeImageButton()
     bellPending = true
 
     previewTools.style.display = 'block'
@@ -1123,6 +1134,21 @@ diskPathField.addEventListener('change', handleStringSettingChange(DISK_PATH_KEY
 widthField.addEventListener('change', onDimensionChange)
 heightField.addEventListener('change', onDimensionChange)
 
+function renameMakeImageButton() {
+    let totalImages = Math.max(parseInt(numOutputsTotalField.value), parseInt(numOutputsParallelField.value))
+    let imageLabel = 'Image'
+    if (totalImages > 1) {
+        imageLabel = totalImages + ' Images'
+    }
+    if (taskQueue.length == 0) {
+        makeImageBtn.innerText = 'Make ' + imageLabel
+    } else {
+        makeImageBtn.innerText = 'Enqueue Next ' + imageLabel
+    }
+}
+numOutputsTotalField.addEventListener('change', renameMakeImageButton)
+numOutputsParallelField.addEventListener('change', renameMakeImageButton)
+
 function onDimensionChange() {
     if (!maskSetting.checked) {
         return
diff --git a/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/landscape-0.jpg b/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/landscape-0.jpg
index 44ddc2ba..88590bdc 100644
Binary files a/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/landscape-0.jpg and b/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/landscape-0.jpg differ
diff --git a/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/portrait-0.jpg b/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/portrait-0.jpg
index 62e8f6ed..88590bdc 100644
Binary files a/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/portrait-0.jpg and b/ui/media/modifier-thumbnails/cgi_rendering/glass_caustics/portrait-0.jpg differ