diff --git a/styles/sections/_task_order.scss b/styles/sections/_task_order.scss
index 4fc3c141..d0e4d873 100644
--- a/styles/sections/_task_order.scss
+++ b/styles/sections/_task_order.scss
@@ -84,8 +84,9 @@
       margin: 0 $gap 0 0;
     }
 
-    span.icon.icon--ok.icon-validation {
-      left: 47.5em;
+    .usa-input--validation--dollars label span.icon.icon--ok.icon-validation {
+      left: auto;
+      right: -$gap * 9;
     }
 
     .form-row {
diff --git a/templates/task_orders/step_3.html b/templates/task_orders/step_3.html
index 42da056e..f1c3d115 100644
--- a/templates/task_orders/step_3.html
+++ b/templates/task_orders/step_3.html
@@ -200,6 +200,11 @@
                     {{ Icon("ok", classes="icon--green") }}
                   </div>
                 </div>
+                <p class="usa-input-error-message" v-bind:class="{ 'form-has-errors': !isWithinDateRange }">
+                  {% if maxdate and mindate %}Date must be between {{mindate.strftime("%m/%d/%Y")}} and {{maxdate.strftime("%m/%d/%Y")}}{% endif %}
+                  {% if maxdate and not mindate %}Date must be before or on {{maxdate.strftime("%m/%d/%Y")}}{% endif %}
+                  {% if mindate and not maxdate %}Date must be after or on {{mindate.strftime("%m/%d/%Y")}}{% endif %}
+                </p>
               </fieldset>
             </date-selector>
           </div>
@@ -259,6 +264,11 @@
                     {{ Icon("ok", classes="icon--green") }}
                   </div>
                 </div>
+                <p class="usa-input-error-message" v-bind:class="{ 'form-has-errors': !isWithinDateRange }">
+                  {% if maxdate and mindate %}Date must be between {{mindate.strftime("%m/%d/%Y")}} and {{maxdate.strftime("%m/%d/%Y")}}{% endif %}
+                  {% if maxdate and not mindate %}Date must be before or on {{maxdate.strftime("%m/%d/%Y")}}{% endif %}
+                  {% if mindate and not maxdate %}Date must be after or on {{mindate.strftime("%m/%d/%Y")}}{% endif %}
+                </p>
               </fieldset>
             </date-selector>
           </div>
@@ -274,7 +284,7 @@
           :name="'clins-' + clinIndex + '-obligated_amount'"
           validation="dollars"
           :watch='true'>
-          <div class="usa-input usa-input--validation--dollars noMaxWidth">
+          <div class="usa-input usa-input--validation--dollars">
             <label :for="name">
               <div class="usa-input__title">{{ 'task_orders.form.obligated_funds_label' | translate }}</div>
               <span v-show='showError'>{{ Icon('alert',classes="icon-validation") }}</span>