diff --git a/src/common-components/textbox-question/textbox-question.vue b/src/common-components/textbox-question/textbox-question.vue
index 752fdad6..7f205c51 100644
--- a/src/common-components/textbox-question/textbox-question.vue
+++ b/src/common-components/textbox-question/textbox-question.vue
@@ -10,7 +10,6 @@
             class="input-wrapper"
             :class="[
                 includeSearchIcon ? 'has-search-icon' : '',
-                includeCalendarIcon ? 'has-calendar-icon' : '',
             ]">
             <input
                 class="form-control"
@@ -25,14 +24,16 @@
                 :disabled="isDisabled"
                 :aria-required="isRequired"
                 :aria-label="questionText"
+                :min="min"
+                :max="max"
                 :class="[
                     hasIcon ? 'has-icon' : '',
                     iconRight ? 'icon-right' : '',
                     cornerStyle === 'rounded' ? 'rounded-pill' : '',
                 ]"
                 :validationRules="validationRules"
-                @change="handleChange"
-                @blur="handleChange"
+                @change="validationRules ? handleChange : () => {}"
+                @blur="validationRules ? handleChange : () => {}"
                 :maxlength="maxLength ? maxLength : '999'"
                 @focus="$emit('focus', $event.target.value)" />
             <button v-if="includeSearchIcon" type="submit" aria-label="Search button" />
@@ -74,7 +75,9 @@ export default {
         questionAlignment: String, // Left or center. Left is default.
         cornerStyle: String, // Rounded or square. Square is default.
         includeSearchIcon: Boolean,
-        includeCalendarIcon: Boolean,
+        min: String,
+        max: String,
+        disableAutoFill: Boolean
     },
     setup(props) {
         const propsClone = Object.assign({}, props);
@@ -111,11 +114,6 @@ export default {
             errors,
         };
     },
