diff --git a/InvenTree/templates/InvenTree/settings/currencies.html b/InvenTree/templates/InvenTree/settings/currencies.html
index ba6e782508..706f836317 100644
--- a/InvenTree/templates/InvenTree/settings/currencies.html
+++ b/InvenTree/templates/InvenTree/settings/currencies.html
@@ -13,29 +13,31 @@
 <table class='table table-striped table-condensed'>
     <tbody>
         {% include "InvenTree/settings/setting.html" with key="INVENTREE_DEFAULT_CURRENCY" icon="fa-globe" %}
-    </tbody>
-</table>
 
-<table class='table table-striped table-condensed'>
-    <tbody>
         <tr>
+            <td></td>
             <th>{% trans "Base Currency" %}</th>
             <th>{{ base_currency }}</th>
         </tr>
         <tr>
-            <th colspan='2'>{% trans "Exchange Rates" %}</th>
+            <td></td>
+            <th colspan='4'>{% trans "Exchange Rates" %}</th>
         </tr>
         {% for rate in rates %}
         <tr>
-            <td>{{ rate.currency }}</td>
+            <td></td>
             <td>{{ rate.value }}</td>
+            <td>{{ rate.currency }}</td>
+            <td></td>
+            <td></td>
         </tr>
         {% endfor %}
         <tr>
+            <th></th>
             <th>
                 {% trans "Last Update" %}
             </th>
-            <td>
+            <td colspan="3">
                 {% if rates_updated %}
                 {{ rates_updated }}
                 {% else %}
@@ -44,7 +46,7 @@
                 <form action='{% url "settings-currencies-refresh" %}' method='post'>
                     <div id='refresh-rates-form'>
                         {% csrf_token %}
-                        <button type='submit' id='update-rates' class='btn btn-outline-secondary float-right'>{% trans "Update Now" %}</button>
+                        <button type='submit' id='update-rates' class='btn btn-primary float-right'>{% trans "Update Now" %}</button>
                     </div>
                 </form>
             </td>
diff --git a/InvenTree/templates/panel.html b/InvenTree/templates/panel.html
index 1491991e8c..53c5ca997a 100644
--- a/InvenTree/templates/panel.html
+++ b/InvenTree/templates/panel.html
@@ -1,7 +1,13 @@
 <div class='panel panel-hidden' id='panel-{% block label %}name{% endblock %}'>
     {% block panel_heading %}
     <div class='panel-heading'>
-        <h4>{% block heading %}HEADING{% endblock %}</h4>
+        <div class='d-flex flex-wrap'>
+            <h4>{% block heading %}HEADING{% endblock %}</h4>
+        </div>
+        <div class='btn-group' role='group'>
+            {% block actions %}
+            {% endblock %}
+        </div>
     </div>
     {% endblock %}
     {% block panel_content %}