diff --git a/static/styles/main.css b/static/styles/main.css
index 3deccbd..1d2db15 100644
--- a/static/styles/main.css
+++ b/static/styles/main.css
@@ -1141,3 +1141,8 @@ footer > section {
     grid-template-columns: repeat(2, 1fr);
     gap: 3rem;
 }
+.wholesale-field {
+    display: grid;
+    grid-template-columns: repeat(4, 1fr);
+    gap: 0.5rem;
+}
diff --git a/storefront/templates/storefront/wholesale_order.html b/storefront/templates/storefront/wholesale_order.html
index 83052a6..dc97cce 100644
--- a/storefront/templates/storefront/wholesale_order.html
+++ b/storefront/templates/storefront/wholesale_order.html
@@ -27,7 +27,7 @@
         </div>
         <div>
             <h4>I'm already a wholesale customer</h4>
-            <p>If you are already a wholesale customer, please <a href="{% url 'account_login' %}?next=/wholesale-orders/new/">login</a> and return to this page to place an order.<p>
+            <p>If you are already a wholesale customer, please <a href="{% url 'login' %}?next=/wholesale-orders/new/">login</a> and return to this page to place an order.<p>
         </div>
     </section>
     {% endif %}
diff --git a/storefront/templates/storefront/wholesale_order_create_form.html b/storefront/templates/storefront/wholesale_order_create_form.html
index 99fe83a..2d39111 100644
--- a/storefront/templates/storefront/wholesale_order_create_form.html
+++ b/storefront/templates/storefront/wholesale_order_create_form.html
@@ -8,23 +8,27 @@
     <section>
         <form method="post">
             {% csrf_token %}
-            <table class="form-table">
-                <thead>
-                    <th>Product</th>
-                    <th>16 oz Qty&emsp;/&emsp;5 lb Qty</th>
-                </thead>
-                <tbody>
-                    {{ form.as_table }}
-                </tbody>
-                <tfoot>
-                    <tr>
-                        <td></td>
-                        <td>
-                            <button type="submit">Place order</button>
-                        </td>
-                    </tr>
-                </tfoot>
-            </table>
+            <div class="wholesale-fields">
+                <div class="wholesale-field">
+                    <strong>Product</strong>
+                    <strong>16 oz.</strong>
+                    <strong>5 lb.</strong>
+                    <span></span>
+                </div>
+                {% for field in form %}
+                    <div class="wholesale-field">
+                        {{ field.label_tag }}
+                        {{ field }}
+                        <div>
+                            {{ field.errors }}
+                            {% if field.help_text %}
+                            <p class="help">{{ field.help_text|safe }}</p>
+                            {% endif %}
+                        </div>
+                    </div>
+                {% endfor %}
+            </div>
+            <button type="submit">Place order</button>
         </form>
     </section>
 </article>