-    methods: {
-        async updateDate(e) {
-            document.getElementById(this.inputId).value = e.target.value;
-        },
-    },
     computed: {
         questionText() {
             return this.getCmsContent(this.cmsWidgetName, "QuestionText");
@@ -168,9 +166,14 @@ export default {
 
 input[type="date"]:in-range::-webkit-datetime-edit-year-field, 
 input[type="date"]:in-range::-webkit-datetime-edit-month-field, 
-input[type="date"]:in-range::-webkit-datetime-edit-day-field, 
-input[type="date"]:in-range::-webkit-datetime-edit-text { 	
-    display: none; 
+input[type="date"]:in-range::-webkit-datetime-edit-day-field,
+input[type="date"]:in-range::-webkit-datetime-edit-text
+{
+    color: white;
+}
+
+input[type="date"]::-webkit-inner-spin-button{ 	
+    display: none;
 }
 
 input[type="date"]::-webkit-calendar-picker-indicator {
@@ -222,38 +225,7 @@ input[type="date"]::-webkit-calendar-picker-indicator {
                 display: flex;
             }
         }
-        &.has-calendar-icon {
-            label {
-                &.calendar-icon-input {
-                    position: absolute;
-                    top: 50%;
-                    transform: translateY(-50%);
-                    right: 0;
-                    
-					background-image: url("data:image/svg+xml,%3Csvg width='16' height='16' viewBox='0 0 16 16' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M14.1762 1.52764H13.7656V1.50352C13.7656 1.10476 13.6076 0.722334 13.3263 0.44037C13.0451 0.158406 12.6636 0 12.2659 0C11.8681 0 11.4866 0.158406 11.2054 0.44037C10.9241 0.722334 10.7661 1.10476 10.7661 1.50352V1.52764H5.42476V1.50352C5.42476 1.10476 5.26675 0.722334 4.9855 0.44037C4.70424 0.158406 4.32277 0 3.92501 0C3.52725 0 3.14579 0.158406 2.86453 0.44037C2.58327 0.722334 2.42526 1.10476 2.42526 1.50352V1.52764H1.82376C1.34046 1.52891 0.877316 1.72195 0.53557 2.06455C0.193824 2.40716 0.00127018 2.87146 0 3.35598V14.1717C0.0016909 14.656 0.194379 15.1201 0.536035 15.4626C0.87769 15.8051 1.34059 15.9983 1.82376 16H14.1746C14.6581 15.9987 15.1214 15.8057 15.4634 15.4632C15.8054 15.1206 15.9983 14.6563 16 14.1717V3.35598C15.9987 2.87146 15.8062 2.40716 15.4644 2.06455C15.1227 1.72195 14.6595 1.52891 14.1762 1.52764ZM11.8889 1.50352C11.8889 1.4033 11.9286 1.30718 11.9993 1.23631C12.07 1.16544 12.1659 1.12563 12.2659 1.12563C12.3658 1.12563 12.4617 1.16544 12.5324 1.23631C12.6031 1.30718 12.6428 1.4033 12.6428 1.50352V2.99899C12.6428 3.09922 12.6031 3.19534 12.5324 3.2662C12.4617 3.33707 12.3658 3.37688 12.2659 3.37688C12.1659 3.37688 12.07 3.33707 11.9993 3.2662C11.9286 3.19534 11.8889 3.09922 11.8889 2.99899V1.50352ZM3.54807 1.50352C3.54807 1.4033 3.58778 1.30718 3.65847 1.23631C3.72916 1.16544 3.82504 1.12563 3.92501 1.12563C4.02498 1.12563 4.12086 1.16544 4.19155 1.23631C4.26224 1.30718 4.30195 1.4033 4.30195 1.50352V2.99899C4.30195 3.09922 4.26224 3.19534 4.19155 3.2662C4.12086 3.33707 4.02498 3.37688 3.92501 3.37688C3.82504 3.37688 3.72916 3.33707 3.65847 3.2662C3.58778 3.19534 3.54807 3.09922 3.54807 2.99899V1.50352ZM14.8772 14.1717C14.8747 14.3573 14.8001 14.5345 14.6691 14.6658C14.5382 14.797 14.3614 14.8719 14.1762 14.8744H1.82536C1.63995 14.8723 1.4627 14.7976 1.33144 14.6663C1.20018 14.5351 1.12531 14.3575 1.12281 14.1717V6.59296H14.8772V14.1717Z' fill='%23167CAC'/%3E%3Cpath d='M2.33063 11.282H3.93464V12.6006C3.93464 12.7499 3.99379 12.8931 4.09907 12.9986C4.20435 13.1041 4.34715 13.1634 4.49604 13.1634C4.64494 13.1634 4.78773 13.1041 4.89301 12.9986C4.9983 12.8931 5.05745 12.7499 5.05745 12.6006V11.282H7.46346V12.6006C7.46346 12.7499 7.52261 12.8931 7.62789 12.9986C7.73318 13.1041 7.87597 13.1634 8.02486 13.1634C8.17376 13.1634 8.31655 13.1041 8.42184 12.9986C8.52712 12.8931 8.58627 12.7499 8.58627 12.6006V11.282H10.9923V12.6006C10.9923 12.7499 11.0514 12.8931 11.1567 12.9986C11.262 13.1041 11.4048 13.1634 11.5537 13.1634C11.7026 13.1634 11.8454 13.1041 11.9507 12.9986C12.0559 12.8931 12.1151 12.7499 12.1151 12.6006V11.282H13.7191C13.868 11.282 14.0108 11.2227 14.1161 11.1172C14.2214 11.0116 14.2805 10.8685 14.2805 10.7192C14.2805 10.57 14.2214 10.4268 14.1161 10.3213C14.0108 10.2157 13.868 10.1564 13.7191 10.1564H12.1151V8.84425C12.1151 8.69498 12.0559 8.55183 11.9507 8.44628C11.8454 8.34073 11.7026 8.28143 11.5537 8.28143C11.4048 8.28143 11.262 8.34073 11.1567 8.44628C11.0514 8.55183 10.9923 8.69498 10.9923 8.84425V10.1628H8.58627V8.84425C8.58627 8.69498 8.52712 8.55183 8.42184 8.44628C8.31655 8.34073 8.17376 8.28143 8.02486 8.28143C7.87597 8.28143 7.73318 8.34073 7.62789 8.44628C7.52261 8.55183 7.46346 8.69498 7.46346 8.84425V10.1628H5.05745V8.84425C5.05745 8.69498 4.9983 8.55183 4.89301 8.44628C4.78773 8.34073 4.64494 8.28143 4.49604 8.28143C4.34715 8.28143 4.20435 8.34073 4.09907 8.44628C3.99379 8.55183 3.93464 8.69498 3.93464 8.84425V10.1628H2.33063C2.18174 10.1628 2.03894 10.2221 1.93366 10.3277C1.82837 10.4332 1.76923 10.5764 1.76923 10.7257C1.76923 10.8749 1.82837 11.0181 1.93366 11.1236C2.03894 11.2292 2.18174 11.2885 2.33063 11.2885V11.282Z' fill='%23167CAC'/%3E%3C/svg%3E");
-                    background-repeat: no-repeat;
-                    background-position: center;
-                    width: 4rem; // check this
-                    height: 100%;
-                    display: flex;
-                    border: 1px solid black; //fix this
-					border-left: none;
-					border-radius: 0px 5px 5px 0px; //match this
-
-                    background-color: #E4F1F7;
-                    &:hover {
-                        cursor: pointer;
-                    }
-					// need to keep calendar on the screen
-					/*
-                    input[type="date"] {
-                        position: absolute;
-                        left: -9999px;
-                    }
-					*/
-                }
-            }
-        }
+        
     }
     input {
         &.has-icon {
diff --git a/src/constants/error-messages.js b/src/constants/error-messages.js
index 500bde97..81d3b693 100644
--- a/src/constants/error-messages.js
+++ b/src/constants/error-messages.js
@@ -30,7 +30,8 @@ const errorMessages = {
     POLICY_ZIP_FORMAT: "Please enter a valid policy ZIP",
     LOSS_CAUSE_REQUIRED: "Please enter loss cause",
     LOSS_CITY_REQUIRED: "Please enter loss city",
-    LOSS_STATE_REQUIRED: "Please enter loss state"
+    LOSS_STATE_REQUIRED: "Please enter loss state",
+    LOSS_DATE_REQUIRED: "Please enter a loss date"
 };
 
 export { errorMessages };
\ No newline at end of file
diff --git a/src/layouts/welcome-page/welcome-page.vue b/src/layouts/welcome-page/welcome-page.vue
index 6b7eb8ac..3be57045 100644
--- a/src/layouts/welcome-page/welcome-page.vue
+++ b/src/layouts/welcome-page/welcome-page.vue
@@ -5,18 +5,6 @@
         <siteSubHeader cmsWidgetName="SubHeader"/>
         <p>Welcome Page Placeholder</p>
         <br />
-		
-		<div class="row mt-2">
-			<textboxQuestion
-				cmsWidgetName="dmgDate"
-				v-model="test"
-				inputId="dmgDate"
-				isRequired
-				disableAutoFill
-				validationRules="vin-required|vin-format"
-				includeCalendarIcon
-			/>
-		</div>
 
 		<div class="row mt-2">
 			<textboxQuestion
@@ -25,9 +13,8 @@
 				v-model="test"
 				inputId="dmgDate"
 				isRequired
-				disableAutoFill
-				validationRules="vin-required|vin-format"
-				
+                disableAutoFill
+				:max="new Date().toJSON().slice(0,10)"
 			/>
 		</div>
     </div>
@@ -45,7 +32,7 @@
 	import textboxQuestion from "@/common-components/textbox-question/textbox-question"
 
     //define validation rules
-    defineRule("loss-state-required", required(errorMessages.STATE_REQUIRED));
+    defineRule("loss-date-required", required(errorMessages.LOSS_DATE_REQUIRED));
 
     export default ({
         name: "welcome-page",