diff --git a/public/index.html b/public/index.html
index 4c2171994..6f1e0c530 100644
--- a/public/index.html
+++ b/public/index.html
@@ -115,6 +115,7 @@
                                         <option value="gpt-3.5-turbo">gpt-3.5-turbo</option>
                                         <option value="gpt-3.5-turbo-0301">gpt-3.5-turbo-0301</option>
                                         <option value="gpt-4">gpt-4</option>
+                                        <option value="gpt-4-32k">gpt-4-32k</option>
                                     </select>
                                 </div>
                             </div>
diff --git a/public/scripts/extensions/caption/index.js b/public/scripts/extensions/caption/index.js
index dda9405e0..94c7bd049 100644
--- a/public/scripts/extensions/caption/index.js
+++ b/public/scripts/extensions/caption/index.js
@@ -91,12 +91,6 @@ async function onSelectImage(e) {
 }
 
 $(document).ready(function () {
-    function patchSendForm() {
-        const columns = $('#send_form').css('grid-template-columns').split(' ');
-        columns[columns.length - 1] = `${parseInt(columns[columns.length - 1]) + 40}px`;
-        columns[1] = 'auto';
-        $('#send_form').css('grid-template-columns', columns.join(' '));
-    }
     function addSendPictureButton() {
         const sendButton = document.createElement('div');
         sendButton.id = 'send_picture';
@@ -118,7 +112,6 @@ $(document).ready(function () {
     addPictureSendForm();
     addSendPictureButton();
     setImageIcon();
-    patchSendForm();
     moduleWorker();
     setInterval(moduleWorker, UPDATE_INTERVAL);
 });
\ No newline at end of file
diff --git a/public/scripts/extensions/dice/index.js b/public/scripts/extensions/dice/index.js
index 14922fc9e..3a5538dbe 100644
--- a/public/scripts/extensions/dice/index.js
+++ b/public/scripts/extensions/dice/index.js
@@ -79,13 +79,6 @@ function addDiceScript() {
     }
 }
 
-function patchSendForm() {
-    const columns = $('#send_form').css('grid-template-columns').split(' ');
-    columns[columns.length - 1] = `${parseInt(columns[columns.length - 1]) + 40}px`;
-    columns[1] = 'auto';
-    $('#send_form').css('grid-template-columns', columns.join(' '));
-}
-
 async function moduleWorker() {
     const context = getContext();
 
@@ -97,7 +90,6 @@ async function moduleWorker() {
 $(document).ready(function () {
     addDiceScript();
     addDiceRollButton();
-    patchSendForm();
     setDiceIcon();
     moduleWorker();
     setInterval(moduleWorker, UPDATE_INTERVAL);
diff --git a/public/scripts/openai.js b/public/scripts/openai.js
index 56c2f2a3a..0969e2228 100644
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@@ -55,6 +55,7 @@ const default_impersonation_prompt = "[Write your next reply from the point of v
 
 const gpt3_max = 4095;
 const gpt4_max = 8191;
+const gpt4_32k_max = 32767;
 
 const tokenCache = {};
 
@@ -772,6 +773,9 @@ $(document).ready(function () {
         if (value == 'gpt-4') {
             $('#openai_max_context').attr('max', gpt4_max);
         }
+        else if (value == 'gpt-4-32k') {
+            $('#openai_max_context').attr('max', gpt4_32k_max);
+        }
         else {
             $('#openai_max_context').attr('max', gpt3_max);
             oai_settings.openai_max_context = Math.max(oai_settings.openai_max_context, gpt3_max);
diff --git a/public/style.css b/public/style.css
index 255891f6d..484db8a67 100644
--- a/public/style.css
+++ b/public/style.css
@@ -279,9 +279,8 @@ code {
 }
 
 #send_form {
-    display: grid;
+    display: flex;
     align-items: center;
-    grid-template-columns: 40px auto 40px;
     width: 100%;
     margin: 0 auto 0 auto;
     border: 1px solid var(--grey30a);
@@ -644,6 +643,7 @@ select {
     font-family: "Noto Sans", "Noto Color Emoji", sans-serif;
     margin: 0;
     text-shadow: #000 0 0 3px;
+    flex: 1;
 }
 
 #send_textarea::placeholder,