diff --git a/InvenTree/InvenTree/static/css/inventree.css b/InvenTree/InvenTree/static/css/inventree.css
index 227b910755..b920205ca3 100644
--- a/InvenTree/InvenTree/static/css/inventree.css
+++ b/InvenTree/InvenTree/static/css/inventree.css
@@ -328,6 +328,12 @@
     width: 100%;
 }
 
+input[type="submit"] {
+    color: #333;
+    background-color: #e6e6e6;
+    border-color: #adadad;
+}
+
 .modal textarea {
     width: 100%;
 }
diff --git a/InvenTree/part/templates/part/notes.html b/InvenTree/part/templates/part/notes.html
index 412ea09b70..bbbafed4c1 100644
--- a/InvenTree/part/templates/part/notes.html
+++ b/InvenTree/part/templates/part/notes.html
@@ -8,27 +8,30 @@
 
 {% include 'part/tabs.html' with tab='notes' %}
 
-<h4>{% trans "Part Notes" %}</h4>
 
 {% if editing %}
-
+<h4>{% trans "Part Notes" %}</h4>
 <form method='POST'>
     {% csrf_token %}
-    
-    <input type="submit" value='{% trans "Save Notes" %}'/>
+        
     {{ form }}
+    <hr>
+    <input type="submit" value='{% trans "Save" %}'/>
     
 </form>
 
 {{ form.media }}
 
 {% else %}
-
-<div class='panel panel-default'>
-    <div class='panel-heading'>
-        {% trans "Notes" %}
-        <button class='btn btn-default' id='edit-notes'>Edit</button>
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>{% trans "Part Notes" %}</h4>
     </div>
+    <div class='col-sm-6'>
+        <button title='{% trans "Edit notes" %}' class='btn btn-default btn-glyph float-right' id='edit-notes'><span class='glyphicon glyphicon-edit'></span></button>
+    </div>
+</div>
+<div class='panel panel-default'>
     <div class='panel-content'>
         {{ part.notes | markdownify }}
     </div>
@@ -41,8 +44,11 @@
 {% block js_ready %}
 {{ block.super }}
 
+{% if editing %}
+{% else %}
 $("#edit-notes").click(function() {
     location.href = "{% url 'part-notes' part.id %}?edit=1";
 });
+{% endif %}
 
 {% endblock %}
\ No newline at end of file