diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html b/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html
index 4f0221e4..b783a440 100644
--- a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html
+++ b/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_body.html
@@ -314,14 +314,13 @@ <h5 id="entity_header_{{ent_no}}_{{r.reg_id}}">Entity {{ ent_no }}</h5>
                         <label for="license_number_{{ent_no}}_{{r.reg_id}}"> License Number </label>
 
                         <input
-                        type="number"
+                        type="text"
                         name="license_number_{{ent_no}}_{{r.reg_id}}"
                         placeholder="1234567890"
                         class="integerfield"
                         id="license_number_{{ent_no}}_{{r.reg_id}}"
                         inputmode="numeric"
-                        min="0"
-                        max="2147483648"
+                        pattern="^(?!0+$)[0-9]{1,10}$"
                         {% if entity.license %} value="{{ entity.license }}" {% endif %}
                         />
 
@@ -335,14 +334,13 @@ <h5 id="entity_header_{{ent_no}}_{{r.reg_id}}">Entity {{ ent_no }}</h5>
                         <label for="naic_company_code_{{ent_no}}_{{r.reg_id}}"> NAIC<sup>3</sup> Company Code </label>
 
                         <input
-                        type="number"
+                        type="text"
                         name="naic_company_code_{{ent_no}}_{{r.reg_id}}"
                         placeholder="12345"
                         class="integerfield"
                         id="naic_company_code_{{ent_no}}_{{r.reg_id}}"
                         inputmode="numeric"
-                        min="0"
-                        max="2147483648"
+                        pattern="^(?!0+$)[0-9]{1,10}$"
                         {% if entity.naic %} value="{{ entity.naic }}" {% endif %}
                         />
 
@@ -370,7 +368,13 @@ <h6>Type of Plan</h6>
                                     name="types_of_plans_{{ plan_type|lower }}_{{ent_no}}_{{r.reg_id}}"
                                     id="types_of_plans_{{ plan_type|lower }}_{{ent_no}}_{{r.reg_id}}"
                                     {% if plan_type_selected %}checked{% endif %}
-                                    />{{ plan_type }}</label
+                                    /><span>
+                                        {{ plan_type }}
+                                        {% if plan_type == 'Medicaid' %}
+                                            <small>(for state use only)</small>
+                                        {% endif %}
+                                    </span>
+                                </label
                                 >
                             </li>
                         {% endfor %}                
@@ -565,7 +569,7 @@ <h4>
                     class="integerfield"
                     id="license_number_1"
                     inputmode="numeric"
-                    pattern="^[1-9]+[0-9]*$"
+                    pattern="^(?!0+$)[0-9]{1,10}$"
                     required
                 />
 
@@ -585,7 +589,7 @@ <h4>
                     class="integerfield"
                     id="naic_company_code_1"
                     inputmode="numeric"
-                    pattern="^[1-9]+[0-9]*$"
+                    pattern="^(?!0+$)[0-9]{1,10}$"
                     required
                 />
 
@@ -632,7 +636,11 @@ <h6>Type of Plan</h6>
                             name="types_of_plans_medicaid_1"
                             id="types_of_plans_medicaid_1"
                             required
-                            />Medicaid</label
+                            />
+                            <span>Medicaid 
+                                <small>(for state use only)</small>
+                            </span>
+                        </label
                         >
                     </li>
                 </ul>
diff --git a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html b/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
index 4c6edc17..533c2268 100644
--- a/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
+++ b/apcd-cms/src/apps/registrations/templates/submission_form/registration_form_scripts.html
@@ -160,7 +160,7 @@
               class="integerfield"
               id="license_number_${entities}${reg_id_substr}"
               inputmode="numeric"
-              pattern="^[1-9]+[0-9]*$"
+              pattern="^(?!0+$)[0-9]{1,10}$"
               required
             />
             <div id="help-text-license_number_${entities}" class="help-text">
@@ -177,7 +177,7 @@
               class="integerfield"
               id="naic_company_code_${entities}${reg_id_substr}"
               inputmode="numeric"
-              pattern="^[1-9]+[0-9]*$"
+              pattern="^(?!0+$)[0-9]{1,10}$"
               required
             />
             <div id="help-text-naic_company_code_${entities}" class="help-text">
@@ -223,8 +223,11 @@ <h6>Type of Plan</h6>
                         name="types_of_plans_medicaid_${entities}${reg_id_substr}"
                         id="types_of_plans_medicaid_${entities}${reg_id_substr}"
                         required
-                        />Medicaid</label
-                    >
+                        >
+                        <span>Medicaid 
+                          <small>(for state use only)</small>
+                        </span>
+                    </label>
                 </li>
             </ul>
         </div>
diff --git a/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html b/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
index 1621c62d..04bd3595 100644
--- a/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
+++ b/apcd-cms/src/apps/submitter_renewals_listing/templates/list_submitter_registrations.html
@@ -33,7 +33,7 @@ <h1>Registration Information</h1>
       {% endif %}
     </div>
   </div>
-  <table id="submittersTable" class="submitters-table">
+  <table id="submittersTable" class="registration-table submitters-table">
       <thead>
           <tr>
               {% for k in header %}
diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py
index 11294251..2d06a7ff 100644
--- a/apcd-cms/src/apps/utils/apcd_database.py
+++ b/apcd-cms/src/apps/utils/apcd_database.py
@@ -352,8 +352,8 @@ def create_registration_entity(form, reg_id, iteration, from_update_reg=None, ol
             reg_id,
             float(form['total_claims_value_{}'.format(str_end)]),
             _set_int(form['claims_encounters_volume_{}'.format(str_end)]),
-            _set_int(form['license_number_{}'.format(str_end)]),
-            _set_int(form['naic_company_code_{}'.format(str_end)]),
+            form['license_number_{}'.format(str_end)],
+            form['naic_company_code_{}'.format(str_end)],
             _set_int(form['total_covered_lives_{}'.format(str_end)]),
             _clean_value(form['entity_name_{}'.format(str_end)]),
             _clean_value(form['fein_{}'.format(str_end)]),
@@ -424,8 +424,8 @@ def update_registration_entity(form, reg_id, iteration, no_entities):
         values = (
             float(form['total_claims_value_{}'.format(str_end)]),
             _set_int(form['claims_encounters_volume_{}'.format(str_end)]),
-            _set_int(form['license_number_{}'.format(str_end)]),
-            _set_int(form['naic_company_code_{}'.format(str_end)]),
+            form['license_number_{}'.format(str_end)],
+            form['naic_company_code_{}'.format(str_end)],
             _set_int(form['total_covered_lives_{}'.format(str_end)]),
             _clean_value(form['entity_name_{}'.format(str_end)]),
             _clean_value(form['fein_{}'.format(str_end)]),