diff --git a/public/index.html b/public/index.html
index 35da253dd..b926ca739 100644
--- a/public/index.html
+++ b/public/index.html
@@ -7,7 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="preconnect" href="https://fonts.googleapis.com">
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-    <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;0,400;0,500;0,700;1,300;1,400;1,500;1,700&display=swap" rel="stylesheet">
     <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
diff --git a/src/common-components/button-question/button-question.vue b/src/common-components/button-question/button-question.vue
index 3a2442c61..d96886088 100644
--- a/src/common-components/button-question/button-question.vue
+++ b/src/common-components/button-question/button-question.vue
@@ -105,6 +105,7 @@ export default {
 
 <style lang="scss" scoped>
 .button_question {
+  color: $black;
   height: calc(100vh - 280px);
 
   .overflow-scroll {
diff --git a/src/layouts/component-test/component-test.vue b/src/layouts/component-test/component-test.vue
index d303d216d..2ac9f56c6 100644
--- a/src/layouts/component-test/component-test.vue
+++ b/src/layouts/component-test/component-test.vue
@@ -626,12 +626,18 @@
     </div>
     <div class="row my-4">
       <div class="col">
-        <h4 class="m-0 p-2 bg-light rounded">Text Link</h4>
+        <h4 class="m-0 p-2 bg-light rounded">Links</h4>
       </div>
     </div>
     <div class="row">
-      <div class="col my-3 d-flex align-items-center">
-        <a href="#">Text Link</a>
+      <div class="col my-3">
+        <a href="#">Text Link</a> <span>(default text link behavior)</span>
+        <br><br>
+        <a class="small" href="#">Text Link Small</a> <span>(.small)</span>
+        <br><br>
+        <a class="footer-link" href="#">Footer Link</a> <span>(.footer-link)</span>
+        <br><br>
+        <a class="navigation-link" href="#">Navigation Link</a> <span>(.navigation-link)</span>
       </div>
     </div>
     <div class="row my-4">
diff --git a/src/layouts/form-test/form-test.vue b/src/layouts/form-test/form-test.vue
index 076dcaac0..2df7ee70f 100644
--- a/src/layouts/form-test/form-test.vue
+++ b/src/layouts/form-test/form-test.vue
@@ -4,9 +4,11 @@
   @submit="onSubmit"
   @invalid-submit="onInvalidSubmit"
   v-slot="{ values, meta }"
+  class="w-50"
 >
   <div class="row g-2 mt-6 mx-4">
     <h2 class="mx-2 mt-4 mb-0">FORM VALIDATION TEST</h2>
+    <p class="mx-2">NOTE: This page is testing functionality only; styling will not match Figma mocks.</p>
   </div> 
 
   <div class="row g-2 mt-6 mx-4">
@@ -109,7 +111,7 @@
     </div>
   </div>
 
-  <div class="row g-2 mt-6 mx-4">
+  <!-- <div class="row g-2 mt-6 mx-4">
     <div class="col">
       <h4 class="mx-2 mt-4 mb-0">demo4: Enter some numbers (optional)</h4>
       <textInput
@@ -119,7 +121,7 @@
         :isRequired="true"
       />
     </div>
-  </div>
+  </div> -->
 
   <div class="row g-2 mt-6 mx-4">
     <h4 class="mx-2 mt-4 mb-0">demo5: Where's your damage? (Required)</h4>
@@ -201,7 +203,7 @@
     <error-message name="demo6"></error-message>
   </div>
 
-  <div class="row g-2 mt-6 mx-4">
+  <!-- <div class="row g-2 mt-6 mx-4">
     <div class="col">
       <h4 class="mx-2 mt-4 mb-0">Password (Required, enter any string)</h4>
       <textInput
@@ -223,7 +225,7 @@
         :isRequired="true"
       />
     </div>
-  </div>
+  </div> -->
 
   <div class="row px-3 form-test-error" data-focus-target="demoX">
     <error-message name="demoX"></error-message>
@@ -253,13 +255,25 @@ import listButtonHorizontal from "@/ux-components/list-button-horizontal/list-bu
 export default {
   name: "App",
   data() {
+    const errorMessages = {
+      demo: 'Please select chip(s)',
+      demo2: 'Please select a windshield part',
+      demo3: 'You entered an invalid VIN. Please check to make sure that you inserted a 17 digit, alpha-numeric number. VINs do not contain the letters I, O or Q.',
+      demo4: 'Invalid Entry. Must enter only numbers, no letters.',
+      demo5: 'Please select damage location',
+    };
     return {
       schema: Yup.object().shape({
-        demo: Yup.string().required('Please select chip(s)'),
-        demo2: Yup.array().required('Please select a windshield part'),
-        demo3: Yup.string().required('Invalid VIN. Please enter X, Y, Z...'),
-        demo4: Yup.string().matches('^[0-9]*$', 'Invalid Entry. Must enter only numbers, no letters.'),
-        demo5: Yup.array().required('Please select damage location'),
+        demo: Yup.string().required(errorMessages.demo),
+        demo2: Yup.array().required(errorMessages.demo2).min(1, errorMessages.demo2),
+        demo3: Yup.string()
+          .uppercase()
+          .required('Please enter a VIN.')
+          .min(17, errorMessages.demo3)
+          .max(17, errorMessages.demo3)
+          .matches('^[^IOQ]+$', errorMessages.demo3),
+        // demo4: Yup.string().matches('^[0-9]*$', errorMessages.demo4),
+        demo5: Yup.array().required(errorMessages.demo5).min(1, errorMessages.demo5),
         demo6: Yup.string()
           .when('demo5', function (demo5, schema, value) {
             if (demo5) {
@@ -273,9 +287,9 @@ export default {
             return schema;
           }),
         demoX: Yup.string().notRequired(),
-        // // PASSWORD EXAMPLE, NOT BEING USED NOW
-        //password: Yup.string().min(6).required(),
-        //passwordConfirmation: Yup.string()
+        // PASSWORD EXAMPLE, NOT BEING USED NOW
+        // password: Yup.string().min(6).required(),
+        // passwordConfirmation: Yup.string()
         //  .required()
         //  .oneOf([Yup.ref("password")], "Passwords do not match"),
       }).test('repair-replace-conflict', 
diff --git a/src/styles/common-list-styles.scss b/src/styles/common-list-styles.scss
index d1a27d428..2af95f21a 100644
--- a/src/styles/common-list-styles.scss
+++ b/src/styles/common-list-styles.scss
@@ -12,6 +12,8 @@
         box-shadow: 0 0 0 2px $blue;
       }
       &:checked + label {
+        color: $black;
+        font-weight: 500;
         background: $blue-100;
         box-shadow: 0 0 0 1px $blue;
       }
@@ -20,6 +22,7 @@
       }
     }
     label {
+      color: $gray-600;
       position: relative;
       background: $white;
       transition: all 150ms linear;
diff --git a/src/styles/common-styles.scss b/src/styles/common-styles.scss
index 5e1993716..78e82afcb 100644
--- a/src/styles/common-styles.scss
+++ b/src/styles/common-styles.scss
@@ -14,8 +14,33 @@ body {
     color: $blue;
     text-decoration: none;
     border-bottom: 1px solid $blue;
+    line-height: 26px;
+    padding: 0 0 4px 0;
+    font-weight: 500;
     &:hover {
-      color: $blue-400;
+      color: $blue;
+      font-weight: 700;
+    }
+    &.small {
+      line-height: 24px;
+    }
+    &.navigation-link {
+      color: $black;
+      border-bottom: 1px solid $black;
+      line-height: 26px;
+    }
+    &.footer-link {
+      color: $gray-500;
+      text-decoration: none;
+      border-bottom: 1px solid transparent;
+      line-height: 20px;
+      padding: 0 0 2px 0;
+      font-weight: 400;
+      font-size: .75rem;
+      &:hover {
+        border-bottom: 1px solid $gray-500;
+        padding: 0 0 2px 0;
+      }
     }
   }
   .pointer {
diff --git a/src/ux-components/list-button/list-button.vue b/src/ux-components/list-button/list-button.vue
index 24ffd4b58..912403025 100644
--- a/src/ux-components/list-button/list-button.vue
+++ b/src/ux-components/list-button/list-button.vue
@@ -74,7 +74,7 @@ export default {
   &.list-button {
     input[type="radio"],
     input[type="checkbox"] {
-      position: static !important; //override bootstrap
+      position: static; //override bootstrap
       height: 0;
     }
   }
