diff --git a/app/javascript/css/forms.scss b/app/javascript/css/forms.scss
index cc95759dd34..ec57c4e8118 100644
--- a/app/javascript/css/forms.scss
+++ b/app/javascript/css/forms.scss
@@ -54,7 +54,9 @@
 }
 
 label,
-legend {
+legend,
+.label,
+.legend {
   display: block;
   font-size: 16px;
   line-height: 24px;
@@ -74,7 +76,9 @@ button,
 }
 
 label.required:after,
+.label.required:after,
 legend.required:after,
+.legend.required:after,
 dt.required:after,
 .applications .required:not(input):not(select):after {
   content: '*';
@@ -96,7 +100,8 @@ select,
   &:hover {
     border-color: var(--grey-120);
   }
-  &:disabled, &[readonly] {
+  &:disabled,
+  &[readonly] {
     background: var(--grey-030);
     color: var(--input-text-color);
   }
@@ -308,7 +313,7 @@ input[type='date']:invalid::-webkit-datetime-edit {
   .broker-registration-tabs {
     border-bottom: 2px solid var(--silver-border);
     font-size: 0;
-    // font-size needs to be set to 0 here to hide 
+    // font-size needs to be set to 0 here to hide
     // the space between the jQuery-ui tabs
 
     li {
@@ -360,7 +365,7 @@ input[type='date']:invalid::-webkit-datetime-edit {
   }
 
   // adding border-0 to these classes does not work
-  // because it is a jquery-ui class 
+  // because it is a jquery-ui class
   #broker_registration,
   #broker_agency_staff {
     border: none;
@@ -370,12 +375,12 @@ input[type='date']:invalid::-webkit-datetime-edit {
   #broker_agency_staff {
     .table-responsive {
       table.broker-staff {
-        width: 100%; 
+        width: 100%;
         border-collapse: collapse;
 
         thead {
           height: 40px;
-          
+
           tr {
             color: var(--text-secondary);
             border-bottom: 1px solid var(--silver-border);
@@ -387,7 +392,7 @@ input[type='date']:invalid::-webkit-datetime-edit {
             padding: 10px;
           }
 
-          th { 
+          th {
             width: 18%;
             vertical-align: bottom;
           }
@@ -397,7 +402,7 @@ input[type='date']:invalid::-webkit-datetime-edit {
           &.agency-selected {
             border: 2px solid var(--button-tertiary-color);
 
-            tr { 
+            tr {
               background-color: var(--tertiary-tint);
             }
           }
diff --git a/app/javascript/css/main.scss b/app/javascript/css/main.scss
index d13dc3407c2..9c774bcecae 100644
--- a/app/javascript/css/main.scss
+++ b/app/javascript/css/main.scss
@@ -155,7 +155,7 @@ dl.parent {
   padding: 0;
   margin: 0;
   margin-bottom: 3ch;
-  grid-auto-rows: min-content
+  grid-auto-rows: min-content;
 }
 
 dd,
@@ -178,6 +178,26 @@ dl.parent.weight-n {
   }
 }
 
+.tax_credit_field_container {
+  height: 44px !important;
+}
+
+#personal_info {
+  input:not([type='checkbox']):not([type='radio']),
+  select,
+  .input {
+    width: 180px;
+  }
+
+  .no-ssn-container {
+    width: 180px;
+
+    label {
+      font-weight: normal;
+    }
+  }
+}
+
 .ethnicity-container {
   label {
     font-weight: 400;
@@ -227,27 +247,32 @@ ul.list-right-section {
   font-size: 16px;
   font-weight: 600;
 
-  &.badge-success, &.badge-green {
+  &.badge-success,
+  &.badge-green {
     background-color: var(--success-status-tint);
     border: 1px solid var(--success-color);
   }
 
-  &.badge-danger, &.badge-red {
+  &.badge-danger,
+  &.badge-red {
     background-color: var(--danger-status-tint);
     border: 1px solid var(--enrollment-status-red);
   }
 
-  &.badge-warning, &.badge-yellow {
+  &.badge-warning,
+  &.badge-yellow {
     background-color: var(--warning-status-tint);
     border: 1px solid var(--warning-border);
   }
 
-  &.badge-info, &.badge-blue {
+  &.badge-info,
+  &.badge-blue {
     background-color: var(--info-tint);
     border: 1px solid var(--info-color);
   }
 
-  &.badge-absent, &.badge-grey {
+  &.badge-absent,
+  &.badge-grey {
     background-color: var(--grey-040);
     border: 1px solid var(--grey-160);
   }
@@ -377,7 +402,6 @@ ul.list-right-section {
   .navbar-brand img {
     padding-left: $spacer / 2;
   }
-
 }
 
 // large breakpoint
@@ -537,7 +561,6 @@ ul.plain {
       border-top-right-radius: 0.25rem;
       border-bottom-right-radius: 0.25rem;
     }
-
   }
 }
 
@@ -572,7 +595,7 @@ a.disabled {
 
 .nav-stacked li {
   padding: $spacer;
-  margin-bottom: ($spacer * .25);
+  margin-bottom: ($spacer * 0.25);
   width: 100%;
   background: var(--grey-010);
   color: var(--info-color);
@@ -591,12 +614,14 @@ a.disabled {
   }
 }
 
-.filter-input-block legend.bb, .sort-area legend {
+.filter-input-block legend.bb,
+.sort-area legend {
   padding-bottom: ($spacer / 2);
   border-bottom: 1px solid var(--body-divider);
 }
 
-.filter-input-block legend.bb, .sort-area legend {
+.filter-input-block legend.bb,
+.sort-area legend {
   padding-bottom: ($spacer / 2);
   border-bottom: 1px solid var(--body-divider);
 }
@@ -605,7 +630,8 @@ a.disabled {
   margin-bottom: 6px;
 }
 
-.tab, .ui-tabs-tab {
+.tab,
+.ui-tabs-tab {
   border: none;
   padding: 1.25ch 1ch 1.1ch;
   font-size: 1rem;
@@ -615,8 +641,9 @@ a.disabled {
   border-radius: 5px 5px 0 0;
 }
 
-.tab.active, .ui-tabs-tab.ui-tabs-active {
-  background: #ffffff;;
+.tab.active,
+.ui-tabs-tab.ui-tabs-active {
+  background: #ffffff;
   color: var(--primary-color);
   border-top: 1px solid var(--grey-060);
   border-left: 1px solid var(--grey-060);
@@ -654,12 +681,14 @@ a.disabled {
   font-weight: 600;
 }
 
-.filter-input-block legend.bb, .sort-area legend {
+.filter-input-block legend.bb,
+.sort-area legend {
   padding-bottom: ($spacer / 2);
   border-bottom: 1px solid var(--body-divider);
 }
 
-.filter-input-block legend.bb, .sort-area legend {
+.filter-input-block legend.bb,
+.sort-area legend {
   padding-bottom: ($spacer / 2);
   border-bottom: 1px solid var(--body-divider);
 }
@@ -683,7 +712,8 @@ a.disabled {
     color: inherit;
     text-decoration: inherit;
 
-    &:hover, &:focus {
+    &:hover,
+    &:focus {
       background-color: var(--complete-tint);
       font-weight: 600;
     }
diff --git a/app/views/insured/group_selection/_cancel_plan_form.html.erb b/app/views/insured/group_selection/_cancel_plan_form.html.erb
index d7a3d105ff9..1d565229452 100644
--- a/app/views/insured/group_selection/_cancel_plan_form.html.erb
+++ b/app/views/insured/group_selection/_cancel_plan_form.html.erb
@@ -21,7 +21,7 @@
         <%= hidden_field_tag :bs4, true %>
         <p><%= l10n("choose_last_day") %></p>
         <label class="required" for="term_date"><%= l10n("coverage_end_date") %></label>
-        <%= date_field_tag :term_date, nil,{class: "date-field mt-2", min: TimeKeeper.date_of_record.strftime("%Y-%m-%d"), required: true} %>
+        <%= date_field_tag :term_date, class: "date-field mt-2", :'data-date-max' => "+0", required: true %>
         <% if show_cancellation_reason %>
           <p class="mt-4"><%= l10n("why_are_you_canceling") %><p>
           <label class="required" for="cancellation_reason"><%= l10n("cancelation_reason") %></label>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_agency_information.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_agency_information.html.erb
index 5b11ec1adf2..b42f3c42d61 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_agency_information.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_agency_information.html.erb
@@ -1,18 +1,16 @@
-<h4 class="mb-2"><%= l10n('broker_agency_note') %></h4>
-
 <div class="row mb-3">
   <%= f.hidden_field :entity_kind, value: "s_corporation" %>
-  
+
   <div class="col-md-6">
-    <label for="inputLegalName" class='required'><%= l10n('legal_name') %></label>
-    <%= f.text_field :legal_name, placeholder: l10n('legal_name_placeholder'), required: true, id: 'validationCustomLegalName', class: 'form-control' %>
+    <%= f.label :legal_name, l10n("legal_name"), class: "required" %>
+    <%= f.text_field :legal_name, placeholder: l10n('legal_name_placeholder'), required: true, class: 'form-control' %>
     <div class="invalid-feedback">
       <%= l10n('legal_name_error') %>
     </div>
   </div>
 
   <div class="col-md-6">
-    <label for="inputDBA"><%= l10n('dba_caps') %></label>
-    <%= f.text_field :dba, placeholder: l10n('doing_business_as'), id: 'validationCustomdba', class: 'form-control' %>
+    <%= f.label :dba, l10n('dba_caps') %>
+    <%= f.text_field :dba, placeholder: l10n('doing_business_as'), class: 'form-control' %>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_attestation_agreement_fields.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_attestation_agreement_fields.html.erb
index e96038dad55..64157252622 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_attestation_agreement_fields.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_attestation_agreement_fields.html.erb
@@ -1,18 +1,24 @@
 <h2 class='mb-3'><%= l10n("agreements") %></h2>
 
-<div class="form-group mb-3">
+<div class="form-group mt-0 d-flex align-items-center">
   <%= check_box_tag :all_marketplace_required_trainings, nil, false, class: "broker-attestation-field", onChange: "allowBrokerAgencyFormSubmission()" %>
-  <%= sanitize_html(l10n("broker_attestation.required_trainings", trainings_link: 'https://coverme.inquisiqlms.com/', site_short_name: EnrollRegistry[:enroll_app].setting(:short_name).item)) %>
+  <label for="<%= :all_marketplace_required_trainings %>" class="mt-0 ml-1 font-weight-normal text-body">
+    <%= h(l10n("broker_attestation.required_trainings", trainings_link: 'https://coverme.inquisiqlms.com/', site_short_name: EnrollRegistry[:enroll_app].setting(:short_name).item)) %>
+  </label>
 </div>
 
-<div class="form-group mb-3">
+<div class="form-group mt-0 d-flex align-items-center">
   <%= check_box_tag :active_license_attestation, nil, false, class: "broker-attestation-field", onChange: "allowBrokerAgencyFormSubmission()" %>
-  <%= "  #{l10n('broker_attestation.active_license', state_name: EnrollRegistry[:enroll_app].setting(:state_name).item)}" %>
+  <label for="<%= :active_license_attestation %>" class="mt-0 ml-1 font-weight-normal text-body">
+    <%= "#{l10n('broker_attestation.active_license', state_name: EnrollRegistry[:enroll_app].setting(:state_name).item)}" %>
+  </label>
 </div>
 
-<div class="form-group mb-3">
+<div class="form-group mt-0 d-flex align-items-center">
   <%= check_box_tag :marketplace_broker_agreement, nil, false, class: "broker-attestation-field", onChange: "allowBrokerAgencyFormSubmission()" %>
-  <%= sanitize_html(l10n("broker_attestation.broker_agreement", agreement_pdf_url: '/ohim_broker_agreement.pdf', site_short_name: EnrollRegistry[:enroll_app].setting(:short_name).item)) %>
+  <label for="<%= :marketplace_broker_agreement %>" class="mt-0 ml-1 font-weight-normal text-body">
+    <%= h(l10n("broker_attestation.broker_agreement", agreement_pdf_url: '/ohim_broker_agreement.pdf', site_short_name: EnrollRegistry[:enroll_app].setting(:short_name).item)) %>
+  </label>
 </div>
 
 <script>
@@ -25,4 +31,4 @@
       form_button.disabled = true;
     };
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_personal_information.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_personal_information.html.erb
index 71473b29925..7ee854f82ad 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_personal_information.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_personal_information.html.erb
@@ -28,8 +28,8 @@
   </div>
 
   <div class="col-md-3 mb-3">
-    <label for="inputDOB"  class="required"><%= l10n('broker_agencies.dob') %></label>
-    <%= f.date_field :dob, placeholder: l10n('dob_format'), min: 110.years.ago, max: 16.years.ago.beginning_of_month, required: true, onblur: 'validDob(this)' %>
+    <%= f.label :dob, l10n("broker_agencies.dob"), class: "required" %>
+    <%= f.date_field :dob, placeholder: l10n('dob_format'), min: 110.years.ago, max: 16.years.ago, required: true, onblur: 'validDob(this)' %>
     <div class="invalid-feedback">
       <%= l10n("invalid_dob") %>
     </div>
@@ -37,14 +37,14 @@
 
   <div class="col-md-3 mb-3">
     <label for="inputNPN"  class="required"><%= l10n('npn') %></label>
-    <%= f.text_field :npn, 
+    <%= f.text_field :npn,
       placeholder: l10n('npn_placeholder'),
-      required: %w[new create].include?(controller.action_name) ? 'true' : !EnrollRegistry.feature_enabled?(:allow_alphanumeric_npn), 
-      id: 'inputNPN', 
-      class: 'form-control', 
+      required: %w[new create].include?(controller.action_name) ? 'true' : !EnrollRegistry.feature_enabled?(:allow_alphanumeric_npn),
+      id: 'inputNPN',
+      class: 'form-control',
       maxlength: '10',
       onkeypress: EnrollRegistry.feature_enabled?(:allow_alphanumeric_npn) ? 'return isAlphaNumeric(event);' : 'return isNumberKey(event);',
-      disabled: npn_disabled 
+      disabled: npn_disabled
     %>
     <div class="invalid-feedback">
       <%= l10n('npn_error') %>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_profile_information.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_profile_information.html.erb
index d12fbf8a17c..4cda11ddf49 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_profile_information.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_profile_information.html.erb
@@ -1,6 +1,6 @@
 <div class="row mb-3">
   <div class="col-md-6">
-    <label class="required" for="inputPracticeArea"><%= l10n("market_kind") %></label>
+    <%= f.label :market_kind, l10n("market_kind"), class: "required" %>
     <%= f.select(:market_kind, options_for_select(BenefitSponsors::Organizations::BrokerAgencyProfile::MARKET_KINDS_OPTIONS.inject([]) { |options, (k, v)| options << [k, v] }, selected: f.object.try(:market_kind)), { prompt: "Select Market Kind" }, { class: 'form-control', required: true }) %>
     <div class="invalid-feedback">
       <%= l10n("market_kind_error") %>
@@ -29,4 +29,4 @@
       <%= l10n("default_select_error") %>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_select_language.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_select_language.html.erb
index 74d80fef068..db43b277345 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_select_language.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_select_language.html.erb
@@ -2,19 +2,26 @@
 
 <div class='row'>
   <div class="col-md-12 mb-2">
-    <div class='d-flex align-items-center justify-content-start'>
-      <label for="inputPracticeArea" class='mb-0 mr-1 required'><%= l10n('languages') %></label>
-      <span class="weight-n secondary-text"><%= "(#{l10n('select_all_that_apply')})" %></span>
-    </div>
-    <% display_languages.each do |language_group| %>
-      <div class='row my-3'>
-        <% language_group.each do |language| %>
-          <div class="col-md-2 d-flex align-items-center">
-            <% code = language[1] %>
-            <%= f.check_box :languages_spoken, { multiple: true, checked: agency_languages.include?(code) }, code, nil %> <p class='ml-1 mb-0'><%= language[0] %></p>
-          </div>
-        <% end %>
-      </div>
-    <% end %>
+    <fieldset class="d-block">
+      <legend class='d-flex align-items-center justify-content-start'>
+        <p class='mb-0 mr-1 required label'><%= l10n('languages') %></p>
+        <span class="weight-n secondary-text"><%= "(#{l10n('select_all_that_apply')})" %></span>
+      </legend>
+
+      <% display_languages.each do |language_group| %>
+        <div class='row my-3'>
+          <% language_group.each do |language| %>
+            <div class="col-md-2 d-flex align-items-center">
+              <% code = language[1] %>
+              <%= f.check_box :languages_spoken,
+                { multiple: true, checked: agency_languages.include?(code), id: "language_#{code}" },
+                code, nil
+              %>
+              <label class='ml-1 mb-0 mt-0 font-weight-normal' for="language_<%= code %>"><%= language[0] %></label>
+            </div>
+          <% end %>
+        </div>
+      <% end %>
+    </fieldset>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/_staff_registration.html.erb b/app/views/ui-components/bs4/v1/forms/broker/_staff_registration.html.erb
index ca190fc00e0..9397e687a78 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/_staff_registration.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/_staff_registration.html.erb
@@ -2,29 +2,29 @@
 <legend class='beta bold mb-3'><%= l10n("personal_information") %></legend>
 <div class="row mb-4">
   <div class="col-md-3 mb-2">
-    <label for="inputFirstname" class='required'><%= l10n('first_name') %></label>
-    <%= f.text_field :first_name, placeholder: l10n('first_name'), required: 'true', id: 'inputFirstname', class: 'form-control' %>
+    <%= f.label :first_name, l10n("first_name"), class: "required" %>
+    <%= f.text_field :first_name, placeholder: l10n('first_name'), required: 'true', class: 'form-control' %>
     <div class="invalid-feedback">
       <%= l10n("invalid_first_name") %>
     </div>
   </div>
   <div class="col-md-3 mb-2">
-    <label for="inputLastname" class='required'><%= l10n('last_name') %></label>
-    <%= f.text_field :last_name, placeholder: l10n('last_name'), required: 'true', id: 'inputLastname', class: 'form-control' %>
+    <%= f.label :last_name, l10n("last_name"), class: "required" %>
+    <%= f.text_field :last_name, placeholder: l10n('last_name'), required: 'true', class: 'form-control' %>
     <div class="invalid-feedback">
       <%= l10n("invalid_last_name") %>
     </div>
   </div>
   <div class="col-md-3 mb-2">
-    <label for="inputEmail" class='required'><%= l10n('email_address') %></label>
-    <%= f.email_field :email, placeholder: l10n('placeholder_email'), required: 'true', id: 'inputEmail', class: 'form-control' %>
+    <%= f.label :email, l10n("email_address"), class: "required" %>
+    <%= f.email_field :email, placeholder: l10n('placeholder_email'), required: 'true', class: 'form-control' %>
     <div class="invalid-feedback">
       <%= l10n("invalid_email") %>
     </div>
   </div>
   <div class="col-md-3 mb-2">
-    <label for="inputDOB" class='required'><%= l10n('broker_agencies.dob') %></label>
-    <%= f.date_field :dob, placeholder: l10n('dob_format'), min: 110.years.ago, max: 18.years.ago.end_of_month, required: true, class: 'form-control', onblur: 'validDob(this)' %>
+    <%= f.label :dob, l10n("broker_agencies.dob"), class: "required" %>
+    <%= f.date_field :dob, placeholder: l10n('dob_format'), min: 110.years.ago, max: 16.years.ago, required: true, class: 'form-control', onblur: 'validDob(this)' %>
     <div class="invalid-feedback">
       <%= l10n("invalid_dob") %>
     </div>
@@ -48,4 +48,4 @@
       element.value = '';
     }
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_address.html.erb b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_address.html.erb
index 2885334389a..1a521ceb9da 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_address.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_address.html.erb
@@ -1,51 +1,51 @@
 <div class="pull-right d-flex align-items-center justify-content-between mb-2">
-  <h3 class="ol_title"> <%= is_primary ? l10n('address.agency.primary_office_location') : l10n('address.agency.office_location') %></h3>
+  <h2 class="ol_title"> <%= is_primary ? l10n('address.agency.primary_office_location') : l10n('address.agency.office_location') %></h2>
   <a class="remove_fields close-2 <%= is_primary ? 'hidden' : ''%>" data-action="click->office-locations#removeLocation"><i class="far fa-trash-alt fa-2x role-trashcan"></i></a>
 </div>
 <div id="address_info">
   <div class="row mb-2">
     <div class="col-md-6 col-sm-6 col-xs-12">
-      <label for="inputAddress1" class='required'><%= l10n('address_1') %></label>
-      <%= f.text_field :address_1, class: "form-control mb-1", placeholder: l10n('address_1_placeholder'), required: true, id: 'inputAddress1' %>
+      <%= f.label :address_1, l10n("address_1"), class: "required" %>
+      <%= f.text_field :address_1, class: "form-control mb-1", placeholder: l10n('address_1_placeholder'), required: true %>
       <div class="invalid-feedback">
         <%= l10n('address.address_1_error') %>
       </div>
     </div>
     <div class="col-md-6 col-sm-6 col-xs-12">
-      <label for="inputAddress2"><%= l10n('address_2') %></label>
+      <%= f.label :address_2, l10n("address_2") %>
       <%= f.text_field :address_2, class: "form-control mb-1", placeholder: l10n('address_2') %>
     </div>
   </div>
 
   <div class="row mb-2" data-controller="zip-check">
     <div class="col-md-3 col-sm-12 col-xs-12">
-      <label for="inputCity" class='required'><%= l10n("city") %></label>
+      <%= f.label :city, l10n("city"), class: "required" %>
       <%= f.text_field :city, class: "form-control mb-1", required: true, placeholder: l10n("city") %>
       <div class="invalid-feedback">
         <%= l10n('address.city_error') %>
       </div>
     </div>
     <div class="col-md-3 col-sm-12 col-xs-12">
-      <label for="inputState" class='required'><%= l10n('state') %></label>
-      <%= f.select :state, options_for_select(State::NAME_IDS.map(&:last).sort_by { |c| c }, selected: f.object.try(:state)), { include_blank: l10n("select_state") }, class: 'form-control mb-1', id: 'inputState', required: true %>
+      <%= f.label :state, l10n("state"), class: "required" %>
+      <%= f.select :state, options_for_select(State::NAME_IDS.map(&:last).sort_by { |c| c }, selected: f.object.try(:state)), { include_blank: l10n("select_state") }, class: 'form-control mb-1', required: true %>
       <div class="invalid-feedback">
         <%= l10n('address.state_error') %>
       </div>
     </div>
     <div class="col-md-3 col-sm-12 col-xs-12">
-      <label for="inputZip" class='required'><%= l10n('zip_code') %></label>
-      <%= f.text_field :zip, id: 'inputZip', class: 'form-control mb-1', minlength: '5', maxlength: '5', required: true, placeholder: '00000' %>
+      <%= f.label :zip, l10n("zip_code"), class: "required" %>
+      <%= f.text_field :zip, class: 'form-control mb-1', minlength: '5', maxlength: '5', required: true, placeholder: '00000' %>
       <div class="invalid-feedback">
         <%= l10n('address.zip_code_error') %>
       </div>
     </div>
     <div class="col-md-3 col-sm-6 col-xs-12">
-      <label for="inputKind" class='required'><%= l10n('address_kind') %></label>
+      <%= f.label :kind, l10n("address_kind"), class: "required" %>
       <% kinds = f.object.office_kind_options; kinds = kinds.rotate if params[:child_index] %>
-      <%= f.select :kind, options_for_select(kinds.map { |a| [a.to_s.humanize, a.to_s] }, selected: f.object.try(:kind)), { prompt: l10n("address.address_kind_select") }, class: "form-control", required: true, id: 'kindSelect' %>
+      <%= f.select :kind, options_for_select(kinds.map { |a| [a.to_s.humanize, a.to_s] }, selected: f.object.try(:kind)), { prompt: l10n("address.address_kind_select") }, class: "form-control", required: true %>
       <div class="invalid-feedback">
         <%= l10n('address.address_kind_error') %>
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_contact_info_fields.html.erb b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_contact_info_fields.html.erb
index 2262505d3cd..8d945f6e0b3 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_contact_info_fields.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_contact_info_fields.html.erb
@@ -15,11 +15,11 @@
     <% end %>
   </div>
 
-  <a class="btn btn-default btn-secondary mb-4" type="button" data-action="click->office-locations#addLocation"><%= l10n("add_office_location") %></a>
+  <a class="btn btn-default btn-secondary mb-4" tabindex="0" type="button" data-action="click->office-locations#addLocation"><%= l10n("add_office_location") %></a>
 </div>
 
 <script>
   $(document).ready(function() {
     $.inputMasks();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_phone.html.erb b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_phone.html.erb
index 20dda8c04d8..575c92dfb41 100644
--- a/app/views/ui-components/bs4/v1/forms/broker/contact_information/_phone.html.erb
+++ b/app/views/ui-components/bs4/v1/forms/broker/contact_information/_phone.html.erb
@@ -1,12 +1,12 @@
 <div class="row">
   <%= f.hidden_field :kind, value: 'work', id: "phoneType" %>
   <div class="col-md-3 mb-3">
-    <label for="inputNumber" class='required'><%= l10n('phone_number') %></label>
-    <%= f.text_field :full_number_without_extension, 
+    <%= f.label :full_number_without_extension, l10n("phone_number"), class: "required" %>
+    <%= f.text_field :full_number_without_extension,
       placeholder: "(000) 000-0000",
-      required: true, id: 'inputNumber', 
+      required: true,
       class: 'form-control phone_number',
-      minlength: '10', maxlength: '10', 
+      minlength: '10', maxlength: '10',
       onkeypress: 'return isNumberKey(event)',
       value: determine_phone_number(f.object)
     %>
@@ -26,4 +26,4 @@
   $(document).ready( function() {
     $.inputMasks();
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/broker_agencies/broker_agency_staff_roles/_new_staff_applicant.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/broker_agencies/broker_agency_staff_roles/_new_staff_applicant.html.erb
index 29bd91feba1..78948f90ba0 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/broker_agencies/broker_agency_staff_roles/_new_staff_applicant.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/broker_agencies/broker_agency_staff_roles/_new_staff_applicant.html.erb
@@ -18,7 +18,8 @@
       <div class="col-md-9 col-sm-9 col-xs-12 broker-agency-search">
         <div class="row search-dropdown-wrapper">
           <div class="col-md-12 col-sm-12 col-xs-12 px-0">
-            <label class='pl-3'><%= l10n("broker_agencies.broker_roles.search_broker_agencies") %></label>
+
+<%= f.label :agency_search, l10n("broker_agencies.broker_roles.search_broker_agencies"), class: 'pl-3' %>
             <div class="col-md-12 col-sm-10 col-xs-12 input-group d-flex align-items-center justify-content-start">
               <%= f.hidden_field :profile_id %>
               <%= f.hidden_field :profile_type, value: "broker_agency_staff" %>
@@ -79,4 +80,4 @@
     element.closest(".select-broker").classList.add('agency-selected');
     document.getElementById('broker-staff-btn').disabled = false;
   }
-</script>
\ No newline at end of file
+</script>
diff --git a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/new.html.erb b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/new.html.erb
index db71af41c3d..2d495ba16a1 100644
--- a/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/new.html.erb
+++ b/components/benefit_sponsors/app/views/benefit_sponsors/profiles/registrations/new.html.erb
@@ -3,10 +3,10 @@
     <div id="broker_agency_form" class="bs4-active">
       <ul class="broker-registration-tabs list-inline list-unstyled">
         <li class="d-inline-block mx-0">
-          <a class='weight-n default-text text-decoration-none' href="#broker_agency_staff"><%= l10n("broker_agency_staff") %></a>
+          <a class='weight-n default-text text-decoration-none' href="#broker_agency_staff" tabindex="0"><%= l10n("broker_agency_staff") %></a>
         </li>
         <li class="d-inline-block mx-0 ui-tabs-active ui-state-active">
-          <a class='weight-n default-text text-decoration-none' href="#broker_registration"><%= l10n("broker") %> <%= l10n("broker_agency") %></a>
+          <a class='weight-n default-text text-decoration-none' href="#broker_registration" tabindex="0"><%= l10n("broker") %> <%= l10n("broker_agency") %></a>
         </li>
       </ul>
       <div id="broker_agency_staff" class="tab-content tab-container mt-0"></div>