diff --git a/styles/components/_forms.scss b/styles/components/_forms.scss
index f11af8f8..255622f8 100644
--- a/styles/components/_forms.scss
+++ b/styles/components/_forms.scss
@@ -22,8 +22,9 @@
     }
 
     .usa-input {
-      input {
-        max-width: none;
+      input,
+      textarea {
+        max-width: $max-input-width;
       }
     }
   }
@@ -204,6 +205,10 @@
   }
 }
 
-.form-container__half {
-  max-width: 46rem;
+.form-container {
+  margin-bottom: $action-footer-height + $large-spacing;
+
+  &--narrow {
+    max-width: $max-input-width;
+  }
 }
diff --git a/styles/core/_util.scss b/styles/core/_util.scss
index 7fd8e152..0790a121 100644
--- a/styles/core/_util.scss
+++ b/styles/core/_util.scss
@@ -98,7 +98,3 @@ hr {
 .usa-section {
   padding: 0;
 }
-
-.form {
-  margin-bottom: $action-footer-height + $large-spacing;
-}
diff --git a/styles/core/_variables.scss b/styles/core/_variables.scss
index 09b838f3..f98a3663 100644
--- a/styles/core/_variables.scss
+++ b/styles/core/_variables.scss
@@ -21,6 +21,7 @@ $home-pg-icon-width: 6rem;
 $large-spacing: 4rem;
 $max-page-width: $max-panel-width + $sidenav-expanded-width + $large-spacing;
 $action-footer-height: 6rem;
+$max-input-width: 46rem;
 
 /*
  * USWDS Variables
diff --git a/styles/elements/_inputs.scss b/styles/elements/_inputs.scss
index c424b723..c5a02e59 100644
--- a/styles/elements/_inputs.scss
+++ b/styles/elements/_inputs.scss
@@ -58,7 +58,7 @@
 
 .usa-input {
   margin: ($gap * 2) 0;
-  max-width: 75rem;
+  max-width: $max-input-width;
 
   &-label-helper {
     font-size: $small-font-size;
@@ -111,8 +111,7 @@
     @include h5;
 
     font-weight: normal;
-
-    @include line-max;
+    max-width: $max-input-width;
 
     .icon-link {
       padding: 0 ($gap / 2);
diff --git a/templates/applications/new/step_1.html b/templates/applications/new/step_1.html
index 39656257..688aa5a3 100644
--- a/templates/applications/new/step_1.html
+++ b/templates/applications/new/step_1.html
@@ -22,7 +22,7 @@
   {% include "fragments/flash.html" %}
 
   <base-form inline-template :enable-save="true">
-    <form method="POST" action="{{ action }}" v-on:submit="handleSubmit" class="form">
+    <form method="POST" action="{{ action }}" v-on:submit="handleSubmit" class="form-container">
       {{ form.csrf_token }}
       <div class="form-row">
         <div class="form-col">
diff --git a/templates/applications/new/step_2.html b/templates/applications/new/step_2.html
index fe07b44d..5fa6be34 100644
--- a/templates/applications/new/step_2.html
+++ b/templates/applications/new/step_2.html
@@ -21,7 +21,7 @@
   </p>
   <hr>
   <application-environments inline-template v-bind:initial-data='{{ form.data|tojson }}'>
-    <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit" class="form">
+    <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit" class="form-container">
       <div class="subheading">{{ 'portfolios.applications.environments_heading' | translate }}</div>
       <div class="panel">
         <div class="panel__content">
diff --git a/templates/applications/settings.html b/templates/applications/settings.html
index 1ec7be37..9fc42a17 100644
--- a/templates/applications/settings.html
+++ b/templates/applications/settings.html
@@ -20,7 +20,7 @@
 
   {% if user_can(permissions.EDIT_APPLICATION) %}
     <base-form inline-template>
-      <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}" class="col col--half">
+      <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}" class="form-container--narrow">
         {{ application_form.csrf_token }}
         {{ TextInput(application_form.name, validation="applicationName", optional=False) }}
         {{ TextInput(application_form.description, validation="defaultTextAreaField", paragraph=True, optional=True, showOptional=False) }}
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index 40721c0d..6e0e795d 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -13,7 +13,7 @@
   <div v-cloak class="portfolio-admin">
     {% include "fragments/flash.html" %}
     <!-- max width of this section is 460px -->
-    <section class="form-container__half">
+    <section class="form-container--narrow">
       <h3>Portfolio name and component</h3>
       {% if user_can(permissions.EDIT_PORTFOLIO_NAME) %}
         <base-form inline-template>
diff --git a/templates/portfolios/new/step_1.html b/templates/portfolios/new/step_1.html
index d7d4f522..911f19db 100644
--- a/templates/portfolios/new/step_1.html
+++ b/templates/portfolios/new/step_1.html
@@ -19,7 +19,7 @@
   {{ StickyCTA(text="portfolios.new.cta_step_1"|translate, context=("portfolios.new.sticky_header_context"|translate({"step": "1"}) )) }}
   <base-form inline-template>
     <div class="row">
-      <form id="portfolio-create" class="col form" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
+      <form id="portfolio-create" class="col form-container" action="{{ url_for('portfolios.create_portfolio') }}" method="POST">
         {{ form.csrf_token }}
         <div class="form-row form-row--bordered">
           <div class="form-col">
diff --git a/templates/task_orders/builder_base.html b/templates/task_orders/builder_base.html
index 41c253f6..7ee402fb 100644
--- a/templates/task_orders/builder_base.html
+++ b/templates/task_orders/builder_base.html
@@ -28,7 +28,7 @@
 
       {% include "fragments/flash.html" %}
 
-      <div class="task-order form">
+      <div class="task-order form-container">
         {% block to_builder_form_field %}{% endblock %}
       </div>
       <div