diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index b2e3b36354..632ec2e0e5 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -134,6 +134,7 @@
 .navbar {
     border-bottom: 1px solid #ccc;
     background-color: var(--secondary-color);
+    box-shadow: 0px 5px 5px rgb(0 0 0 / 5%);
 }
 
 .navbar-brand {
@@ -829,6 +830,7 @@ input[type="submit"] {
     color: var(--bs-body-color);
     background-color: var(--secondary-color);
     border-bottom: 1px solid var(--border-color);
+    box-shadow: 0px 5px 5px rgb(0 0 0 / 5%);
 }
 
 .panel {
diff --git a/InvenTree/order/templates/order/sales_order_base.html b/InvenTree/order/templates/order/sales_order_base.html
index 952319da10..0f705212db 100644
--- a/InvenTree/order/templates/order/sales_order_base.html
+++ b/InvenTree/order/templates/order/sales_order_base.html
@@ -16,7 +16,7 @@
 
 {% block thumbnail %}
 <img class='part-thumb'
-{% if order.customer.image %}
+{% if order.customer and order.customer.image %}
 src="{{ order.customer.image.url }}"
 {% else %}
 src="{% static 'img/blank_image.png' %}"
@@ -106,11 +106,13 @@ src="{% static 'img/blank_image.png' %}"
             {% endif %}
         </td>
     </tr>
+    {% if order.customer %}
     <tr>
         <td><span class='fas fa-building'></span></td>
         <td>{% trans "Customer" %}</td>
         <td><a href="{% url 'company-detail' order.customer.id %}">{{ order.customer.name }}</a>{% include "clip.html"%}</td>
     </tr>
+    {% endif %}
     {% if order.customer_reference %}
     <tr>
         <td><span class='fas fa-hashtag'></span></td>
diff --git a/InvenTree/part/templates/part/category.html b/InvenTree/part/templates/part/category.html
index 48677ee71d..b8e3dbe1f6 100644
--- a/InvenTree/part/templates/part/category.html
+++ b/InvenTree/part/templates/part/category.html
@@ -29,7 +29,7 @@
     <span class='fas fa-bell icon-green'></span>
 </button>
 {% else %}
-<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to nofications for this category" %}'>
+<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to notifications for this category" %}'>
     <span id='category-star-icon' class='fa fa-bell-slash'/>
 </button>
 {% endif %}
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index bb7aea3abb..4ca7c80d65 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -24,7 +24,7 @@
 {% endif %}
 
 {% if starred_directly %}
-<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "You are subscribed to nofications for this part" %}'>
+<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "You are subscribed to notifications for this part" %}'>
     <span id='part-star-icon' class='fas fa-bell icon-green'/>
 </button>
 {% elif starred %}
@@ -32,7 +32,7 @@
     <span class='fas fa-bell icon-green'></span>
 </button>
 {% else %}
-<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to nofications for this part" %}'>
+<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to notifications for this part" %}'>
     <span id='part-star-icon' class='fa fa-bell-slash'/>
 </button>
 {% endif %}
diff --git a/InvenTree/templates/js/translated/barcode.js b/InvenTree/templates/js/translated/barcode.js
index 2778983341..6be56d14f1 100644
--- a/InvenTree/templates/js/translated/barcode.js
+++ b/InvenTree/templates/js/translated/barcode.js
@@ -257,7 +257,7 @@ function barcodeDialog(title, options={}) {
 
     $(modal).modal({
         backdrop: 'static',
-        keyboard: false,
+        keyboard: user_settings.FORMS_CLOSE_USING_ESCAPE,
     });
 
     if (options.preShow) {