diff --git a/InvenTree/order/templates/order/order_wizard/match_fields.html b/InvenTree/order/templates/order/order_wizard/match_fields.html
index 47972361b7..288ddb21eb 100644
--- a/InvenTree/order/templates/order/order_wizard/match_fields.html
+++ b/InvenTree/order/templates/order/order_wizard/match_fields.html
@@ -1,2 +1,99 @@
 {% extends "order/order_wizard/po_upload.html" %}
-{% include "patterns/wizard/match_fields.html" %}
+{% load inventree_extras %}
+{% load i18n %}
+{% load static %}
+
+{% block form_alert %}
+{% if missing_columns and missing_columns|length > 0 %}
+<div class='alert alert-danger alert-block' style='margin-top:12px;' role='alert'>
+    {% trans "Missing selections for the following required columns" %}:
+    <br>
+    <ul>
+        {% for col in missing_columns %}
+        <li>{{ col }}</li>
+        {% endfor %}
+    </ul>
+</div>
+{% endif %}
+{% if duplicates and duplicates|length > 0 %}
+<div class='alert alert-danger alert-block' role='alert'>
+    {% trans "Duplicate selections found, see below. Fix them then retry submitting." %}
+</div>
+{% endif %}
+{% endblock form_alert %}
+
+{% block form_buttons_top %}
+    {% if wizard.steps.prev %}
+    <button name='wizard_goto_step' type='submit' value='{{ wizard.steps.prev }}' class='save btn btn-outline-secondary'>{% trans "Previous Step" %}</button>
+    {% endif %}
+    <button type='submit' class='save btn btn-outline-secondary'>{% trans "Submit Selections" %}</button>
+{% endblock form_buttons_top %}
+
+{% block form_content %}
+    <thead>
+        <tr>
+            <th>{% trans "File Fields" %}</th>
+            <th></th>
+            {% for col in form %}
+            <th>
+                <div>
+                    <input type='hidden' name='col_name_{{ forloop.counter0 }}' value='{{ col.name }}'/>
+                    {{ col.name }}
+                    <button class='btn btn-outline-secondary btn-remove' onClick='removeColFromBomWizard()' id='del_col_{{ forloop.counter0 }}' style='display: inline; float: right;' title='{% trans "Remove column" %}'>
+                        <span col_id='{{ forloop.counter0 }}' class='fas fa-trash-alt icon-red'></span>
+                    </button>
+                </div>
+            </th>
+            {% endfor %}
+        </tr>
+    </thead>
+    <tbody>
+        <tr>
+            <td>{% trans "Match Fields" %}</td>
+            <td></td>
+            {% for col in form %}
+            <td>
+                {{ col }}
+                {% for duplicate in duplicates %}
+                    {% if duplicate == col.value %}
+                    <div class='alert alert-danger alert-block text-center' role='alert' style='padding:2px; margin-top:6px; margin-bottom:2px'>
+                        <strong>{% trans "Duplicate selection" %}</strong>
+                    </div>
+                    {% endif %}
+                {% endfor %}
+            </td>
+            {% endfor %}
+        </tr>
+        {% for row in rows %}
+        {% with forloop.counter as row_index %}
+        <tr>
+            <td style='width: 32px;'>
+                <button class='btn btn-outline-secondary btn-remove' onClick='removeRowFromBomWizard()' id='del_row_{{ row_index }}' style='display: inline; float: left;' title='{% trans "Remove row" %}'>
+                    <span row_id='{{ row_index }}' class='fas fa-trash-alt icon-red'></span>
+                </button>
+            </td>
+            <td style='text-align: left;'>{{ row_index }}</td>
+            {% for item in row.data %}
+            <td>
+                <input type='hidden' name='row_{{ row_index }}_col_{{ forloop.counter0 }}' value='{{ item }}'/>
+                {{ item }}
+            </td>
+            {% endfor %}
+        </tr>
+        {% endwith %}
+        {% endfor %}
+    </tbody>
+{% endblock form_content %}
+
+{% block form_buttons_bottom %}
+{% endblock form_buttons_bottom %}
+
+{% block js_ready %}
+{{ block.super }}
+
+$('.fieldselect').select2({
+    width: '100%',
+    matcher: partialMatcher,
+});
+
+{% endblock %}
diff --git a/InvenTree/order/templates/order/order_wizard/po_upload.html b/InvenTree/order/templates/order/order_wizard/po_upload.html
index fa7c985bb5..6683fabdf1 100644
--- a/InvenTree/order/templates/order/order_wizard/po_upload.html
+++ b/InvenTree/order/templates/order/order_wizard/po_upload.html
@@ -12,12 +12,53 @@
 {% block page_content %}
     {% trans "Upload File for Purchase Order" as header_text %}
     {% trans "Order is already processed. Files cannot be uploaded." as error_text %}
-    {% with "panel-upload-file" as panel_id %}
-    {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %}
-        {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=True error_text=error_text panel_id=panel_id %}
-    {% else %}
-        {% include "patterns/wizard/upload.html" with header_text=header_text upload_go_ahead=False error_text=error_text panel_id=panel_id %}
-    {% endif %}
+    {% with panel_id="panel-upload-file" %}
+
+        <div class='panel' id='{{ panel_id }}'>
+            <div class='panel-heading'>
+                <h4>
+                    {{ header_text }}
+                    {{ wizard.form.media }}
+                </h4>
+            </div>
+            <div class='panel-content'>
+            {% if order.status == PurchaseOrderStatus.PENDING and roles.purchase_order.change %}
+
+                <p>{% blocktrans with step=wizard.steps.step1 count=wizard.steps.count %}Step {{step}} of {{count}}{% endblocktrans %}
+                {% if description %}- {{ description }}{% endif %}</p>
+
+                {% block form_alert %}
+                {% endblock form_alert %}
+
+                <form action='' method='post' class='js-modal-form' enctype='multipart/form-data'>
+                {% csrf_token %}
+                {% load crispy_forms_tags %}
+
+                {% block form_buttons_top %}
+                {% endblock form_buttons_top %}
+
+                <table class='table table-striped' style='margin-top: 12px; margin-bottom: 0px'>
+                {{ wizard.management_form }}
+                {% block form_content %}
+                {% crispy wizard.form %}
+                {% endblock form_content %}
+                </table>
+
+                {% block form_buttons_bottom %}
+                {% if wizard.steps.prev %}
+                <button name='wizard_goto_step' type='submit' value='{{ wizard.steps.prev }}' class='save btn btn-outline-secondary'>{% trans "Previous Step" %}</button>
+                {% endif %}
+                <button type='submit' class='save btn btn-outline-secondary'>{% trans "Upload File" %}</button>
+                </form>
+                {% endblock form_buttons_bottom %}
+
+            {% else %}
+                <div class='alert alert-danger alert-block' role='alert'>
+                    {{ error_text }}
+                </div>
+            {% endif %}
+            </div>
+        </div>
     {% endwith %}
 {% endblock %}