diff --git a/src/registrar/templates/application_form.html b/src/registrar/templates/application_form.html
index 8730cf098..3d246f7aa 100644
--- a/src/registrar/templates/application_form.html
+++ b/src/registrar/templates/application_form.html
@@ -3,26 +3,30 @@
 
 {% block title %}Apply for a .gov domain – {{form_titles|get_item:wizard.steps.current}}{% endblock %}
 {% block content %}
-<div class="grid-row grid-gap">
-  <div class="grid-col-3">
-    {% include 'application_sidebar.html' %}
-  </div>
-  <div class="grid-col-9">
-    {% if wizard.steps.prev %}
-    <a href="{% url wizard.url_name step=wizard.steps.prev %}">
-      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use>
-      </svg><span class="margin-left-05">Previous step </span>
-    </a>
-    {% endif %}
-    <h1> {{form_titles|get_item:wizard.steps.current}} </h1>
-    {% block form_content %}
-      {% if wizard.steps.next %}
+<div class="grid-container">
+  <div class="grid-row grid-gap">
+    <div class="grid-col-3">
+      {% include 'application_sidebar.html' %}
+    </div>
+    <div class="grid-col-9">
+      <main id="main-content" class="grid-container">
+        {% if wizard.steps.prev %}
+        <a href="{% url wizard.url_name step=wizard.steps.prev %}">
+          <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+            <use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use>
+          </svg><span class="margin-left-05">Previous step </span>
+        </a>
+        {% endif %}
+        <h1> {{form_titles|get_item:wizard.steps.current}} </h1>
+        {% block form_content %}
+        {% if wizard.steps.next %}
         <button type="submit" class="usa-button">Next</button>
-      {% else %}
+        {% else %}
         <button type="submit" class="usa-button">Submit your domain request</button>
-      {% endif %}
-      <button type="button" class="usa-button usa-button--outline">Save</button>
+        {% endif %}
+        <button type="button" class="usa-button usa-button--outline">Save</button>
+      </main>
+    </div> 
     {% endblock %}
   </div>
 </div>
diff --git a/src/registrar/templates/application_sidebar.html b/src/registrar/templates/application_sidebar.html
index f9f7d82d9..fef88396c 100644
--- a/src/registrar/templates/application_sidebar.html
+++ b/src/registrar/templates/application_sidebar.html
@@ -10,7 +10,7 @@
           {{ form_titles|get_item:this_step }}
         </a>
       {% else %}
-        <li class="usa-sidenav__item step__locked">
+        <li class="usa-sidenav__item step--locked">
         {{ form_titles|get_item:this_step }}
         <svg class="usa-icon" aria-labelledby="locked-step" role="img">
           <title id="locked-step">locked until previous steps have been completed </title>
diff --git a/src/registrar/templates/base.html b/src/registrar/templates/base.html
index c0ebf9dca..7d2091703 100644
--- a/src/registrar/templates/base.html
+++ b/src/registrar/templates/base.html
@@ -171,10 +171,8 @@
 
     {% block section_nav %}{% endblock %}
 
-    <main id="main-content" class="grid-container">
       {% block hero %}{% endblock %}
       {% block content %}{% endblock %}
-    </main>
 
     <div role="complementary">{% block complementary %}{% endblock %}</div>