diff --git a/styles/components/_forms.scss b/styles/components/_forms.scss
index 83ab5b83..b2ca60f0 100644
--- a/styles/components/_forms.scss
+++ b/styles/components/_forms.scss
@@ -73,5 +73,13 @@
       }
     }
   }
+
+  &--warning {
+    @include alert-level('warning');
+  }
+
+  &--error {
+    @include alert-level('error');
+  }
 }
 
diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html
index cec36d27..dd12ea01 100644
--- a/templates/requests/financial_verification.html
+++ b/templates/requests/financial_verification.html
@@ -105,42 +105,45 @@
           level='warning'
         ) }}
 
-        {{ OptionsInput(
-          f.funding_type
+        <fieldset class="form__sub-fields form__sub-fields--warning">
+          {{ OptionsInput(
+            f.funding_type
           ) }}
 
-        {{ TextInput(
-          f.funding_type_other
+          {{ TextInput(
+            f.funding_type_other
           ) }}
 
-        {{ TextInput(
-          f.clin_0001,placeholder="50,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_0001,placeholder="50,000",
+            validation='integer'
           ) }}
 
-        {{ TextInput(
-          f.clin_0003,placeholder="13,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_0003,placeholder="13,000",
+            validation='integer'
           ) }}
 
-        {{ TextInput(
-          f.clin_1001,placeholder="30,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_1001,placeholder="30,000",
+            validation='integer'
           ) }}
 
-        {{ TextInput(
-          f.clin_1003,placeholder="7,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_1003,placeholder="7,000",
+            validation='integer'
           ) }}
 
-        {{ TextInput(
-          f.clin_2001,placeholder="30,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_2001,placeholder="30,000",
+            validation='integer'
           ) }}
 
-        {{ TextInput(f.clin_2003,placeholder="7,000",
-          validation='integer'
+          {{ TextInput(
+            f.clin_2003,placeholder="7,000",
+            validation='integer'
           ) }}
+        </fieldset>
 
 
       {% endautoescape %}