diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 78c1808adf..a184faec46 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -574,7 +574,7 @@
     margin-bottom: 3px;
 }
 
-.modal-form-content {
+.modal-form-content-wrapper {
   border-radius: 0;
   position:relative;
   height: auto !important;
diff --git a/InvenTree/templates/modals.html b/InvenTree/templates/modals.html
index a50cb65369..a162a3f167 100644
--- a/InvenTree/templates/modals.html
+++ b/InvenTree/templates/modals.html
@@ -9,10 +9,13 @@
               </button>
               <h3 id='modal-title'><i>Form Title Here</i></h3>
             </div>
-            <div class='alert alert-block alert-danger' id='form-validation-warning' style='display: none;'>
-              {% trans "Form errors exist" %}
-            </div>
-            <div class='modal-form-content'>
+            <div class='modal-form-content-wrapper'>
+              <div class='alert alert-block alert-danger' id='form-validation-warning' style='display: none;'>
+                {% trans "Form errors exist" %}
+              </div>
+              <div class='modal-form-content'>
+                <!-- Form content will be injected here-->
+              </div>
             </div>
             <div class='modal-footer'>
                 <button type='button' class='btn btn-default' id='modal-form-close' data-dismiss='modal'>{% trans "Close" %}</button>
@@ -57,8 +60,8 @@
                 <div class='modal-form-content'>
                 </div>
                 <div class='modal-footer'>
-                    <button type='button' class='btn btn-default' id='modal-form-cancel' data-dismiss='modal'>Cancel</button>
-                    <button type='button' class='btn btn-primary' id='modal-form-accept'>Accept</button>
+                    <button type='button' class='btn btn-default' id='modal-form-cancel' data-dismiss='modal'>{% trans "Cancel" %}</button>
+                    <button type='button' class='btn btn-primary' id='modal-form-accept'>{% trans "Accept" %}</button>
                 </div>
             </div>
         </div>
@@ -76,7 +79,7 @@
             <div class='modal-form-content'>
             </div>
             <div class='modal-footer'>
-                <button type='button' class='btn btn-default' data-dismiss='modal'>Close</button>
+                <button type='button' class='btn btn-default' data-dismiss='modal'>{% trans "Close" %}</button>
             </div>
         </div>
     </div>