From b3d7edb2d16d242d298714f58d89a0148c4cc05b Mon Sep 17 00:00:00 2001
From: Christopher Hui <christopher@truss.works>
Date: Tue, 24 Sep 2019 14:55:43 -0700
Subject: [PATCH] remove old i18n

---
 src/components/Form/Accordion/Accordion.jsx   |   2 +-
 src/components/Form/Branch/Branch.jsx         |   2 +-
 src/components/Form/Comments/Comments.jsx     |   2 +-
 src/components/Form/Consent/Consent.jsx       |   4 +-
 src/components/Form/Country/Country.jsx       |   6 +-
 .../Form/Country}/countries.js                |   4 +-
 src/components/Form/Currency/Currency.jsx     |   2 +-
 .../Form/DateControl/DateControl.jsx          |   1 -
 src/components/Form/EyeColor/EyeColor.jsx     |   2 +-
 src/components/Form/Field/Field.jsx           |  15 +-
 .../ForeignBornDocuments.jsx                  |   2 +-
 src/components/Form/HairColor/HairColor.jsx   |   2 +-
 src/components/Form/Height/Height.jsx         |   2 +-
 .../Form/Introduction/Introduction.jsx        |   2 +-
 .../__snapshots__/Introduction.test.jsx.snap  | 240 +-----
 src/components/Form/Location/Address.jsx      |   2 +-
 .../Form/Location/AlternateAddress.jsx        |   2 +-
 src/components/Form/Location/Location.jsx     |   3 +-
 .../Form/Location/ToggleableLocation.jsx      |   3 +-
 src/components/Form/Name/Name.jsx             |   2 +-
 src/components/Form/Name/Name.test.jsx        |   2 +-
 .../Form/NotApplicable/NotApplicable.jsx      |   2 +-
 src/components/Form/SSN/SSN.jsx               |   2 +-
 src/components/Form/Sex/Sex.jsx               |   2 +-
 src/components/Form/Spinner/Spinner.jsx       |   2 +-
 src/components/Form/Street/Street.jsx         |   2 +-
 src/components/Form/Telephone/Telephone.jsx   |   2 +-
 .../Form/TimeoutWarning/TimeoutWarning.jsx    |   2 +-
 src/components/Form/Weight/Weight.jsx         |   2 +-
 src/components/KickbackBanner/index.jsx       |   2 +-
 .../Main/__snapshots__/App.test.jsx.snap      | 774 +++---------------
 src/components/Navigation/Logout.jsx          |   3 +-
 .../SavedIndicator/SavedIndicator.test.jsx    |   2 +-
 .../SavedIndicator/persistence-helpers.js     |   2 +-
 .../Section/Citizenship/Citizenship.jsx       |   2 +-
 .../Citizenship/Multiple/CitizenshipItem.jsx  |   2 +-
 .../Section/Citizenship/Multiple/Multiple.jsx |   2 +-
 .../Citizenship/Multiple/Passports.jsx        |   2 +-
 .../Citizenship/Multiple/TravelItem.jsx       |   2 +-
 .../Section/Citizenship/Status/Status.jsx     |   2 +-
 .../Section/Citizenship/UsPassport/index.jsx  |   2 +-
 .../Financial/Bankruptcy/Bankruptcies.jsx     |   2 +-
 .../Financial/Bankruptcy/Bankruptcy.jsx       |   2 +-
 .../Section/Financial/Card/Card.jsx           |   2 +-
 .../Section/Financial/Card/CardItem.jsx       |   2 +-
 .../Section/Financial/Credit/Credit.jsx       |   2 +-
 .../Section/Financial/Credit/CreditItem.jsx   |   2 +-
 .../Section/Financial/Financial.jsx           |   2 +-
 .../Financial/Gambling/GamblingItem.jsx       |   2 +-
 .../Financial/Nonpayment/Infractions.jsx      |   2 +-
 .../Financial/Nonpayment/Nonpayment.jsx       |   2 +-
 .../Financial/Nonpayment/NonpaymentItem.jsx   |   2 +-
 .../Section/Financial/Taxes/FailureType.jsx   |   2 +-
 .../Section/Financial/Taxes/TaxesItem.jsx     |   2 +-
 .../Activities/BenefitActivity/Benefit.jsx    |   2 +-
 .../BenefitActivity/BenefitActivity.jsx       |   2 +-
 .../BenefitActivity/ContinuingBenefit.jsx     |   2 +-
 .../BenefitActivity/FutureBenefit.jsx         |   2 +-
 .../BenefitActivity/OneTimeBenefit.jsx        |   2 +-
 .../BenefitActivity/OtherBenefit.jsx          |   2 +-
 .../Section/Foreign/Activities/CoOwner.jsx    |   2 +-
 .../Section/Foreign/Activities/CoOwners.jsx   |   2 +-
 .../DirectActivity/DirectActivity.jsx         |   2 +-
 .../DirectActivity/DirectInterest.jsx         |   2 +-
 .../IndirectActivity/IndirectActivity.jsx     |   2 +-
 .../IndirectActivity/IndirectInterest.jsx     |   2 +-
 .../RealEstateActivity/RealEstateActivity.jsx |   2 +-
 .../RealEstateActivity/RealEstateInterest.jsx |   2 +-
 .../Section/Foreign/Activities/Support.jsx    |   2 +-
 .../Foreign/Activities/SupportItem.jsx        |   2 +-
 .../Section/Foreign/Business/Advice.jsx       |   2 +-
 .../Section/Foreign/Business/AdviceItem.jsx   |   2 +-
 .../Foreign/Business/ConferenceContacts.jsx   |   2 +-
 .../Section/Foreign/Business/Conferences.jsx  |   2 +-
 .../Foreign/Business/ConferencesItem.jsx      |   2 +-
 .../Section/Foreign/Business/Contact.jsx      |   2 +-
 .../Section/Foreign/Business/ContactItem.jsx  |   2 +-
 .../Section/Foreign/Business/Employment.jsx   |   2 +-
 .../Section/Foreign/Business/Family.jsx       |   2 +-
 .../Section/Foreign/Business/FamilyItem.jsx   |   2 +-
 .../Section/Foreign/Business/JobOffer.jsx     |   2 +-
 .../Section/Foreign/Business/Political.jsx    |   2 +-
 .../Foreign/Business/PoliticalItem.jsx        |   2 +-
 .../Section/Foreign/Business/Sponsorship.jsx  |   2 +-
 .../Foreign/Business/Sponsorship.test.jsx     |   2 +-
 .../Foreign/Business/SponsorshipItem.jsx      |   2 +-
 .../Foreign/Business/SubsequentContacts.jsx   |   2 +-
 .../Section/Foreign/Business/Ventures.jsx     |   2 +-
 .../Section/Foreign/Business/VenturesItem.jsx |   2 +-
 .../Section/Foreign/Business/Voting.jsx       |   2 +-
 .../Section/Foreign/Business/VotingItem.jsx   |   2 +-
 .../Section/Foreign/Contacts/Contacts.jsx     |   2 +-
 .../Foreign/Contacts/Contacts.test.jsx        |   2 +-
 .../Foreign/Contacts/ForeignNational.jsx      |   2 +-
 src/components/Section/Foreign/Foreign.jsx    |   2 +-
 .../Section/Foreign/Travel/Travel.jsx         |   2 +-
 .../Section/Foreign/Travel/TravelDays.jsx     |   2 +-
 .../Section/Foreign/Travel/TravelPurpose.jsx  |   2 +-
 .../Foreign/Travel/TravelQuestions.jsx        |   2 +-
 .../Section/History/Education/Diploma.jsx     |   2 +-
 .../History/Employment/AdditionalActivity.jsx |   2 +-
 .../History/Employment/EmploymentActivity.jsx |   2 +-
 .../History/Employment/EmploymentStatus.jsx   |   2 +-
 .../Employment/EmploymentSummaryProgress.jsx  |   2 +-
 .../History/Employment/PhysicalAddress.jsx    |   2 +-
 .../History/Employment/ReasonLeft.test.jsx    |   2 +-
 .../History/Employment/ReasonOptions.jsx      |   2 +-
 .../History/Employment/ReprimandItem.jsx      |   2 +-
 .../Section/History/Employment/Supervisor.jsx |   2 +-
 .../Section/History/Federal/FederalItem.jsx   |   2 +-
 .../Residence/ResidenceSummaryProgress.jsx    |   2 +-
 src/components/Section/History/Review.jsx     |   2 +-
 .../History/SummaryCounter/SummaryCounter.jsx |   2 +-
 src/components/Section/History/summaries.jsx  |   2 +-
 .../ApplicantBirthDate/ApplicantBirthDate.jsx |   6 +-
 .../ApplicantBirthPlace.jsx                   |   2 +-
 .../ApplicantName/ApplicantName.jsx           |   2 +-
 .../ApplicantSSN/ApplicantSSN.jsx             |   2 +-
 .../ContactInformation/ContactInformation.jsx |   2 +-
 .../Section/Identification/Identification.jsx |   2 +-
 .../OtherNames/OtherNameItem.jsx              |   2 +-
 .../Identification/OtherNames/OtherNames.jsx  |   2 +-
 .../Identification/Physical/Physical.jsx      |   2 +-
 .../Associations/ActivitiesToOverthrow.jsx    |   2 +-
 .../ActivitiesToOverthrowItem.jsx             |   2 +-
 .../Section/Legal/Associations/Advocating.jsx |   2 +-
 .../Legal/Associations/AdvocatingItem.jsx     |   2 +-
 .../Legal/Associations/EngagedInTerrorism.jsx |   2 +-
 .../Associations/EngagedInTerrorismItem.jsx   |   2 +-
 .../Associations/MembershipOverthrow.jsx      |   2 +-
 .../Associations/MembershipOverthrowItem.jsx  |   2 +-
 .../Legal/Associations/MembershipViolence.jsx |   2 +-
 .../Associations/MembershipViolenceItem.jsx   |   2 +-
 .../Associations/TerrorismAssociation.jsx     |   2 +-
 .../TerroristOrganizationItem.jsx             |   2 +-
 .../Legal/Investigations/ClearanceLevel.jsx   |   2 +-
 .../Legal/Investigations/DebarredItem.jsx     |   2 +-
 .../Section/Legal/Investigations/History.jsx  |   2 +-
 .../Investigations/InvestigatingAgency.jsx    |   2 +-
 .../Legal/Investigations/RevokedItem.jsx      |   2 +-
 src/components/Section/Legal/Legal.jsx        |   2 +-
 .../Section/Legal/NonCriminalCourtAction.jsx  |   2 +-
 .../Section/Legal/Police/DomesticViolence.jsx |   2 +-
 .../Legal/Police/DomesticViolenceList.jsx     |   2 +-
 src/components/Section/Legal/Police/Intro.jsx |   2 +-
 .../Section/Legal/Police/OtherOffense.jsx     |   2 +-
 .../Section/Legal/Police/OtherOffenses.jsx    |   2 +-
 .../Section/Legal/Technology/Manipulating.jsx |   2 +-
 .../Legal/Technology/ManipulatingItem.jsx     |   2 +-
 .../Section/Legal/Technology/Unauthorized.jsx |   2 +-
 .../Legal/Technology/UnauthorizedItem.jsx     |   2 +-
 .../Section/Legal/Technology/Unlawful.jsx     |   2 +-
 .../Section/Legal/Technology/UnlawfulItem.jsx |   2 +-
 .../Military/Disciplinary/Procedure.jsx       |   2 +-
 .../Section/Military/Foreign/Foreign.jsx      |   2 +-
 .../Military/Foreign/ForeignContact.jsx       |   2 +-
 .../Military/Foreign/ForeignService.jsx       |   2 +-
 .../Section/Military/History/History.jsx      |   2 +-
 .../Military/History/MilitaryService.jsx      |   2 +-
 src/components/Section/Military/Military.jsx  |   2 +-
 .../Section/Military/Selective/Selective.jsx  |   2 +-
 .../Section/Package/AdditionalComments.jsx    |   2 +-
 .../Section/Package/Attachments.jsx           |   3 +-
 src/components/Section/Package/Credit.jsx     |   2 +-
 src/components/Section/Package/General.jsx    |   2 +-
 src/components/Section/Package/Medical.jsx    |   2 +-
 src/components/Section/Package/Signature.jsx  |   2 +-
 src/components/Section/Package/Verify.jsx     |   2 +-
 .../Section/Psychological/AppealItem.jsx      |   2 +-
 .../Psychological/Diagnoses/Diagnosis.jsx     |   2 +-
 .../Section/Psychological/Order.jsx           |   2 +-
 .../Section/Psychological/Psychological.jsx   |   2 +-
 .../Section/Psychological/Treatment.jsx       |   2 +-
 .../RelationshipStatus/CivilUnion.jsx         |   2 +-
 .../RelationshipStatus/Divorce.jsx            |   2 +-
 .../RelationshipStatus/OtherName.jsx          |   2 +-
 .../Section/Relationships/Relatives/Alias.jsx |   2 +-
 .../Relationships/Relatives/Relative.jsx      |   2 +-
 .../SubstanceUse/Alcohol/NegativeImpact.jsx   |   2 +-
 .../SubstanceUse/Alcohol/NegativeImpacts.jsx  |   2 +-
 .../Alcohol/OrderedCounseling.jsx             |   2 +-
 .../Alcohol/ReceivedCounseling.jsx            |   2 +-
 .../Alcohol/ReceivedCounselings.jsx           |   2 +-
 .../Alcohol/VoluntaryCounseling.jsx           |   2 +-
 .../SubstanceUse/Drugs/DrugClearanceUse.jsx   |   2 +-
 .../SubstanceUse/Drugs/DrugClearanceUses.jsx  |   2 +-
 .../Drugs/DrugPublicSafetyUse.jsx             |   2 +-
 .../Section/SubstanceUse/Drugs/DrugType.jsx   |   2 +-
 .../SubstanceUse/Drugs/OrderedTreatment.jsx   |   2 +-
 .../SubstanceUse/Drugs/VoluntaryTreatment.jsx |   2 +-
 .../Section/SubstanceUse/SubstanceUse.jsx     |   2 +-
 .../__snapshots__/Section.test.jsx.snap       |  16 -
 src/components/Summary/DateSummary.js         |   2 +-
 src/config/__mocks__/index.js                 |   2 +-
 src/config/formSections/citizenship.js        |   2 +-
 src/config/formSections/financial.js          |   2 +-
 src/config/formSections/foreign.js            |   2 +-
 src/config/formSections/history.js            |   2 +-
 src/config/formSections/identification.js     |   2 +-
 src/config/formSections/legal.js              |   2 +-
 src/config/formSections/military.js           |   2 +-
 src/config/formSections/psychological.js      |   2 +-
 src/config/formSections/relationships.js      |   2 +-
 src/config/formSections/substanceUse.js       |   2 +-
 src/config/index.js                           |   3 -
 src/config/locales/en/error.js                |  22 +
 src/config/locales/en/index.js                |   4 +-
 src/config/locales/en/name.js                 |   2 +-
 src/config/locales/index.js                   |   2 -
 src/views/AccessDenied/AccessDenied.jsx       |   2 +-
 src/views/AccessDenied/AccessDenied.test.jsx  |   2 +-
 src/views/Error/Error.jsx                     |   2 +-
 src/views/Error/Error.test.jsx                |   2 +-
 src/views/Locked/Locked.jsx                   |   2 +-
 src/views/Locked/Locked.test.jsx              |   2 +-
 215 files changed, 408 insertions(+), 1097 deletions(-)
 rename src/{config/locales/en => components/Form/Country}/countries.js (99%)
 delete mode 100644 src/config/locales/index.js

diff --git a/src/components/Form/Accordion/Accordion.jsx b/src/components/Form/Accordion/Accordion.jsx
index 060c01bc2..488254c7b 100644
--- a/src/components/Form/Accordion/Accordion.jsx
+++ b/src/components/Form/Accordion/Accordion.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import ValidationElement from 'components/Form/ValidationElement'
 import Branch from 'components/Form/Branch'
 import Show from 'components/Form/Show'
diff --git a/src/components/Form/Branch/Branch.jsx b/src/components/Form/Branch/Branch.jsx
index 593a6cb9c..624b29fb9 100644
--- a/src/components/Form/Branch/Branch.jsx
+++ b/src/components/Form/Branch/Branch.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Field from 'components/Form/Field'
 import Radio from 'components/Form/Radio'
 import RadioGroup from 'components/Form/RadioGroup'
diff --git a/src/components/Form/Comments/Comments.jsx b/src/components/Form/Comments/Comments.jsx
index 5931305b3..4f9b01dce 100644
--- a/src/components/Form/Comments/Comments.jsx
+++ b/src/components/Form/Comments/Comments.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Textarea from '../Textarea'
 import ValidationElement from '../ValidationElement'
 
diff --git a/src/components/Form/Consent/Consent.jsx b/src/components/Form/Consent/Consent.jsx
index 04e946d51..8563585f5 100644
--- a/src/components/Form/Consent/Consent.jsx
+++ b/src/components/Form/Consent/Consent.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { updateApplication } from 'actions/ApplicationActions'
 import Modal from 'components/Form/Modal'
 
@@ -31,7 +31,7 @@ export class Consent extends React.Component {
           show={this.props.settings.consented !== 'Yes'}
           className="consent-content">
           <div>
-            <div className="consent-legal">{i18n.m2('consent.contents')}</div>
+            <div className="consent-legal">{i18n.m('consent.contents')}</div>
             <button
               name="consent"
               className="consent-acceptance"
diff --git a/src/components/Form/Country/Country.jsx b/src/components/Form/Country/Country.jsx
index 8ac86d0df..b3f831353 100644
--- a/src/components/Form/Country/Country.jsx
+++ b/src/components/Form/Country/Country.jsx
@@ -1,9 +1,10 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Show from '../Show'
 import Dropdown from '../Dropdown'
 import MultipleDropdown from '../MultipleDropdown'
+import countries from './countries'
 
 export default class Country extends ValidationElement {
   constructor(props) {
@@ -13,8 +14,7 @@ export default class Country extends ValidationElement {
       showComents: props.showComments
     }
 
-    this.countries = i18n.value('countries')
-
+    this.countries = countries
     this.update = this.update.bind(this)
     this.updateSingleCountry = this.updateSingleCountry.bind(this)
     this.updateMultipleCountries = this.updateMultipleCountries.bind(this)
diff --git a/src/config/locales/en/countries.js b/src/components/Form/Country/countries.js
similarity index 99%
rename from src/config/locales/en/countries.js
rename to src/components/Form/Country/countries.js
index 8141f40f2..c6ca72166 100644
--- a/src/config/locales/en/countries.js
+++ b/src/components/Form/Country/countries.js
@@ -1,4 +1,4 @@
-export const countries = {
+const countries = {
   unitedStates: { value: 'United States', text: 'USA' },
   afghanistan: { value: 'Afghanistan', text: 'Afghanistan' },
   akrotiriSovereignBaseArea: {
@@ -331,3 +331,5 @@ export const countries = {
   zambia: { value: 'Zambia', text: 'Zambia' },
   zimbabwe: { value: 'Zimbabwe', text: 'Zimbabwe' }
 }
+
+export default countries
diff --git a/src/components/Form/Currency/Currency.jsx b/src/components/Form/Currency/Currency.jsx
index 101dc9583..47f325425 100644
--- a/src/components/Form/Currency/Currency.jsx
+++ b/src/components/Form/Currency/Currency.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Number from '../Number'
 
 /**
diff --git a/src/components/Form/DateControl/DateControl.jsx b/src/components/Form/DateControl/DateControl.jsx
index a9b36b7cb..db094b453 100644
--- a/src/components/Form/DateControl/DateControl.jsx
+++ b/src/components/Form/DateControl/DateControl.jsx
@@ -1,6 +1,5 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from '../../../config'
 import ValidationElement from '../ValidationElement'
 import Number from '../Number'
 import Checkbox from '../Checkbox'
diff --git a/src/components/Form/EyeColor/EyeColor.jsx b/src/components/Form/EyeColor/EyeColor.jsx
index 366812bcd..a3e8df3ea 100644
--- a/src/components/Form/EyeColor/EyeColor.jsx
+++ b/src/components/Form/EyeColor/EyeColor.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Svg from '../Svg'
 import Radio from '../Radio'
diff --git a/src/components/Form/Field/Field.jsx b/src/components/Form/Field/Field.jsx
index 999340621..da63f9615 100644
--- a/src/components/Form/Field/Field.jsx
+++ b/src/components/Form/Field/Field.jsx
@@ -5,7 +5,7 @@
 import React from 'react'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import { i18n } from 'config/locales/i18n'
 
 import ValidationElement, { newGuid } from 'components/Form/ValidationElement'
 import Svg from 'components/Form/Svg'
@@ -19,8 +19,6 @@ const renderMessage = (id, messageString, titleString) => {
     && note.indexOf(noteId) > -1
   ) {
     note = ''
-  } else {
-    note = <em>{note}</em>
   }
 
   const messageId = `${id}.message`
@@ -30,8 +28,6 @@ const renderMessage = (id, messageString, titleString) => {
     && message.indexOf(messageId) > -1
   ) {
     message = ''
-  } else {
-    message = <span>{message}</span>
   }
 
   const title = titleString || i18n.t(`${id}.title`)
@@ -39,8 +35,12 @@ const renderMessage = (id, messageString, titleString) => {
   return (
     <div key={newGuid()} data-i18n={id}>
       <h5 className="usa-alert-heading">{title}</h5>
-      {message}
-      {note}
+      {message && (
+        <span>{message}</span>
+      )}
+      {note && (
+        <em>{note}</em>
+      )}
     </div>
   )
 }
@@ -325,7 +325,6 @@ export default class Field extends ValidationElement {
 
   helpMessage() {
     const { help, helpMessage, helpTitle } = this.props
-
     if (this.state.helpActive && help) {
       return (
         <div className="usa-alert usa-alert-info" role="alert">
diff --git a/src/components/Form/ForeignBornDocuments/ForeignBornDocuments.jsx b/src/components/Form/ForeignBornDocuments/ForeignBornDocuments.jsx
index 6c9b08740..2f3295bc4 100644
--- a/src/components/Form/ForeignBornDocuments/ForeignBornDocuments.jsx
+++ b/src/components/Form/ForeignBornDocuments/ForeignBornDocuments.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import ValidationElement from '../ValidationElement'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { alphaNumericRegEx } from '../../../validators/helpers'
 import RadioGroup from '../RadioGroup'
 import Radio from '../Radio'
diff --git a/src/components/Form/HairColor/HairColor.jsx b/src/components/Form/HairColor/HairColor.jsx
index 84b85cccb..20351920c 100644
--- a/src/components/Form/HairColor/HairColor.jsx
+++ b/src/components/Form/HairColor/HairColor.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Svg from '../Svg'
 import Radio from '../Radio'
diff --git a/src/components/Form/Height/Height.jsx b/src/components/Form/Height/Height.jsx
index 024b2ad38..2227c9100 100644
--- a/src/components/Form/Height/Height.jsx
+++ b/src/components/Form/Height/Height.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Number from '../Number'
 
diff --git a/src/components/Form/Introduction/Introduction.jsx b/src/components/Form/Introduction/Introduction.jsx
index dec32fb22..3a03a990c 100644
--- a/src/components/Form/Introduction/Introduction.jsx
+++ b/src/components/Form/Introduction/Introduction.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { connect } from 'react-redux'
 import * as formTypes from 'constants/formTypes'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { updateApplication } from '../../../actions/ApplicationActions'
 import { logout } from '../../../actions/AuthActions'
 import Branch from '../Branch'
diff --git a/src/components/Form/Introduction/__snapshots__/Introduction.test.jsx.snap b/src/components/Form/Introduction/__snapshots__/Introduction.test.jsx.snap
index 5df710ed9..df9359d3b 100644
--- a/src/components/Form/Introduction/__snapshots__/Introduction.test.jsx.snap
+++ b/src/components/Form/Introduction/__snapshots__/Introduction.test.jsx.snap
@@ -38,74 +38,52 @@ exports[`The Introduction component renders properly 1`] = `
               <h2>
                 Questionnaire for National Security Positions
               </h2>
-            </div>
-            <div>
               <p>
                 National Background Investigation System (NBIS) eApp version MAJOR.MINOR.PATCH-IDENTIFIER
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   Follow instructions completely or your form will be unable to be processed. If you have any questions, contact the office that provided you the form.
                 </strong>
               </p>
-            </div>
-            <div>
               <h2>
                 Instructions for completing this form
               </h2>
-            </div>
-            <div>
               <ol>
                 <li>
-                  <strong>
-                    Follow the instructions provided to you by the office that gave you this form
-                  </strong>
-                   and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                  <p>
+                    <strong>
+                      Follow the instructions provided to you by the office that gave you this form
+                    </strong>
+                     and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="2"
-              >
                 <li>
-                  <strong>
-                    All questions on this form must be answered
-                  </strong>
-                  . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                  <p>
+                    <strong>
+                      All questions on this form must be answered
+                    </strong>
+                    . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="3"
-              >
                 <li>
-                  <strong>
-                    Do not abbreviate the names of cities or foreign countries
-                  </strong>
-                  .
+                  <p>
+                    <strong>
+                      Do not abbreviate the names of cities or foreign countries
+                    </strong>
+                    .
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="4"
-              >
                 <li>
-                  <strong>
-                    All dates provided in this form must be in Month/Day/Year or Month/Year format
-                  </strong>
-                  . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                  <p>
+                    <strong>
+                      All dates provided in this form must be in Month/Day/Year or Month/Year format
+                    </strong>
+                    . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                  </p>
                 </li>
               </ol>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <p>
                 All questions on this form must be answered 
                 <strong>
@@ -117,436 +95,290 @@ exports[`The Introduction component renders properly 1`] = `
                 </strong>
                  failure to answer any questions completely and truthfully could result in an adverse personnel action against you, including loss of employment; with respect to these sections: Illegal Use of Drugs and Drug Activity, Use of Information Technology Systems, and Association Record, however, neither your truthful responses nor information derived from those responses will be used as evidence against you in a subsequent criminal proceeding.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 How to save your progress
               </h2>
-            </div>
-            <div>
               <p>
                 <strong>
                   This form will auto save your progress continuously throughout.
                 </strong>
                  Each input will be validated and save as you enter your information.
               </p>
-            </div>
-            <div>
               <p>
                 To confirm you're auto saving and find out when the last save was check for the save icon on each screen.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Purpose of this form
               </h2>
-            </div>
-            <div>
               <p>
                 This form will be used by the United States (U.S.) Government in conducting background investigations, reinvestigations, and continuous evaluations of persons under consideration for, or retention of, national security positions as defined in 5 CFR 732, and for individuals requiring eligibility for access to classified information under Executive Order 12968. This form may also be used by agencies in determining whether a subject performing work for, or on behalf of, the Government under a contract should be deemed eligible for logical or physical access when the nature of the work to be performed is sensitive and could bring about an adverse effect on the national security.
               </p>
-            </div>
-            <div>
               <p>
                 Providing this information is voluntary. If you do not provide each item of requested information, however, we will not be able to complete your investigation, which will adversely affect your eligibility for a national security position, eligibility for access to classified information, or logical or physical access. It is imperative that the information provided be true and accurate, to the best of your knowledge. Any information that you provide is evaluated on the basis of its currency, seriousness, relevance to the position and duties, and consistency with all other information about you. Withholding, misrepresenting, or falsifying information may affect your eligibility for access to classified information, eligibility for a sensitive position, or your ability to obtain or retain Federal or contract employment. In addition, withholding, misrepresenting, or falsifying information may affect your eligibility for physical and logical access to federally controlled facilities or information systems. Withholding, misrepresenting, or falsifying information may also negatively affect your employment prospects and job status, and the potential consequences include, but are not limited to, removal, debarment from Federal service, loss of eligibility for access to classified information, or prosecution.
               </p>
-            </div>
-            <div>
               <p>
                 This form may become a permanent document that may be used as the basis for future investigations, eligibility determinations for access to classified information, or to hold a sensitive position, suitability or fitness for Federal employment, fitness for contract employment, or eligibility for physical and logical access to federally controlled facilities or information systems. Your responses to this form may be compared with your responses to previous SF-86 questionnaires.
               </p>
-            </div>
-            <div>
               <p>
                 The investigation conducted on the basis of information provided on this form may be selected for studies and analyses in support of evaluating and improving the effectiveness and efficiency of the investigative and adjudicative methodologies. All study results released to the general public will delete personal identifiers such as name, Social Security Number, and date and place of birth.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Authority to request this information
               </h2>
-            </div>
-            <div>
               <p>
                 Depending upon the purpose of your investigation, the U.S. Government is authorized to ask for this information under Executive Orders 10450, 10865, 12333, and 12968; sections 3301, 3302, and 9101 of title 5, United States Code (U.S.C.); sections 2165 and 2201 of title 42, U.S.C.; chapter 23 of title 50, U.S.C.; and parts 2, 5, 731, 732, and 736 of title 5, Code of Federal Regulations (CFR).
               </p>
-            </div>
-            <div>
               <p>
                 Your Social Security Number (SSN) is needed to identify records unique to you. Although disclosure of your SSN is not mandatory, failure to disclose your SSN may prevent or delay the processing of your background investigation. The authority for soliciting and verifying your SSN is Executive Order 9397, as amended by EO 13478.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 The investigative process
               </h2>
-            </div>
-            <div>
               <p>
                 Background investigations for national security positions are conducted to gather information to determine whether you are reliable, trustworthy, of good conduct and character, and loyal to the U.S. The information that you provide on this form may be confirmed during the investigation. The investigation may extend beyond the time covered by this form, when necessary to resolve issues. Your current employer may be contacted as part of the investigation, although you may have previously indicated on applications or other forms that you do not want your current employer to be contacted. If you have a security freeze on your consumer or credit report file, then we may not be able to complete your investigation, which can adversely affect your eligibility for a national security position. To avoid such delays, you should request that the consumer reporting agencies lift the freeze in these instances.
               </p>
-            </div>
-            <div>
               <p>
                 In addition to the questions on this form, inquiry also is made about your adherence to security requirements, your honesty and integrity, vulnerability to exploitation or coercion, falsification, misrepresentation, and any other behavior, activities, or associations that tend to demonstrate a person is not reliable, trustworthy, or loyal. Federal agency records checks may be conducted on your spouse or legally recognized civil union/domestic partner, cohabitant(s), and immediate family members. After an eligibility determination has been completed, you also may be subject to continuous evaluation, which may include periodic reinvestigations, to determine whether retention in your position is clearly consistent with the interests of national security.
               </p>
-            </div>
-            <div>
               <p>
                 The information you provide on this form may be confirmed during the investigation, and may be used for identification purposes throughout the investigation process.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Your personal interview
               </h2>
-            </div>
-            <div>
               <p>
                 Some investigations will include an interview with you as a routine part of the investigative process. The investigator may ask you to explain your answers to any question on this form. This provides you the opportunity to update, clarify, and explain information on your form more completely, which often assists in completing your investigation. It is imperative that the interview be conducted as soon as possible after you are contacted. Postponements will delay the processing of your investigation, and declining to be interviewed may result in your investigation being delayed or canceled.
               </p>
-            </div>
-            <div>
               <p>
                 For the interview, you will be required to provide photo identification, such as a valid state driver's license. You may be required to provide other documents to verify your identity, as instructed by your investigator. These documents may include certification of any legal name change, Social Security card, passport, and/or your birth certificate. You may also be asked to provide documents regarding information that you provide on this form, or about other matters requiring specific attention. These matters include (a) alien registration or naturalization documentation; (b) delinquent loans or taxes, bankruptcies, judgments, liens, or other financial obligations; (c) agreements involving child custody or support, alimony, or property settlements; (d) arrests, convictions, probation, and/or parole; or (e) other matters described in court records.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Final determination on your eligibility
               </h2>
-            </div>
-            <div>
               <p>
                 Final determination on your eligibility for a national security position is the responsibility of the Federal agency that requested your investigation and the agency that conducted your investigation. You will be provided the opportunity to explain, refute, or clarify any information before a final decision is made, if an unfavorable decision is considered. The United States Government does not discriminate on the basis of prohibited categories, including but not limited to race, color, religion, sex (including pregnancy and gender identity), national origin, disability, or sexual orientation when granting access to classified information.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Penalties for inaccurate or false statements
               </h2>
-            </div>
-            <div>
               <p>
                 The U.S. Criminal Code (title 18, section 1001) provides that knowingly falsifying or concealing a material fact is a felony which may result in fines and/or up to five (5) years imprisonment. In addition, Federal agencies generally fire, do not grant a security clearance, or disqualify individuals who have materially and deliberately falsified these forms, and this remains a part of the permanent record for future placements. Your prospects of placement or security clearance are better if you answer all questions truthfully and completely. You will have adequate opportunity to explain any information you provide on this form and to make your comments part of the record.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Disclosure information
               </h2>
-            </div>
-            <div>
               <p>
                 The information you provide is for the purpose of investigating you for a national security position, and the information will be protected from unauthorized disclosure. The collection, maintenance, and disclosure of background investigative information are governed by the Privacy Act. The agency that requested the investigation and the agency that conducted the investigation have published notices in the Federal Register describing the systems of records in which your records will be maintained. The information you provide on this form, and information collected during an investigation, may be disclosed without your consent by an agency maintaining the information in a system of records as permitted by the Privacy Act [5 U.S.C. 552a(b)], and by routine uses, a list of which are published by the agency in the Federal Register. The office that gave you this form will provide you a copy of its routine uses.
               </p>
-            </div>
-            <div>
               <p>
                 You will not receive prior notice of such disclosures under a routine use.
               </p>
-            </div>
-            <div>
               <p>
                 In addition to those disclosures generally permitted under the Privacy Act, all or a portion of the records or information you provide on this form or during your investigation may be disclosed outside of OPM as a routine use as outlined below.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Office of Personnel Management (OPM) Routine Uses
               </h2>
-            </div>
-            <div>
               <p>
                 OPM has published the following Privacy Act routine uses for its system of records for background investigations:
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   a.
                 </strong>
                  To designated officers and employees of agencies, offices, and other establishments in the executive, legislative, and judicial branches of the Federal Government or the Government of the District of Columbia having a need to investigate, evaluate, or make a determination regarding loyalty to the United States; qualifications, suitability, or fitness for Government employment or military service; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   b.
                 </strong>
                  To an element of the U.S. Intelligence Community as identified in E.O. 12333, as amended, for use in intelligence activities for the purpose of protecting United States national security interests.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   c.
                 </strong>
                  To any source from which information is requested in the course of an investigation, to the extent necessary to identify the individual, inform the source of the nature and purpose of the investigation, and to identify the type of information requested.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   d.
                 </strong>
                  To the appropriate Federal, state, local, tribal, foreign, or other public authority responsible for investigating, prosecuting, enforcing, or implementing a statute, rule, regulation, or order where OPM becomes aware of an indication of a violation or potential violation of civil or criminal law or regulation.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   e.
                 </strong>
                  To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with its current employee’s, contractor employee’s, or military member’s retention; loyalty; qualifications, suitability, or fitness for employment; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   f.
                 </strong>
                  To provide information to a congressional office from the record of an individual in response to an inquiry from the congressional office made at the request of that individual. However, the investigative file, or parts thereof, will only be released to a congressional office if OPM receives a notarized authorization or signed statement under 28 U.S.C. 1746 from the subject of the investigation.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   g.
                 </strong>
                  To disclose information to contractors, grantees, or volunteers performing or working on a contract, service, grant, cooperative agreement, or job for the Federal Government.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   h.
                 </strong>
                  For agencies that use adjudicative support services of another agency, at the request of the original agency, the results will be furnished to the agency providing the adjudicative support.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   i.
                 </strong>
                  To provide criminal history record information to the FBI, to help ensure the accuracy and completeness of FBI and OPM records.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   j.
                 </strong>
                  To appropriate agencies, entities, and persons when (1) OPM suspects or has confirmed that there has been a breach of the system of records; (2) OPM has determined that as a result of the suspected or confirmed breach there is a risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security; and (3) the disclosure made to such agencies, entities, and persons is reasonably necessary to assist in connection with OPM’s efforts to respond to the suspected or confirmed breach or to prevent, minimize, or remedy such harm.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   k.
                 </strong>
                  To another Federal agency or Federal entity, when OPM determines that information from this system of records is reasonably necessary to assist the recipient agency or entity in (1) responding to a suspected or confirmed breach or (2) preventing, minimizing, or remedying the risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security, resulting from a suspected or confirmed breach.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   l.
                 </strong>
                  To disclose information to another Federal agency, to a court, or a party in litigation before a court or in an administrative proceeding being conducted by a Federal agency, when the Government is a party to the judicial or administrative proceeding. In those cases where the Government is not a party to the proceeding, records may be disclosed if a subpoena has been signed by a judge.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   m.
                 </strong>
                  To disclose information to the National Archives and Records Administration for use in records management inspections.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   n.
                 </strong>
                  To disclose information to the Department of Justice, or in a proceeding before a court, adjudicative body, or other administrative body before which OPM is authorized to appear, when:
               </p>
-            </div>
-            <div>
               <ol>
                 <li>
-                  OPM, or any component thereof; or
+                  <p>
+                    OPM, or any component thereof; or
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="2"
-              >
                 <li>
-                  Any employee of OPM in his or her official capacity; or
+                  <p>
+                    Any employee of OPM in his or her official capacity; or
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="3"
-              >
                 <li>
-                  Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                  <p>
+                    Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                  </p>
                 </li>
-              </ol>
-            </div>
-            <div>
-              <ol
-                start="4"
-              >
                 <li>
-                  The United States, when OPM determines that litigation is likely to affect OPM or any of its components; is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
+                  <p>
+                    The United States, when OPM determines that litigation is likely to affect OPM or any of its components; is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
+                  </p>
                 </li>
               </ol>
-            </div>
-            <div>
               <p>
                 <strong>
                   o.
                 </strong>
                  For the Merit Systems Protection Board--To disclose information to officials of the Merit Systems Protection Board or the Office of the Special Counsel, when requested in connection with appeals, special studies of the civil service and other merit systems, review of OPM rules and regulations, investigations of alleged or possible prohibited personnel practices, and such other functions, e.g., as promulgated in 5 U.S.C. 1205 and 1206, or as may be authorized by law.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   p.
                 </strong>
                  To disclose information to an agency Equal Employment Opportunity (EEO) office or to the Equal Employment Opportunity Commission when requested in connection with investigations into alleged or possible discrimination practices in the Federal sector, or in the processing of a Federal-sector EEO complaint.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   q.
                 </strong>
                  To disclose information to the Federal Labor Relations Authority or its General Counsel when requested in connection with investigations of allegations of unfair labor practices or matters before the Federal Service Impasses Panel.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   r.
                 </strong>
                  To another Federal agency’s Office of Inspector General when OPM becomes aware of an indication of misconduct or fraud during the applicant’s submission of the standard forms.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   s.
                 </strong>
                  To another Federal agency’s Office of Inspector General in connection with its inspection or audit activity of the investigative or adjudicative processes and procedures of its agency as authorized by the Inspector General Act of 1978, as amended, exclusive of requests for civil or criminal law enforcement activities.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   t.
                 </strong>
                  To a Federal agency or state unemployment compensation office upon its request in order to adjudicate a claim for unemployment compensation benefits when the claim for benefits is made as the result of a qualifications, suitability, fitness, security, identity credential, or access determination.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   u.
                 </strong>
                  To appropriately cleared individuals in Federal agencies, to determine whether information obtained in the course of processing the background investigation is or should be classified.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   v.
                 </strong>
                  To the Office of the Director of National Intelligence for inclusion in its Scattered Castles system in order to facilitate reciprocity of background investigations and security clearances within the intelligence community or assist agencies in obtaining information required by the Federal Investigative Standards.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   w.
                 </strong>
                  To the Director of National Intelligence, or assignee, such information as may be requested and relevant to implement the responsibilities of the Security Executive Agent for personnel security, and pertinent personnel security research and oversight, consistent with law or executive order.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   x.
                 </strong>
                  To Executive Branch Agency insider threat, counterintelligence, and counterterrorism officials to fulfill their responsibilities under applicable Federal law and policy, including but not limited to E.O. 12333, 13587 and the National Insider Threat Policy and Minimum Standards.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   y.
                 </strong>
                  To the appropriate Federal, State, local, tribal, foreign, or other public authority in the event of a natural or manmade disaster. The record will be used to provide leads to assist in locating missing subjects or assist in determining the health and safety of the subject. The record will also be used to assist in identifying victims and locating any surviving next of kin.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   z.
                 </strong>
                  To Federal, State, and local government agencies, if necessary, to obtain information from them which will assist OPM in its responsibilities as the authorized Investigation Service Provider in conducting studies and analyses in support of evaluating and improving the effectiveness and efficiency of the background investigation methodologies.
               </p>
-            </div>
-            <div>
               <p>
                 <strong>
                   aa.
                 </strong>
                  To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with the classifying of jobs, the letting of a contract, or the issuance of a license, grant, or other benefit by the requesting agency, to the extent that the information is relevant and necessary to the requesting agency’s decision on the matter.
               </p>
-            </div>
-            <div>
               <hr />
-            </div>
-            <div>
               <h2>
                 Public burden information
               </h2>
-            </div>
-            <div>
               <p>
                 Public burden reporting for this collection of information is 
                 <strong>
diff --git a/src/components/Form/Location/Address.jsx b/src/components/Form/Location/Address.jsx
index 8f7fd1644..7464606de 100644
--- a/src/components/Form/Location/Address.jsx
+++ b/src/components/Form/Location/Address.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import LocationValidator, { countryString } from 'validators/location'
 import { countryValueResolver } from 'helpers/location'
 
diff --git a/src/components/Form/Location/AlternateAddress.jsx b/src/components/Form/Location/AlternateAddress.jsx
index 053050fb5..3ed767cbe 100644
--- a/src/components/Form/Location/AlternateAddress.jsx
+++ b/src/components/Form/Location/AlternateAddress.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Field from '../Field'
 import Branch from '../Branch'
 import Show from '../Show'
diff --git a/src/components/Form/Location/Location.jsx b/src/components/Form/Location/Location.jsx
index 5936faca2..c41bda2ac 100644
--- a/src/components/Form/Location/Location.jsx
+++ b/src/components/Form/Location/Location.jsx
@@ -1,7 +1,8 @@
 import React from 'react'
 
 import { updateApplication } from 'actions/ApplicationActions'
-import { i18n, env } from 'config'
+import { env } from 'config'
+import i18n from 'util/i18n'
 import { LocationValidator } from 'validators'
 import { countryString } from 'validators/location'
 
diff --git a/src/components/Form/Location/ToggleableLocation.jsx b/src/components/Form/Location/ToggleableLocation.jsx
index d20826fb3..31bbc7225 100644
--- a/src/components/Form/Location/ToggleableLocation.jsx
+++ b/src/components/Form/Location/ToggleableLocation.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 
-import { env, i18n } from 'config'
+import { env } from 'config'
+import i18n from 'util/i18n'
 import { countryValueResolver } from 'helpers/location'
 import LocationValidator, { countryString } from 'validators/location'
 
diff --git a/src/components/Form/Name/Name.jsx b/src/components/Form/Name/Name.jsx
index 6de49ee58..3b6ecee19 100644
--- a/src/components/Form/Name/Name.jsx
+++ b/src/components/Form/Name/Name.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Field from '../Field'
 import Show from '../Show'
diff --git a/src/components/Form/Name/Name.test.jsx b/src/components/Form/Name/Name.test.jsx
index 644be11b9..fcfad58a3 100644
--- a/src/components/Form/Name/Name.test.jsx
+++ b/src/components/Form/Name/Name.test.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { shallow, mount } from 'enzyme'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Name from './Name'
 
 describe('The Name component', () => {
diff --git a/src/components/Form/NotApplicable/NotApplicable.jsx b/src/components/Form/NotApplicable/NotApplicable.jsx
index d10660615..54cc59637 100644
--- a/src/components/Form/NotApplicable/NotApplicable.jsx
+++ b/src/components/Form/NotApplicable/NotApplicable.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Checkbox from '../Checkbox'
 
 export default class NotApplicable extends React.Component {
diff --git a/src/components/Form/SSN/SSN.jsx b/src/components/Form/SSN/SSN.jsx
index aa68bbc0d..a4b17adf3 100644
--- a/src/components/Form/SSN/SSN.jsx
+++ b/src/components/Form/SSN/SSN.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Text from '../Text'
 import Checkbox from '../Checkbox'
diff --git a/src/components/Form/Sex/Sex.jsx b/src/components/Form/Sex/Sex.jsx
index 891938471..f07239fc0 100644
--- a/src/components/Form/Sex/Sex.jsx
+++ b/src/components/Form/Sex/Sex.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Svg from '../Svg'
 import Radio from '../Radio'
diff --git a/src/components/Form/Spinner/Spinner.jsx b/src/components/Form/Spinner/Spinner.jsx
index 77ae24b56..668beffe3 100644
--- a/src/components/Form/Spinner/Spinner.jsx
+++ b/src/components/Form/Spinner/Spinner.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import Modal from '../Modal'
 
 const ACTION_SPIN = 'spin'
diff --git a/src/components/Form/Street/Street.jsx b/src/components/Form/Street/Street.jsx
index 53dc050e6..76d4d93a0 100644
--- a/src/components/Form/Street/Street.jsx
+++ b/src/components/Form/Street/Street.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Text from '../Text'
 
diff --git a/src/components/Form/Telephone/Telephone.jsx b/src/components/Form/Telephone/Telephone.jsx
index ebe0d5fd8..0b4d2f4a3 100644
--- a/src/components/Form/Telephone/Telephone.jsx
+++ b/src/components/Form/Telephone/Telephone.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Text from '../Text'
 import Checkbox from '../Checkbox'
diff --git a/src/components/Form/TimeoutWarning/TimeoutWarning.jsx b/src/components/Form/TimeoutWarning/TimeoutWarning.jsx
index 4c1527eaa..ce87c8ed5 100644
--- a/src/components/Form/TimeoutWarning/TimeoutWarning.jsx
+++ b/src/components/Form/TimeoutWarning/TimeoutWarning.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { renewSession } from 'actions/AuthActions'
 
diff --git a/src/components/Form/Weight/Weight.jsx b/src/components/Form/Weight/Weight.jsx
index 9ebf1779e..2c1169a39 100644
--- a/src/components/Form/Weight/Weight.jsx
+++ b/src/components/Form/Weight/Weight.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import ValidationElement from '../ValidationElement'
 import Number from '../Number'
 
diff --git a/src/components/KickbackBanner/index.jsx b/src/components/KickbackBanner/index.jsx
index ad9c35a43..f0365aecf 100644
--- a/src/components/KickbackBanner/index.jsx
+++ b/src/components/KickbackBanner/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 const KickbackBanner = () => (
   <div className="usa-alert usa-alert-warning kickback-banner">
diff --git a/src/components/Main/__snapshots__/App.test.jsx.snap b/src/components/Main/__snapshots__/App.test.jsx.snap
index d882ca8bf..45f52a386 100644
--- a/src/components/Main/__snapshots__/App.test.jsx.snap
+++ b/src/components/Main/__snapshots__/App.test.jsx.snap
@@ -28,74 +28,52 @@ exports[`App component for the SF85 renders the homepage 1`] = `
                 <h1>
                   Questionnaire for Non-Sensitive Positions
                 </h1>
-              </div>
-              <div>
                 <p>
                   National Background Investigation System (NBIS) eApp version MAJOR.MINOR.PATCH-IDENTIFIER
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     Follow instructions completely or your form will be unable to be processed. If you have any questions, contact the office that provided you the form.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <h2>
                   Instructions for completing this form
                 </h2>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    <strong>
-                      Follow the instructions provided to you, by the office that gave you this form
-                    </strong>
-                     and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                    <p>
+                      <strong>
+                        Follow the instructions provided to you, by the office that gave you this form
+                      </strong>
+                       and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
                   <li>
-                    <strong>
-                      All questions on this form must be answered
-                    </strong>
-                    . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    <p>
+                      <strong>
+                        All questions on this form must be answered
+                      </strong>
+                      . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    <strong>
-                      Do not abbreviate the names of cities or foreign countries
-                    </strong>
-                    . Whenever you are asked to supply a country name, you may select the country name by using the country dropdown feature.
+                    <p>
+                      <strong>
+                        Do not abbreviate the names of cities or foreign countries
+                      </strong>
+                      . Whenever you are asked to supply a country name, you may select the country name by using the country dropdown feature.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    <strong>
-                      All dates provided in this form must be in Month/Day/Year or Month/Year format
-                    </strong>
-                    . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    <p>
+                      <strong>
+                        All dates provided in this form must be in Month/Day/Year or Month/Year format
+                      </strong>
+                      . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <p>
                   All questions on this form must be answered 
                   <strong>
@@ -107,86 +85,52 @@ exports[`App component for the SF85 renders the homepage 1`] = `
                   </strong>
                    failure to answer any questions completely and truthfully could result in an adverse personnel action against you, including loss of employment; with respect to these sections: Illegal Use of Drugs and Drug Activity and Association Record, however, neither your truthful responses nor information derived from those responses will be used as evidence against you in a subsequent criminal proceeding.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   How to save your progress
                 </h2>
-              </div>
-              <div>
                 <p>
                   <strong>
                     This form will auto save your progress continuously throughout.
                   </strong>
                    Each input will be validated and save as you enter your information.
                 </p>
-              </div>
-              <div>
                 <p>
                   To confirm you're auto saving and find out when the last save was check for the save icon on each screen.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Purpose of this form
                 </h2>
-              </div>
-              <div>
                 <p>
                   This form will be used by the United States (U.S.) Government in conducting background investigations and reinvestigations of persons under consideration for, or retention of, non-sensitive positions as defined in 5 CFR 731. This form may also be used by agencies in determining whether a subject should be issued a Federal credential for access to federally controlled facilities and information systems . For applicants, this form is to be used only after a conditional offer of employment has been made, unless OPM has provided for an exception. This form is not to be used for National Security sensitive positions.
                 </p>
-              </div>
-              <div>
                 <p>
                   Providing this information is voluntary. If you do not provide each item of requested information, however, we will not be able to complete your investigation, which will adversely affect your eligibility for a position or your ability to obtain or retain Federal or contract employment, or logical or physical access. It is imperative that the information provided be true and accurate, to the best of your knowledge. Any information that you provide is evaluated on the basis of its currency, seriousness, relevance to the position and duties, and consistency with all other information about you. Withholding, misrepresenting, or falsifying information may affect your eligibility for positions, physical and /or logical access required to perform duties, or your ability to obtain or retain Federal or contract employment. In addition, withholding, misrepresenting, or falsifying information may affect your eligibility for physical and logical access to federally controlled facilities or information systems. Withholding, misrepresenting, or falsifying information may also negatively affect your employment prospects and job status, and the potential consequences include, but are not limited to, removal, debarment from Federal service, or prosecution.
                 </p>
-              </div>
-              <div>
                 <p>
                   This form may become a permanent document that may be used as the basis for future investigations, determinations of suitability or fitness for Federal employment, fitness for contract employment, or eligibility for physical and logical access to federally controlled facilities or information systems. Your responses to this form may be compared with your responses to previous questionnaires.
                 </p>
-              </div>
-              <div>
                 <p>
                   The investigation conducted on the basis of information provided on this form may be selected for studies and analyses in support of evaluating and improving the effectiveness and efficiency of the investigative and adjudicative methodologies. All study results released to the general public will delete personal identifiers such as name, Social Security Number, and date and place of birth.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Authority to request this information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Depending upon the purpose of your investigation, the U.S. Government is authorized to ask for this information under Executive Order 
                   <strong>
                     13764, 13741, 10577, 13467, and 13488; sections 3301, 3302, 7301, and 9101 of title 5, United States Code (U.S.C.); parts 2, 5, 731, and 736 of title 5, Code of Federal Regulations (CFR).
                   </strong>
                 </p>
-              </div>
-              <div>
                 <p>
                   Your Social Security Number (SSN) is needed to identify records unique to you. Although disclosure of your SSN is not mandatory, failure to disclose your SSN may prevent or delay the processing of your background investigation. The authority for soliciting and verifying your SSN is Executive Order 9397, as amended by EO 13478.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   The investigative process
                 </h2>
-              </div>
-              <div>
                 <p>
                   Background investigations for 
                   <strong>
@@ -198,367 +142,253 @@ exports[`App component for the SF85 renders the homepage 1`] = `
                   </strong>
                    on applications or other forms that you do not want your current employer to be contacted. If you have a security freeze on your consumer or credit report file and a credit report is required by the agency requesting your investigation, then we may not be able to complete your investigation, which can adversely affect your eligibility for positions, physical and /or logical access required to perform duties, or your ability to obtain Federal or contract employment. To avoid such delays, you must request that the consumer reporting agencies lift the freeze in these instances.
                 </p>
-              </div>
-              <div>
                 <p>
                   In addition to the questions on this form, inquiry also is made about your adherence to security requirements, your honesty and integrity, falsification, misrepresentation, and any other behavior, activities, or associations that tend to demonstrate a person is not reliable, trustworthy, or poses an unacceptable risk to the life, safety, or health of employees, contractors, vendors or visitors to a Federal facility; the Government’s physical assets or information systems; personal property; records, or, the privacy of the individuals whose data the Government holds in its systems. After an eligibility determination is made, you may also be subject to reinvestigations to ensure your continuing suitability for employment.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     The information you provide on this form may be confirmed during the investigation, and may be used for identification purposes throughout the investigation process.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Your personal interview
                 </h2>
-              </div>
-              <div>
                 <p>
                   Some investigations may include an interview with you as needed as part of the investigative process. The investigator may ask you to explain your answers to any question on this form. This provides you the opportunity to update, clarify, and explain information on your form more completely, which often assists in completing your investigation. If contacted, it is imperative that the interview be conducted as soon as possible after contact is made by the investigator. Postponements will delay the processing of your investigation, and declining to be interviewed may result in your investigation being delayed or canceled.
                 </p>
-              </div>
-              <div>
                 <p>
                   For the interview, you will be required to provide photo identification, such as a valid state driver's license. You may be required to provide other documents to verify your identity, as instructed by your investigator. These documents may include certification of any legal name change, Social Security card, passport, and/or your birth certificate. You may also be asked to provide documents regarding information that you provide on this form, or about other matters requiring specific attention.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Final determination on your eligibility
                 </h2>
-              </div>
-              <div>
                 <p>
                   Final determination on your eligibility for a position and/or physical or logical access to federal facilities and information is the responsibility of the Office of Personnel Management or the Federal agency that requested your investigation. You may be provided the opportunity to explain, refute, or clarify any information before a final decision is made, if an unfavorable decision is considered. The United States Government does not discriminate on the basis of prohibited categories, including but not limited to race, color, religion, sex (including pregnancy and gender identity), national origin, disability, and sexual orientation, when making determinations of eligibility for non-sensitive positions, physical and/or logical access required to perform duties.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Penalties for inaccurate or false statements
                 </h2>
-              </div>
-              <div>
                 <p>
                   The U.S. Criminal Code (title 18, section 1001) provides that knowingly falsifying or concealing a material fact is a felony which may result in fines and/or up to five (5) years imprisonment. In addition, Federal agencies generally fire, or disqualify individuals who have materially and deliberately falsified these forms, and this remains a part of the permanent record for future placements. Your prospects of placement are better if you answer all questions truthfully and completely. You will have adequate opportunity to explain any information you provide on this form and to make your comments part of the record.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Disclosure information
                 </h2>
-              </div>
-              <div>
                 <p>
                   The information you provide is for the purpose of investigating you for a position, and the information will be protected from unauthorized disclosure. The collection, maintenance, and disclosure of background investigative information are governed by the Privacy Act. The agency that requested the investigation and the agency that conducted the investigation have published notices in the Federal Register describing the systems of records in which your records will be maintained. The information you provide on this form, and information collected during an investigation, may be disclosed without your consent by an agency maintaining the information in a system of records as permitted by the Privacy Act [5 U.S.C. 552a(b)], and by routine uses, a list of which are published by the agency in the Federal Register. The office that gave you this form will provide you a copy of its routine uses.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     You will not receive prior notice of such disclosures under a routine use.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     In addition to those disclosures generally permitted under the Privacy Act, all or a portion of the records or information you provide on this form or during your investigation may be disclosed outside of OPM as a routine use as outlined below.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Common routine uses
                 </h2>
-              </div>
-              <div>
                 <p>
                   The Privacy Act routine uses of agencies conducting or requesting investigations, or with authorized custody over your investigative information, commonly include some or all of the following:
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     a.
                   </strong>
                    To designated officers and employees of agencies, offices, and other establishments in the executive, legislative, and judicial branches of the Federal Government or the Government of the District of Columbia having a need to investigate, evaluate, or make a determination regarding loyalty to the United States; qualifications, suitability, or fitness for Government employment or military service; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     b.
                   </strong>
                    To an element of the U.S. Intelligence Community as identified in E.O. 12333, as amended, for use in intelligence activities for the purpose of protecting United States national security interests.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     c.
                   </strong>
                    To any source from which information is requested in the course of an investigation, to the extent necessary to identify the individual, inform the source of the nature and purpose of the investigation, and to identify the type of information requested.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     d.
                   </strong>
                    To the appropriate Federal, state, local, tribal, foreign, or other public authority responsible for investigating, prosecuting, enforcing, or implementing a statute, rule, regulation, or order where OPM becomes aware of an indication of a violation or potential violation of civil or criminal law or regulation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     e.
                   </strong>
                    To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with its current employee’s, contractor employee’s, or military member’s retention; loyalty; qualifications, suitability, or fitness for employment; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     f.
                   </strong>
                    To provide information to a congressional office from the record of an individual in response to an inquiry from the congressional office made at the request of that individual. However, the investigative file, or parts thereof, will only be released to a congressional office if OPM receives a notarized authorization or signed statement under 28 U.S.C. 1746 from the subject of the investigation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     g.
                   </strong>
                    To disclose information to contractors, grantees, or volunteers performing or working on a contract, service, grant, cooperative agreement, or job for the Federal Government.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     h.
                   </strong>
                    For agencies that use adjudicative support services of another agency, at the request of the original agency, the results will be furnished to the agency providing the adjudicative support.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     i.
                   </strong>
                    To provide criminal history record information to the FBI, to help ensure the accuracy and completeness of FBI and OPM records.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     j.
                   </strong>
                    To appropriate agencies, entities, and persons when (1) OPM suspects or has confirmed that there has been a breach of the system of records; (2) OPM has determined that as a result of the suspected or confirmed breach there is a risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security; and (3) the disclosure made to such agencies, entities, and persons is reasonably necessary to assist in connection with OPM’s efforts to respond to the suspected or confirmed breach or to prevent, minimize, or remedy such harm.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     k.
                   </strong>
                    To another Federal agency or Federal entity, when OPM determines that information from this system of records is reasonably necessary to assist the recipient agency or entity in (1) responding to a suspected or confirmed breach or (2) preventing, minimizing, or remedying the risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security, resulting from a suspected or confirmed breach.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     l.
                   </strong>
                    To disclose information to another Federal agency, to a court, or a party in litigation before a court or in an administrative proceeding being conducted by a Federal agency, when the Government is a party to the judicial or administrative proceeding. In those cases where the Government is not a party to the proceeding, records may be disclosed if a subpoena has been signed by a judge.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     m.
                   </strong>
                    To disclose information to the National Archives and Records Administration for use in records management inspections.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     n.
                   </strong>
                    To disclose information to the Department of Justice, or in a proceeding before a court, adjudicative body, or other administrative body before which OPM is authorized to appear, when:
                 </p>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    OPM, or any component thereof; or
+                    <p>
+                      OPM, or any component thereof; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
                   <li>
-                    Any employee of OPM in his or her official capacity; or
+                    <p>
+                      Any employee of OPM in his or her official capacity; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    <p>
+                      Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    The United States, when OPM determines that litigation is likely to affect OPM or any of its components;
+                    <p>
+                      The United States, when OPM determines that litigation is likely to affect OPM or any of its components;
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <p>
                   is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     o.
                   </strong>
                    For the Merit Systems Protection Board--To disclose information to officials of the Merit Systems Protection Board or the Office of the Special Counsel, when requested in connection with appeals, special studies of the civil service and other merit systems, review of OPM rules and regulations, investigations of alleged or possible prohibited personnel practices, and such other functions, e.g., as promulgated in 5 U.S.C. 1205 and 1206, or as may be authorized by law.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     p.
                   </strong>
                    To disclose information to an agency Equal Employment Opportunity (EEO) office or to the Equal Employment Opportunity Commission when requested in connection with investigations into alleged or possible discrimination practices in the Federal sector, or in the processing of a Federal-sector EEO complaint.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     q.
                   </strong>
                    To disclose information to the Federal Labor Relations Authority or its General Counsel when requested in connection with investigations of allegations of unfair labor practices or matters before the Federal Service Impasses Panel.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     r.
                   </strong>
                    To another Federal agency’s Office of Inspector General when OPM becomes aware of an indication of misconduct or fraud during the applicant’s submission of the standard forms.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     s.
                   </strong>
                    To another Federal agency’s Office of Inspector General in connection with its inspection or audit activity of the investigative or adjudicative processes and procedures of its agency as authorized by the Inspector General Act of 1978, as amended, exclusive of requests for civil or criminal law enforcement activities.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     t.
                   </strong>
                    To a Federal agency or state unemployment compensation office upon its request in order to adjudicate a claim for unemployment compensation benefits when the claim for benefits is made as the result of a qualifications, suitability, fitness, security, identity credential, or access determination.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     u.
                   </strong>
                    To appropriately cleared individuals in Federal agencies, to determine whether information obtained in the course of processing the background investigation is or should be classified.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     v.
                   </strong>
                    To the Office of the Director of National Intelligence for inclusion in its Scattered Castles system in order to facilitate reciprocity of background investigations and security clearances within the intelligence community or assist agencies in obtaining information required by the Federal Investigative Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     w.
                   </strong>
                    To the Director of National Intelligence, or assignee, such information as may be requested and relevant to implement the responsibilities of the Security Executive Agent for personnel security, and pertinent personnel security research and oversight, consistent with law or executive order.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     x.
                   </strong>
                    To Executive Branch Agency insider threat, counterintelligence, and counterterrorism officials to fulfill their responsibilities under applicable Federal law and policy, including but not limited to E.O. 12333, 13587 and the National Insider Threat Policy and Minimum Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     y.
                   </strong>
                    To the appropriate Federal, State, local, tribal, foreign, or other public authority in the event of a natural or manmade disaster. The record will be used to provide leads to assist in locating missing subjects or assist in determining the health and safety of the subject. The record will also be used to assist in identifying victims and locating any surviving next of kin.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     z.
                   </strong>
                    To Federal, State, and local government agencies, if necessary, to obtain information from them which will assist OPM in its responsibilities as the authorized Investigation Service Provider in conducting studies and analyses in support of evaluating and improving the effectiveness and efficiency of the background investigation methodologies.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     aa.
                   </strong>
                    aa. To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with the classifying of jobs, the letting of a contract, or the issuance of a license, grant, or other benefit by the requesting agency, to the extent that the information is relevant and necessary to the requesting agency’s decision on the matter.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Public burden information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Public burden reporting for this collection of information is 
                   <strong>
@@ -2230,113 +2060,75 @@ exports[`App component for the SF85P renders the homepage 1`] = `
                 <h1>
                   Questionnaire for Public Trust Positions
                 </h1>
-              </div>
-              <div>
                 <p>
                   National Background Investigation System (NBIS) eApp version MAJOR.MINOR.PATCH-IDENTIFIER
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     Follow instructions completely or your form will be unable to be processed. If you have any questions, contact the office that provided you the form.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <h2>
                   Instructions for completing this form
                 </h2>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    <strong>
-                      Follow the instructions provided to you, by the office that gave you this form
-                    </strong>
-                     and any other clarifying instructions, provided by that office, to assist you with completion of this form. You must sign and date, in ink, the original and each copy you submit. 
-                    <strong>
-                      You should retain a copy of the completed form for your records.
-                    </strong>
+                    <p>
+                      <strong>
+                        Follow the instructions provided to you, by the office that gave you this form
+                      </strong>
+                       and any other clarifying instructions, provided by that office, to assist you with completion of this form. You must sign and date, in ink, the original and each copy you submit. 
+                      <strong>
+                        You should retain a copy of the completed form for your records.
+                      </strong>
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
                   <li>
-                    <strong>
-                      All questions on this form must be answered
-                    </strong>
-                    . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    <p>
+                      <strong>
+                        All questions on this form must be answered
+                      </strong>
+                      . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    <strong>
-                      Do not abbreviate the names of cities or foreign countries
-                    </strong>
-                    . Whenever you are asked to supply a country name, you may select the country name by using the country dropdown feature.
+                    <p>
+                      <strong>
+                        Do not abbreviate the names of cities or foreign countries
+                      </strong>
+                      . Whenever you are asked to supply a country name, you may select the country name by using the country dropdown feature.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    When entering a U.S. address or location, select the state or territory from the "States" dropdown list that will be provided. For locations outside of the U.S. and its territories, select the country in the "Country" dropdown list and leave the "State" field blank.
+                    <p>
+                      When entering a U.S. address or location, select the state or territory from the "States" dropdown list that will be provided. For locations outside of the U.S. and its territories, select the country in the "Country" dropdown list and leave the "State" field blank.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="5"
-                >
                   <li>
-                    Do not abbreviate the names of cities or foreign countries.
+                    <p>
+                      Do not abbreviate the names of cities or foreign countries.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="6"
-                >
                   <li>
-                    The 5-digit postal Zip Codes are required to process your investigation more rapidly. Refer to an automated system approved by the U.S. Postal Service to assist you with Zip Codes.
+                    <p>
+                      The 5-digit postal Zip Codes are required to process your investigation more rapidly. Refer to an automated system approved by the U.S. Postal Service to assist you with Zip Codes.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="7"
-                >
                   <li>
-                    For telephone numbers in the U.S., ensure that the area code is included.
+                    <p>
+                      For telephone numbers in the U.S., ensure that the area code is included.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="8"
-                >
                   <li>
-                    <strong>
-                      All dates provided in this form must be in Month/Day/Year or Month/Year format
-                    </strong>
-                    . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    <p>
+                      <strong>
+                        All dates provided in this form must be in Month/Day/Year or Month/Year format
+                      </strong>
+                      . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <p>
                   All questions on this form must be answered 
                   <strong>
@@ -2348,441 +2140,293 @@ exports[`App component for the SF85P renders the homepage 1`] = `
                   </strong>
                    failure to answer any questions completely and truthfully could result in an adverse personnel action against you, including loss of employment; with respect to these sections: Illegal Use of Drugs and Drug Activity, Use of Information Technology Systems, and Association Record, however, neither your truthful responses nor information derived from those responses will be used as evidence against you in a subsequent criminal proceeding.
                 </p>
-              </div>
-              <div>
                 <p>
                   Note: If you complete the SF 85P, an Authorization for Release of Medical Information Pursuant to the Health Insurance Portability and Accountability Act (HIPAA) will be provided to you only in the event information arises in an investigation that requires further inquiry for resolution, and only to resolve such issues. This release authorizes an investigator to ask your health practitioner(s) only the questions specified on the release concerning mental health consultations of which the practitioner might be aware. If you are completing the SF 85P with the supplemental SF 85P-S, this release will be provided to you if you respond “yes” to the question regarding Your Medical Record. You may also be asked to complete a specific release if more detailed information is needed from your provider.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   How to save your progress
                 </h2>
-              </div>
-              <div>
                 <p>
                   <strong>
                     This form will auto save your progress continuously throughout.
                   </strong>
                    Each input will be validated and save as you enter your information.
                 </p>
-              </div>
-              <div>
                 <p>
                   To confirm you're auto saving and find out when the last save was check for the save icon on each screen.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Purpose of this form
                 </h2>
-              </div>
-              <div>
                 <p>
                   This form will be used by the United States (U.S.) Government in conducting background investigations and reinvestigations of persons under consideration for, or retention of, public trust positions as defined in 5 CFR 731. This form may also be used by agencies in determining whether a subject performing work for, or on behalf of, the Government under a contract should be deemed eligible for logical or physical access when duties to be performed by an employee of a contractor are equivalent to the duties performed by an employee in a public trust position. For applicants, this form is to be used only after a conditional offer of employment has been made. This form is not to be used for National Security sensitive positions.
                 </p>
-              </div>
-              <div>
                 <p>
                   Providing this information is voluntary. If you do not provide each item of requested information, however, we will not be able to complete your investigation, which will adversely affect your eligibility for a public trust position or your ability to obtain or retain Federal or contract employment, or logical or physical access. It is imperative that the information provided be true and accurate, to the best of your knowledge. Any information that you provide is evaluated on the basis of its currency, seriousness, relevance to the position and duties, and consistency with all other information about you. Withholding, misrepresenting, or falsifying information may affect your eligibility for a public trust position, or your ability to obtain or retain Federal or contract employment. In addition, withholding, misrepresenting, or falsifying information may affect your eligibility for physical and logical access to federally controlled facilities or information systems. Withholding, misrepresenting, or falsifying information may also negatively affect your employment prospects and job status, and the potential consequences include, but are not limited to, removal, debarment from Federal service, or prosecution.
                 </p>
-              </div>
-              <div>
                 <p>
                   This form is a permanent document that may be used as the basis for future investigations, suitability or fitness for Federal employment, fitness for contract employment, or eligibility for physical and logical access to federally controlled facilities or information systems. Your responses to this form may be compared with your responses to previous SF 85P questionnaires.
                 </p>
-              </div>
-              <div>
                 <p>
                   The investigation conducted on the basis of information provided on this form may be selected for studies and analyses in support of evaluating and improving the effectiveness and efficiency of the investigative and adjudicative methodologies. All study results released to the general public will delete personal identifiers such as name, social security number, and date and place of birth.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Authority to Request this Information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Depending upon the purpose of your investigation, the U.S. Government is authorized to ask for this information under Executive Orders 13467, 10865, 12333, and 12968; sections 3301, 3302, and 9101 of title 5, United States Code (U.S.C.); sections 2165 and 2201 of title 42, U.S.C.; chapter 23 of title 50, U.S.C.; and parts 2, 5, 731, 732, and 736 of title 5, Code of Federal Regulations (CFR), and Federal information processing standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   Your Social Security Number (SSN) is needed to identify records unique to you. Although disclosure of your SSN is not mandatory, failure to disclose your SSN may prevent or delay the processing of your background investigation. The authority for soliciting and verifying your SSN is Executive Order 9397, as amended by EO 13478.
                 </p>
-              </div>
-              <div>
                 <p>
                   Your spouse’s SSN is needed solely to allow the investigative service provider to make inquiries regarding whether there is relevant conduct on your part as a result of your relationship with your spouse. Your spouse is not subject of the investigation.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   The Investigative Process
                 </h2>
-              </div>
-              <div>
                 <p>
                   Background investigations for public trust positions are conducted to gather information to determine whether you are reliable, trustworthy, of good conduct and character, and loyal to the U.S. The information that you provide on this form and your Declaration for Federal Employment (OF 306) may be confirmed during the investigation. The investigation may extend beyond the time covered by this form, when necessary to resolve issues. Your current employer may be contacted as part of the investigation, although you may have previously indicated on applications or other forms that you do not want your current employer to be contacted. If you have a security freeze on your consumer or credit report file, then we may not be able to complete your investigation, which can adversely affect your eligibility for a public trust position or your ability to obtain Federal or contract employment. To avoid such delays, you must request that the consumer reporting agencies lift the freeze in these instances.
                 </p>
-              </div>
-              <div>
                 <p>
                   In addition to the questions on this form, inquiry also is made about your adherence to security requirements your honesty and integrity, falsification, misrepresentation, and any other behavior, activities, or associations that tend to demonstrate a person is not reliable, trustworthy, or loyal.
                 </p>
-              </div>
-              <div>
                 <p>
                   After a suitability fitness determination is made, you may also be subject to continuous vetting which may include periodic reinvestigations to ensure your continuing suitability for employment.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Your Personal Interview
                 </h2>
-              </div>
-              <div>
                 <p>
                   Some investigations will include an interview with you as a routine part of the investigative process. The investigator may ask you to explain your answers to any question on this form. This provides you the opportunity to update, clarify, and explain information on your form more completely, which often assists in completing your investigation. It is imperative that the interview be conducted as soon as possible after you are contacted. Postponements will delay the processing of your investigation, and declining to be interviewed may result in your investigation being delayed or canceled.
                 </p>
-              </div>
-              <div>
                 <p>
                   For the interview, you will be required to provide photo identification, such as a valid state driver's license. You may be required to provide other documents to verify your identity, as instructed by your investigator. These documents may include certification of any legal name change, Social Security card, passport, and/or your birth certificate. You may also be asked to provide documents regarding information that you provide on this form, or about other matters requiring specific attention. These matters include (a) alien registration or naturalization documentation; (b) delinquent loans or taxes, bankruptcies, judgments, liens, or other financial obligations; (c) agreements involving child custody or support, alimony, or property settlements; (d) arrests, convictions, probation, and/or parole; or (e) other matters described in court records.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Final determination on your eligibility
                 </h2>
-              </div>
-              <div>
                 <p>
                   Final determination on your suitability for a public trust position is the responsibility of the Office of Personnel Management or the Federal agency that requested your investigation. You may be provided the opportunity to explain, refute, or clarify any information before a final decision is made. The United States Government does not discriminate on the basis of prohibited categories, including but not limited to race, color, religion, sex (including pregnancy and gender identity), national origin, disability, and sexual orientation, when making determinations of suitability for a public trust position.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Penalties for inaccurate or false statements
                 </h2>
-              </div>
-              <div>
                 <p>
                   The U.S. Criminal Code (title 18, section 1001) provides that knowingly falsifying or concealing a material fact is a felony which may result in fines and/or up to five (5) years imprisonment. In addition, Federal agencies generally fire, or disqualify individuals who have materially and deliberately falsified these forms, and this remains a part of the permanent record for future placements. Your prospects of placement are better if you answer all questions truthfully and completely. You will have adequate opportunity to explain any information you provide on this form and to make your comments part of the record.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Disclosure information
                 </h2>
-              </div>
-              <div>
                 <p>
                   The information you provide is for the purpose of investigating you for a position, and the information will be protected from unauthorized disclosure. The collection, maintenance, and disclosure of background investigative information are governed by the Privacy Act. The agency that requested the investigation and the agency that conducted the investigation have published notices in the Federal Register describing the systems of records in which your records will be maintained. The information you provide on this form, and information collected during an investigation, may be disclosed without your consent by an agency maintaining the information in a system of records as permitted by the Privacy Act [5 U.S.C. 552a(b)], and by routine uses, a list of which are published by the agency in the Federal Register. The office that gave you this form will provide you a copy of its routine uses.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Office of Personnel Management (OPM) Routine Uses
                 </h2>
-              </div>
-              <div>
                 <p>
                   The Privacy Act routine uses of agencies conducting or requesting investigations, or with authorized custody over your investigative information, commonly include some or all of the following:
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     a.
                   </strong>
                    To designated officers and employees of agencies, offices, and other establishments in the executive, legislative, and judicial branches of the Federal Government or the Government of the District of Columbia having a need to investigate, evaluate, or make a determination regarding loyalty to the United States; qualifications, suitability, or fitness for Government employment or military service; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     b.
                   </strong>
                    To an element of the U.S. Intelligence Community as identified in E.O. 12333, as amended, for use in intelligence activities for the purpose of protecting United States national security interests.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     c.
                   </strong>
                    To any source from which information is requested in the course of an investigation, to the extent necessary to identify the individual, inform the source of the nature and purpose of the investigation, and to identify the type of information requested.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     d.
                   </strong>
                    To the appropriate Federal, state, local, tribal, foreign, or other public authority responsible for investigating, prosecuting, enforcing, or implementing a statute, rule, regulation, or order where OPM becomes aware of an indication of a violation or potential violation of civil or criminal law or regulation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     e.
                   </strong>
                    To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with its current employee’s, contractor employee’s, or military member’s retention; loyalty; qualifications, suitability, or fitness for employment; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     f.
                   </strong>
                    To provide information to a congressional office from the record of an individual in response to an inquiry from the congressional office made at the request of that individual. However, the investigative file, or parts thereof, will only be released to a congressional office if OPM receives a notarized authorization or signed statement under 28 U.S.C. 1746 from the subject of the investigation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     g.
                   </strong>
                    To disclose information to contractors, grantees, or volunteers performing or working on a contract, service, grant, cooperative agreement, or job for the Federal Government.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     h.
                   </strong>
                    For agencies that use adjudicative support services of another agency, at the request of the original agency, the results will be furnished to the agency providing the adjudicative support.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     i.
                   </strong>
                    To provide criminal history record information to the FBI, to help ensure the accuracy and completeness of FBI and OPM records.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     j.
                   </strong>
                    To appropriate agencies, entities, and persons when (1) OPM suspects or has confirmed that there has been a breach of the system of records; (2) OPM has determined that as a result of the suspected or confirmed breach there is a risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security; and (3) the disclosure made to such agencies, entities, and persons is reasonably necessary to assist in connection with OPM’s efforts to respond to the suspected or confirmed breach or to prevent, minimize, or remedy such harm.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     k.
                   </strong>
                    To another Federal agency or Federal entity, when OPM determines that information from this system of records is reasonably necessary to assist the recipient agency or entity in (1) responding to a suspected or confirmed breach or (2) preventing, minimizing, or remedying the risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security, resulting from a suspected or confirmed breach.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     l.
                   </strong>
                    To disclose information to another Federal agency, to a court, or a party in litigation before a court or in an administrative proceeding being conducted by a Federal agency, when the Government is a party to the judicial or administrative proceeding. In those cases where the Government is not a party to the proceeding, records may be disclosed if a subpoena has been signed by a judge.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     m.
                   </strong>
                    To disclose information to the National Archives and Records Administration for use in records management inspections.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     n.
                   </strong>
                    To disclose information to the Department of Justice, or in a proceeding before a court, adjudicative body, or other administrative body before which OPM is authorized to appear, when:
                 </p>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    OPM, or any component thereof; or
-                  </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
-                  <li>
-                    Any employee of OPM in his or her official capacity; or
+                    <p>
+                      OPM, or any component thereof; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    <p>
+                      Any employee of OPM in his or her official capacity; or
+                    </p>
+                  </li>
+                  <li>
+                    <p>
+                      Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    The United States, when OPM determines that litigation is likely to affect OPM or any of its components;
+                    <p>
+                      The United States, when OPM determines that litigation is likely to affect OPM or any of its components;
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <p>
                   is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     o.
                   </strong>
                    For the Merit Systems Protection Board--To disclose information to officials of the Merit Systems Protection Board or the Office of the Special Counsel, when requested in connection with appeals, special studies of the civil service and other merit systems, review of OPM rules and regulations, investigations of alleged or possible prohibited personnel practices, and such other functions, e.g., as promulgated in 5 U.S.C. 1205 and 1206, or as may be authorized by law.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     p.
                   </strong>
                    To disclose information to an agency Equal Employment Opportunity (EEO) office or to the Equal Employment Opportunity Commission when requested in connection with investigations into alleged or possible discrimination practices in the Federal sector, or in the processing of a Federal-sector EEO complaint.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     q.
                   </strong>
                    To disclose information to the Federal Labor Relations Authority or its General Counsel when requested in connection with investigations of allegations of unfair labor practices or matters before the Federal Service Impasses Panel.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     r.
                   </strong>
                    To another Federal agency’s Office of Inspector General when OPM becomes aware of an indication of misconduct or fraud during the applicant’s submission of the standard forms.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     s.
                   </strong>
                    To another Federal agency’s Office of Inspector General in connection with its inspection or audit activity of the investigative or adjudicative processes and procedures of its agency as authorized by the Inspector General Act of 1978, as amended, exclusive of requests for civil or criminal law enforcement activities.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     t.
                   </strong>
                    To a Federal agency or state unemployment compensation office upon its request in order to adjudicate a claim for unemployment compensation benefits when the claim for benefits is made as the result of a qualifications, suitability, fitness, security, identity credential, or access determination.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     u.
                   </strong>
                    To appropriately cleared individuals in Federal agencies, to determine whether information obtained in the course of processing the background investigation is or should be classified.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     v.
                   </strong>
                    To the Office of the Director of National Intelligence for inclusion in its Scattered Castles system in order to facilitate reciprocity of background investigations and security clearances within the intelligence community or assist agencies in obtaining information required by the Federal Investigative Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     w.
                   </strong>
                    To the Director of National Intelligence, or assignee, such information as may be requested and relevant to implement the responsibilities of the Security Executive Agent for personnel security, and pertinent personnel security research and oversight, consistent with law or executive order.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     x.
                   </strong>
                    To Executive Branch Agency insider threat, counterintelligence, and counterterrorism officials to fulfill their responsibilities under applicable Federal law and policy, including but not limited to E.O. 12333, 13587 and the National Insider Threat Policy and Minimum Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     y.
                   </strong>
                    To the appropriate Federal, State, local, tribal, foreign, or other public authority in the event of a natural or manmade disaster. The record will be used to provide leads to assist in locating missing subjects or assist in determining the health and safety of the subject. The record will also be used to assist in identifying victims and locating any surviving next of kin.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     z.
                   </strong>
                    To Federal, State, and local government agencies, if necessary, to obtain information from them which will assist OPM in its responsibilities as the authorized Investigation Service Provider in conducting studies and analyses in support of evaluating and improving the effectiveness and efficiency of the background investigation methodologies.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     aa.
                   </strong>
                    aa. To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with the classifying of jobs, the letting of a contract, or the issuance of a license, grant, or other benefit by the requesting agency, to the extent that the information is relevant and necessary to the requesting agency’s decision on the matter.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Public burden information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Public burden reporting for this collection of information is 
                   <strong>
@@ -5024,74 +4668,52 @@ exports[`App component for the SF86 renders the homepage 1`] = `
                 <h2>
                   Questionnaire for National Security Positions
                 </h2>
-              </div>
-              <div>
                 <p>
                   National Background Investigation System (NBIS) eApp version MAJOR.MINOR.PATCH-IDENTIFIER
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     Follow instructions completely or your form will be unable to be processed. If you have any questions, contact the office that provided you the form.
                   </strong>
                 </p>
-              </div>
-              <div>
                 <h2>
                   Instructions for completing this form
                 </h2>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    <strong>
-                      Follow the instructions provided to you by the office that gave you this form
-                    </strong>
-                     and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                    <p>
+                      <strong>
+                        Follow the instructions provided to you by the office that gave you this form
+                      </strong>
+                       and any other clarifying instructions, provided by that office, to assist you with completion of this form. You should retain a copy of the completed form for your records.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
                   <li>
-                    <strong>
-                      All questions on this form must be answered
-                    </strong>
-                    . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    <p>
+                      <strong>
+                        All questions on this form must be answered
+                      </strong>
+                      . If no response is necessary or applicable, indicate this on the form by checking the associated "Not Applicable" checkbox, unless otherwise noted.
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    <strong>
-                      Do not abbreviate the names of cities or foreign countries
-                    </strong>
-                    .
+                    <p>
+                      <strong>
+                        Do not abbreviate the names of cities or foreign countries
+                      </strong>
+                      .
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    <strong>
-                      All dates provided in this form must be in Month/Day/Year or Month/Year format
-                    </strong>
-                    . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    <p>
+                      <strong>
+                        All dates provided in this form must be in Month/Day/Year or Month/Year format
+                      </strong>
+                      . The year should be entered as a four character number (e.g., 1978 or 2001). If you are unable to report an exact date, approximate or estimate the date to the best of your ability, and indicate this by checking the "Estimated" checkbox.
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <p>
                   All questions on this form must be answered 
                   <strong>
@@ -5103,436 +4725,290 @@ exports[`App component for the SF86 renders the homepage 1`] = `
                   </strong>
                    failure to answer any questions completely and truthfully could result in an adverse personnel action against you, including loss of employment; with respect to these sections: Illegal Use of Drugs and Drug Activity, Use of Information Technology Systems, and Association Record, however, neither your truthful responses nor information derived from those responses will be used as evidence against you in a subsequent criminal proceeding.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   How to save your progress
                 </h2>
-              </div>
-              <div>
                 <p>
                   <strong>
                     This form will auto save your progress continuously throughout.
                   </strong>
                    Each input will be validated and save as you enter your information.
                 </p>
-              </div>
-              <div>
                 <p>
                   To confirm you're auto saving and find out when the last save was check for the save icon on each screen.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Purpose of this form
                 </h2>
-              </div>
-              <div>
                 <p>
                   This form will be used by the United States (U.S.) Government in conducting background investigations, reinvestigations, and continuous evaluations of persons under consideration for, or retention of, national security positions as defined in 5 CFR 732, and for individuals requiring eligibility for access to classified information under Executive Order 12968. This form may also be used by agencies in determining whether a subject performing work for, or on behalf of, the Government under a contract should be deemed eligible for logical or physical access when the nature of the work to be performed is sensitive and could bring about an adverse effect on the national security.
                 </p>
-              </div>
-              <div>
                 <p>
                   Providing this information is voluntary. If you do not provide each item of requested information, however, we will not be able to complete your investigation, which will adversely affect your eligibility for a national security position, eligibility for access to classified information, or logical or physical access. It is imperative that the information provided be true and accurate, to the best of your knowledge. Any information that you provide is evaluated on the basis of its currency, seriousness, relevance to the position and duties, and consistency with all other information about you. Withholding, misrepresenting, or falsifying information may affect your eligibility for access to classified information, eligibility for a sensitive position, or your ability to obtain or retain Federal or contract employment. In addition, withholding, misrepresenting, or falsifying information may affect your eligibility for physical and logical access to federally controlled facilities or information systems. Withholding, misrepresenting, or falsifying information may also negatively affect your employment prospects and job status, and the potential consequences include, but are not limited to, removal, debarment from Federal service, loss of eligibility for access to classified information, or prosecution.
                 </p>
-              </div>
-              <div>
                 <p>
                   This form may become a permanent document that may be used as the basis for future investigations, eligibility determinations for access to classified information, or to hold a sensitive position, suitability or fitness for Federal employment, fitness for contract employment, or eligibility for physical and logical access to federally controlled facilities or information systems. Your responses to this form may be compared with your responses to previous SF-86 questionnaires.
                 </p>
-              </div>
-              <div>
                 <p>
                   The investigation conducted on the basis of information provided on this form may be selected for studies and analyses in support of evaluating and improving the effectiveness and efficiency of the investigative and adjudicative methodologies. All study results released to the general public will delete personal identifiers such as name, Social Security Number, and date and place of birth.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Authority to request this information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Depending upon the purpose of your investigation, the U.S. Government is authorized to ask for this information under Executive Orders 10450, 10865, 12333, and 12968; sections 3301, 3302, and 9101 of title 5, United States Code (U.S.C.); sections 2165 and 2201 of title 42, U.S.C.; chapter 23 of title 50, U.S.C.; and parts 2, 5, 731, 732, and 736 of title 5, Code of Federal Regulations (CFR).
                 </p>
-              </div>
-              <div>
                 <p>
                   Your Social Security Number (SSN) is needed to identify records unique to you. Although disclosure of your SSN is not mandatory, failure to disclose your SSN may prevent or delay the processing of your background investigation. The authority for soliciting and verifying your SSN is Executive Order 9397, as amended by EO 13478.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   The investigative process
                 </h2>
-              </div>
-              <div>
                 <p>
                   Background investigations for national security positions are conducted to gather information to determine whether you are reliable, trustworthy, of good conduct and character, and loyal to the U.S. The information that you provide on this form may be confirmed during the investigation. The investigation may extend beyond the time covered by this form, when necessary to resolve issues. Your current employer may be contacted as part of the investigation, although you may have previously indicated on applications or other forms that you do not want your current employer to be contacted. If you have a security freeze on your consumer or credit report file, then we may not be able to complete your investigation, which can adversely affect your eligibility for a national security position. To avoid such delays, you should request that the consumer reporting agencies lift the freeze in these instances.
                 </p>
-              </div>
-              <div>
                 <p>
                   In addition to the questions on this form, inquiry also is made about your adherence to security requirements, your honesty and integrity, vulnerability to exploitation or coercion, falsification, misrepresentation, and any other behavior, activities, or associations that tend to demonstrate a person is not reliable, trustworthy, or loyal. Federal agency records checks may be conducted on your spouse or legally recognized civil union/domestic partner, cohabitant(s), and immediate family members. After an eligibility determination has been completed, you also may be subject to continuous evaluation, which may include periodic reinvestigations, to determine whether retention in your position is clearly consistent with the interests of national security.
                 </p>
-              </div>
-              <div>
                 <p>
                   The information you provide on this form may be confirmed during the investigation, and may be used for identification purposes throughout the investigation process.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Your personal interview
                 </h2>
-              </div>
-              <div>
                 <p>
                   Some investigations will include an interview with you as a routine part of the investigative process. The investigator may ask you to explain your answers to any question on this form. This provides you the opportunity to update, clarify, and explain information on your form more completely, which often assists in completing your investigation. It is imperative that the interview be conducted as soon as possible after you are contacted. Postponements will delay the processing of your investigation, and declining to be interviewed may result in your investigation being delayed or canceled.
                 </p>
-              </div>
-              <div>
                 <p>
                   For the interview, you will be required to provide photo identification, such as a valid state driver's license. You may be required to provide other documents to verify your identity, as instructed by your investigator. These documents may include certification of any legal name change, Social Security card, passport, and/or your birth certificate. You may also be asked to provide documents regarding information that you provide on this form, or about other matters requiring specific attention. These matters include (a) alien registration or naturalization documentation; (b) delinquent loans or taxes, bankruptcies, judgments, liens, or other financial obligations; (c) agreements involving child custody or support, alimony, or property settlements; (d) arrests, convictions, probation, and/or parole; or (e) other matters described in court records.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Final determination on your eligibility
                 </h2>
-              </div>
-              <div>
                 <p>
                   Final determination on your eligibility for a national security position is the responsibility of the Federal agency that requested your investigation and the agency that conducted your investigation. You will be provided the opportunity to explain, refute, or clarify any information before a final decision is made, if an unfavorable decision is considered. The United States Government does not discriminate on the basis of prohibited categories, including but not limited to race, color, religion, sex (including pregnancy and gender identity), national origin, disability, or sexual orientation when granting access to classified information.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Penalties for inaccurate or false statements
                 </h2>
-              </div>
-              <div>
                 <p>
                   The U.S. Criminal Code (title 18, section 1001) provides that knowingly falsifying or concealing a material fact is a felony which may result in fines and/or up to five (5) years imprisonment. In addition, Federal agencies generally fire, do not grant a security clearance, or disqualify individuals who have materially and deliberately falsified these forms, and this remains a part of the permanent record for future placements. Your prospects of placement or security clearance are better if you answer all questions truthfully and completely. You will have adequate opportunity to explain any information you provide on this form and to make your comments part of the record.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Disclosure information
                 </h2>
-              </div>
-              <div>
                 <p>
                   The information you provide is for the purpose of investigating you for a national security position, and the information will be protected from unauthorized disclosure. The collection, maintenance, and disclosure of background investigative information are governed by the Privacy Act. The agency that requested the investigation and the agency that conducted the investigation have published notices in the Federal Register describing the systems of records in which your records will be maintained. The information you provide on this form, and information collected during an investigation, may be disclosed without your consent by an agency maintaining the information in a system of records as permitted by the Privacy Act [5 U.S.C. 552a(b)], and by routine uses, a list of which are published by the agency in the Federal Register. The office that gave you this form will provide you a copy of its routine uses.
                 </p>
-              </div>
-              <div>
                 <p>
                   You will not receive prior notice of such disclosures under a routine use.
                 </p>
-              </div>
-              <div>
                 <p>
                   In addition to those disclosures generally permitted under the Privacy Act, all or a portion of the records or information you provide on this form or during your investigation may be disclosed outside of OPM as a routine use as outlined below.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Office of Personnel Management (OPM) Routine Uses
                 </h2>
-              </div>
-              <div>
                 <p>
                   OPM has published the following Privacy Act routine uses for its system of records for background investigations:
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     a.
                   </strong>
                    To designated officers and employees of agencies, offices, and other establishments in the executive, legislative, and judicial branches of the Federal Government or the Government of the District of Columbia having a need to investigate, evaluate, or make a determination regarding loyalty to the United States; qualifications, suitability, or fitness for Government employment or military service; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     b.
                   </strong>
                    To an element of the U.S. Intelligence Community as identified in E.O. 12333, as amended, for use in intelligence activities for the purpose of protecting United States national security interests.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     c.
                   </strong>
                    To any source from which information is requested in the course of an investigation, to the extent necessary to identify the individual, inform the source of the nature and purpose of the investigation, and to identify the type of information requested.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     d.
                   </strong>
                    To the appropriate Federal, state, local, tribal, foreign, or other public authority responsible for investigating, prosecuting, enforcing, or implementing a statute, rule, regulation, or order where OPM becomes aware of an indication of a violation or potential violation of civil or criminal law or regulation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     e.
                   </strong>
                    To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with its current employee’s, contractor employee’s, or military member’s retention; loyalty; qualifications, suitability, or fitness for employment; eligibility for logical or physical access to federally-controlled facilities or information systems; eligibility for access to classified information or to hold a sensitive position; qualifications or fitness to perform work for or on behalf of the Government under contract, grant, or other agreement; or access to restricted areas.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     f.
                   </strong>
                    To provide information to a congressional office from the record of an individual in response to an inquiry from the congressional office made at the request of that individual. However, the investigative file, or parts thereof, will only be released to a congressional office if OPM receives a notarized authorization or signed statement under 28 U.S.C. 1746 from the subject of the investigation.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     g.
                   </strong>
                    To disclose information to contractors, grantees, or volunteers performing or working on a contract, service, grant, cooperative agreement, or job for the Federal Government.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     h.
                   </strong>
                    For agencies that use adjudicative support services of another agency, at the request of the original agency, the results will be furnished to the agency providing the adjudicative support.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     i.
                   </strong>
                    To provide criminal history record information to the FBI, to help ensure the accuracy and completeness of FBI and OPM records.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     j.
                   </strong>
                    To appropriate agencies, entities, and persons when (1) OPM suspects or has confirmed that there has been a breach of the system of records; (2) OPM has determined that as a result of the suspected or confirmed breach there is a risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security; and (3) the disclosure made to such agencies, entities, and persons is reasonably necessary to assist in connection with OPM’s efforts to respond to the suspected or confirmed breach or to prevent, minimize, or remedy such harm.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     k.
                   </strong>
                    To another Federal agency or Federal entity, when OPM determines that information from this system of records is reasonably necessary to assist the recipient agency or entity in (1) responding to a suspected or confirmed breach or (2) preventing, minimizing, or remedying the risk of harm to individuals, the agency (including its information systems, programs and operations), the Federal Government, or national security, resulting from a suspected or confirmed breach.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     l.
                   </strong>
                    To disclose information to another Federal agency, to a court, or a party in litigation before a court or in an administrative proceeding being conducted by a Federal agency, when the Government is a party to the judicial or administrative proceeding. In those cases where the Government is not a party to the proceeding, records may be disclosed if a subpoena has been signed by a judge.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     m.
                   </strong>
                    To disclose information to the National Archives and Records Administration for use in records management inspections.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     n.
                   </strong>
                    To disclose information to the Department of Justice, or in a proceeding before a court, adjudicative body, or other administrative body before which OPM is authorized to appear, when:
                 </p>
-              </div>
-              <div>
                 <ol>
                   <li>
-                    OPM, or any component thereof; or
+                    <p>
+                      OPM, or any component thereof; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="2"
-                >
                   <li>
-                    Any employee of OPM in his or her official capacity; or
+                    <p>
+                      Any employee of OPM in his or her official capacity; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="3"
-                >
                   <li>
-                    Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    <p>
+                      Any employee of OPM in his or her individual capacity where the Department of Justice or OPM has agreed to represent the employee; or
+                    </p>
                   </li>
-                </ol>
-              </div>
-              <div>
-                <ol
-                  start="4"
-                >
                   <li>
-                    The United States, when OPM determines that litigation is likely to affect OPM or any of its components; is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
+                    <p>
+                      The United States, when OPM determines that litigation is likely to affect OPM or any of its components; is a party to litigation or has an interest in such litigation, and the use of such records by the Department of Justice or OPM is deemed by OPM to be relevant and necessary to the litigation, provided, however, that the disclosure is compatible with the purpose for which records were collected.
+                    </p>
                   </li>
                 </ol>
-              </div>
-              <div>
                 <p>
                   <strong>
                     o.
                   </strong>
                    For the Merit Systems Protection Board--To disclose information to officials of the Merit Systems Protection Board or the Office of the Special Counsel, when requested in connection with appeals, special studies of the civil service and other merit systems, review of OPM rules and regulations, investigations of alleged or possible prohibited personnel practices, and such other functions, e.g., as promulgated in 5 U.S.C. 1205 and 1206, or as may be authorized by law.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     p.
                   </strong>
                    To disclose information to an agency Equal Employment Opportunity (EEO) office or to the Equal Employment Opportunity Commission when requested in connection with investigations into alleged or possible discrimination practices in the Federal sector, or in the processing of a Federal-sector EEO complaint.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     q.
                   </strong>
                    To disclose information to the Federal Labor Relations Authority or its General Counsel when requested in connection with investigations of allegations of unfair labor practices or matters before the Federal Service Impasses Panel.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     r.
                   </strong>
                    To another Federal agency’s Office of Inspector General when OPM becomes aware of an indication of misconduct or fraud during the applicant’s submission of the standard forms.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     s.
                   </strong>
                    To another Federal agency’s Office of Inspector General in connection with its inspection or audit activity of the investigative or adjudicative processes and procedures of its agency as authorized by the Inspector General Act of 1978, as amended, exclusive of requests for civil or criminal law enforcement activities.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     t.
                   </strong>
                    To a Federal agency or state unemployment compensation office upon its request in order to adjudicate a claim for unemployment compensation benefits when the claim for benefits is made as the result of a qualifications, suitability, fitness, security, identity credential, or access determination.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     u.
                   </strong>
                    To appropriately cleared individuals in Federal agencies, to determine whether information obtained in the course of processing the background investigation is or should be classified.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     v.
                   </strong>
                    To the Office of the Director of National Intelligence for inclusion in its Scattered Castles system in order to facilitate reciprocity of background investigations and security clearances within the intelligence community or assist agencies in obtaining information required by the Federal Investigative Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     w.
                   </strong>
                    To the Director of National Intelligence, or assignee, such information as may be requested and relevant to implement the responsibilities of the Security Executive Agent for personnel security, and pertinent personnel security research and oversight, consistent with law or executive order.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     x.
                   </strong>
                    To Executive Branch Agency insider threat, counterintelligence, and counterterrorism officials to fulfill their responsibilities under applicable Federal law and policy, including but not limited to E.O. 12333, 13587 and the National Insider Threat Policy and Minimum Standards.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     y.
                   </strong>
                    To the appropriate Federal, State, local, tribal, foreign, or other public authority in the event of a natural or manmade disaster. The record will be used to provide leads to assist in locating missing subjects or assist in determining the health and safety of the subject. The record will also be used to assist in identifying victims and locating any surviving next of kin.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     z.
                   </strong>
                    To Federal, State, and local government agencies, if necessary, to obtain information from them which will assist OPM in its responsibilities as the authorized Investigation Service Provider in conducting studies and analyses in support of evaluating and improving the effectiveness and efficiency of the background investigation methodologies.
                 </p>
-              </div>
-              <div>
                 <p>
                   <strong>
                     aa.
                   </strong>
                    To an agency, office, or other establishment in the executive, legislative, or judicial branches of the Federal Government in response to its request, in connection with the classifying of jobs, the letting of a contract, or the issuance of a license, grant, or other benefit by the requesting agency, to the extent that the information is relevant and necessary to the requesting agency’s decision on the matter.
                 </p>
-              </div>
-              <div>
                 <hr />
-              </div>
-              <div>
                 <h2>
                   Public burden information
                 </h2>
-              </div>
-              <div>
                 <p>
                   Public burden reporting for this collection of information is 
                   <strong>
diff --git a/src/components/Navigation/Logout.jsx b/src/components/Navigation/Logout.jsx
index 3b23f525f..6174ddd7a 100644
--- a/src/components/Navigation/Logout.jsx
+++ b/src/components/Navigation/Logout.jsx
@@ -2,7 +2,8 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 
-import { i18n, env } from 'config'
+import { env } from 'config'
+import i18n from 'util/i18n'
 import { logout } from 'actions/AuthActions'
 import { api } from 'services'
 import { saveSection } from 'components/SavedIndicator/persistence-helpers'
diff --git a/src/components/SavedIndicator/SavedIndicator.test.jsx b/src/components/SavedIndicator/SavedIndicator.test.jsx
index ac7363538..3fe444afb 100644
--- a/src/components/SavedIndicator/SavedIndicator.test.jsx
+++ b/src/components/SavedIndicator/SavedIndicator.test.jsx
@@ -4,7 +4,7 @@ import thunk from 'redux-thunk'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import ConnectedSavedIndicator from 'components/SavedIndicator/SavedIndicator'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 describe('The saved indicator component', () => {
   // Setup
diff --git a/src/components/SavedIndicator/persistence-helpers.js b/src/components/SavedIndicator/persistence-helpers.js
index be718cc24..09dc85f39 100644
--- a/src/components/SavedIndicator/persistence-helpers.js
+++ b/src/components/SavedIndicator/persistence-helpers.js
@@ -3,7 +3,7 @@ import { updateApplication } from '../../actions/ApplicationActions'
 import sectionData from '../Section/sectionData'
 import schema from '../../schema'
 import { api } from '../../services'
-import { i18n } from '../../config'
+import i18n from 'util/i18n'
 
 export const saveSection = (application, section, subsection, dispatch) => {
   const pending = sectionData(section, subsection, application) || []
diff --git a/src/components/Section/Citizenship/Citizenship.jsx b/src/components/Section/Citizenship/Citizenship.jsx
index 7b2690ae4..f2cbddfff 100644
--- a/src/components/Section/Citizenship/Citizenship.jsx
+++ b/src/components/Section/Citizenship/Citizenship.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Route } from 'react-router'
 import { connect } from 'react-redux'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
 import { CITIZENSHIP } from 'constants/sections'
diff --git a/src/components/Section/Citizenship/Multiple/CitizenshipItem.jsx b/src/components/Section/Citizenship/Multiple/CitizenshipItem.jsx
index e5f322663..773f89305 100644
--- a/src/components/Section/Citizenship/Multiple/CitizenshipItem.jsx
+++ b/src/components/Section/Citizenship/Multiple/CitizenshipItem.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import {
   ValidationElement,
diff --git a/src/components/Section/Citizenship/Multiple/Multiple.jsx b/src/components/Section/Citizenship/Multiple/Multiple.jsx
index 63191c981..537530670 100644
--- a/src/components/Section/Citizenship/Multiple/Multiple.jsx
+++ b/src/components/Section/Citizenship/Multiple/Multiple.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { countryString } from 'validators/location'
 import {
   Branch,
diff --git a/src/components/Section/Citizenship/Multiple/Passports.jsx b/src/components/Section/Citizenship/Multiple/Passports.jsx
index 39bed895b..7024c3d8d 100644
--- a/src/components/Section/Citizenship/Multiple/Passports.jsx
+++ b/src/components/Section/Citizenship/Multiple/Passports.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { BranchCollection } from 'components/Form'
 import {
   CITIZENSHIP,
diff --git a/src/components/Section/Citizenship/Multiple/TravelItem.jsx b/src/components/Section/Citizenship/Multiple/TravelItem.jsx
index 9e1576d1b..b9911b984 100644
--- a/src/components/Section/Citizenship/Multiple/TravelItem.jsx
+++ b/src/components/Section/Citizenship/Multiple/TravelItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, Country, DateRange } from '../../../Form'
 
 export default class TravelItem extends ValidationElement {
diff --git a/src/components/Section/Citizenship/Status/Status.jsx b/src/components/Section/Citizenship/Status/Status.jsx
index 85f291873..ec375cc2e 100644
--- a/src/components/Section/Citizenship/Status/Status.jsx
+++ b/src/components/Section/Citizenship/Status/Status.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { alphaNumericRegEx, validGenericTextfield } from 'validators/helpers'
 import { isDocumentRequired, isCertificateRequired } from 'validators/citizenship'
 import {
diff --git a/src/components/Section/Citizenship/UsPassport/index.jsx b/src/components/Section/Citizenship/UsPassport/index.jsx
index 3dd0eee23..3cca5a510 100644
--- a/src/components/Section/Citizenship/UsPassport/index.jsx
+++ b/src/components/Section/Citizenship/UsPassport/index.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import {
   Field,
   Show,
diff --git a/src/components/Section/Financial/Bankruptcy/Bankruptcies.jsx b/src/components/Section/Financial/Bankruptcy/Bankruptcies.jsx
index e5ae1d898..211600df0 100644
--- a/src/components/Section/Financial/Bankruptcy/Bankruptcies.jsx
+++ b/src/components/Section/Financial/Bankruptcy/Bankruptcies.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { Branch, Show, Accordion } from 'components/Form'
 import { Summary, AddressSummary, DateSummary } from 'components/Summary'
diff --git a/src/components/Section/Financial/Bankruptcy/Bankruptcy.jsx b/src/components/Section/Financial/Bankruptcy/Bankruptcy.jsx
index ea187f1e0..d82b7bfaa 100644
--- a/src/components/Section/Financial/Bankruptcy/Bankruptcy.jsx
+++ b/src/components/Section/Financial/Bankruptcy/Bankruptcy.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/Financial/Card/Card.jsx b/src/components/Section/Financial/Card/Card.jsx
index 89058b496..ac7235b30 100644
--- a/src/components/Section/Financial/Card/Card.jsx
+++ b/src/components/Section/Financial/Card/Card.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { Branch, Show, Accordion } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
diff --git a/src/components/Section/Financial/Card/CardItem.jsx b/src/components/Section/Financial/Card/CardItem.jsx
index f3c56c8a8..78a62a147 100644
--- a/src/components/Section/Financial/Card/CardItem.jsx
+++ b/src/components/Section/Financial/Card/CardItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateControl,
diff --git a/src/components/Section/Financial/Credit/Credit.jsx b/src/components/Section/Financial/Credit/Credit.jsx
index e49067c6f..11f54fca8 100644
--- a/src/components/Section/Financial/Credit/Credit.jsx
+++ b/src/components/Section/Financial/Credit/Credit.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { Branch, Show, Accordion } from 'components/Form'
 import { Summary } from 'components/Summary'
diff --git a/src/components/Section/Financial/Credit/CreditItem.jsx b/src/components/Section/Financial/Credit/CreditItem.jsx
index 971a8c7f4..22aed661b 100644
--- a/src/components/Section/Financial/Credit/CreditItem.jsx
+++ b/src/components/Section/Financial/Credit/CreditItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Financial/Financial.jsx b/src/components/Section/Financial/Financial.jsx
index 9c9aa6fad..81dd1b1a9 100644
--- a/src/components/Section/Financial/Financial.jsx
+++ b/src/components/Section/Financial/Financial.jsx
@@ -4,7 +4,7 @@ import { Route } from 'react-router'
 import { connect } from 'react-redux'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
diff --git a/src/components/Section/Financial/Gambling/GamblingItem.jsx b/src/components/Section/Financial/Gambling/GamblingItem.jsx
index f11d8c81f..39446a8c6 100644
--- a/src/components/Section/Financial/Gambling/GamblingItem.jsx
+++ b/src/components/Section/Financial/Gambling/GamblingItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateRange,
diff --git a/src/components/Section/Financial/Nonpayment/Infractions.jsx b/src/components/Section/Financial/Nonpayment/Infractions.jsx
index 898764205..a379d8009 100644
--- a/src/components/Section/Financial/Nonpayment/Infractions.jsx
+++ b/src/components/Section/Financial/Nonpayment/Infractions.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, CheckboxGroup, Checkbox } from '../../../Form'
 
 export default class Infractions extends ValidationElement {
diff --git a/src/components/Section/Financial/Nonpayment/Nonpayment.jsx b/src/components/Section/Financial/Nonpayment/Nonpayment.jsx
index 606606e55..7d8ea34f8 100644
--- a/src/components/Section/Financial/Nonpayment/Nonpayment.jsx
+++ b/src/components/Section/Financial/Nonpayment/Nonpayment.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { Summary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
diff --git a/src/components/Section/Financial/Nonpayment/NonpaymentItem.jsx b/src/components/Section/Financial/Nonpayment/NonpaymentItem.jsx
index cc5cf555a..7bc3b00cd 100644
--- a/src/components/Section/Financial/Nonpayment/NonpaymentItem.jsx
+++ b/src/components/Section/Financial/Nonpayment/NonpaymentItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateControl,
diff --git a/src/components/Section/Financial/Taxes/FailureType.jsx b/src/components/Section/Financial/Taxes/FailureType.jsx
index 9ba8c98a0..212ec2548 100644
--- a/src/components/Section/Financial/Taxes/FailureType.jsx
+++ b/src/components/Section/Financial/Taxes/FailureType.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, RadioGroup, Radio } from '../../../Form'
 
 export default class FailureType extends ValidationElement {
diff --git a/src/components/Section/Financial/Taxes/TaxesItem.jsx b/src/components/Section/Financial/Taxes/TaxesItem.jsx
index f744b8053..3bbd4e69e 100644
--- a/src/components/Section/Financial/Taxes/TaxesItem.jsx
+++ b/src/components/Section/Financial/Taxes/TaxesItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateControl,
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/Benefit.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/Benefit.jsx
index 9647ec7a2..5045f2051 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/Benefit.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/Benefit.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/BenefitActivity.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/BenefitActivity.jsx
index 9fb646aa5..c986f8dde 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/BenefitActivity.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/BenefitActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import { FOREIGN, FOREIGN_ACTIVITIES_BENEFITS } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/ContinuingBenefit.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/ContinuingBenefit.jsx
index c7f25fbca..de793974e 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/ContinuingBenefit.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/ContinuingBenefit.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/FutureBenefit.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/FutureBenefit.jsx
index 8f5447b31..bd9709b77 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/FutureBenefit.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/FutureBenefit.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/OneTimeBenefit.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/OneTimeBenefit.jsx
index 23dd27501..f409ecbbb 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/OneTimeBenefit.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/OneTimeBenefit.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/BenefitActivity/OtherBenefit.jsx b/src/components/Section/Foreign/Activities/BenefitActivity/OtherBenefit.jsx
index cae775f4a..59b26c71e 100644
--- a/src/components/Section/Foreign/Activities/BenefitActivity/OtherBenefit.jsx
+++ b/src/components/Section/Foreign/Activities/BenefitActivity/OtherBenefit.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import PropTypes from 'prop-types'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, Textarea } from '../../../../Form'
 import ContinuingBenefit from './ContinuingBenefit'
 
diff --git a/src/components/Section/Foreign/Activities/CoOwner.jsx b/src/components/Section/Foreign/Activities/CoOwner.jsx
index 86f0b8489..df7857b07 100644
--- a/src/components/Section/Foreign/Activities/CoOwner.jsx
+++ b/src/components/Section/Foreign/Activities/CoOwner.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Activities/CoOwners.jsx b/src/components/Section/Foreign/Activities/CoOwners.jsx
index 25efa2eea..fea4c65aa 100644
--- a/src/components/Section/Foreign/Activities/CoOwners.jsx
+++ b/src/components/Section/Foreign/Activities/CoOwners.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, BranchCollection } from '../../../Form'
 import CoOwner from './CoOwner'
 
diff --git a/src/components/Section/Foreign/Activities/DirectActivity/DirectActivity.jsx b/src/components/Section/Foreign/Activities/DirectActivity/DirectActivity.jsx
index bd0e30261..7c8a008c8 100644
--- a/src/components/Section/Foreign/Activities/DirectActivity/DirectActivity.jsx
+++ b/src/components/Section/Foreign/Activities/DirectActivity/DirectActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import { FOREIGN, FOREIGN_ACTIVITIES_DIRECT } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Activities/DirectActivity/DirectInterest.jsx b/src/components/Section/Foreign/Activities/DirectActivity/DirectInterest.jsx
index 7606b97ae..2a0be8765 100644
--- a/src/components/Section/Foreign/Activities/DirectActivity/DirectInterest.jsx
+++ b/src/components/Section/Foreign/Activities/DirectActivity/DirectInterest.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/IndirectActivity/IndirectActivity.jsx b/src/components/Section/Foreign/Activities/IndirectActivity/IndirectActivity.jsx
index 5819242b0..1fc39d190 100644
--- a/src/components/Section/Foreign/Activities/IndirectActivity/IndirectActivity.jsx
+++ b/src/components/Section/Foreign/Activities/IndirectActivity/IndirectActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import { FOREIGN, FOREIGN_ACTIVITIES_INDIRECT } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Activities/IndirectActivity/IndirectInterest.jsx b/src/components/Section/Foreign/Activities/IndirectActivity/IndirectInterest.jsx
index 1a34339b8..6cc0dbb7e 100644
--- a/src/components/Section/Foreign/Activities/IndirectActivity/IndirectInterest.jsx
+++ b/src/components/Section/Foreign/Activities/IndirectActivity/IndirectInterest.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateActivity.jsx b/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateActivity.jsx
index 544da16fb..e0afe6d97 100644
--- a/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateActivity.jsx
+++ b/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, AddressSummary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import { FOREIGN, FOREIGN_ACTIVITIES_REAL_ESTATE } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateInterest.jsx b/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateInterest.jsx
index 4d59f063e..6e88957a5 100644
--- a/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateInterest.jsx
+++ b/src/components/Section/Foreign/Activities/RealEstateActivity/RealEstateInterest.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Currency,
diff --git a/src/components/Section/Foreign/Activities/Support.jsx b/src/components/Section/Foreign/Activities/Support.jsx
index fec07c353..e73202a29 100644
--- a/src/components/Section/Foreign/Activities/Support.jsx
+++ b/src/components/Section/Foreign/Activities/Support.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_ACTIVITIES_SUPPORT } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Activities/SupportItem.jsx b/src/components/Section/Foreign/Activities/SupportItem.jsx
index 5dd55110b..62eea61eb 100644
--- a/src/components/Section/Foreign/Activities/SupportItem.jsx
+++ b/src/components/Section/Foreign/Activities/SupportItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Name,
diff --git a/src/components/Section/Foreign/Business/Advice.jsx b/src/components/Section/Foreign/Business/Advice.jsx
index b6f1356bc..31cf94c47 100644
--- a/src/components/Section/Foreign/Business/Advice.jsx
+++ b/src/components/Section/Foreign/Business/Advice.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_ADVICE } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/AdviceItem.jsx b/src/components/Section/Foreign/Business/AdviceItem.jsx
index 86f98ee38..c25dcc05e 100644
--- a/src/components/Section/Foreign/Business/AdviceItem.jsx
+++ b/src/components/Section/Foreign/Business/AdviceItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Name,
diff --git a/src/components/Section/Foreign/Business/ConferenceContacts.jsx b/src/components/Section/Foreign/Business/ConferenceContacts.jsx
index 02041ea02..86334f6e8 100644
--- a/src/components/Section/Foreign/Business/ConferenceContacts.jsx
+++ b/src/components/Section/Foreign/Business/ConferenceContacts.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Business/Conferences.jsx b/src/components/Section/Foreign/Business/Conferences.jsx
index 21637993a..fb3bfba3f 100644
--- a/src/components/Section/Foreign/Business/Conferences.jsx
+++ b/src/components/Section/Foreign/Business/Conferences.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_CONFERENCES } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/ConferencesItem.jsx b/src/components/Section/Foreign/Business/ConferencesItem.jsx
index 185effcde..64bd6be31 100644
--- a/src/components/Section/Foreign/Business/ConferencesItem.jsx
+++ b/src/components/Section/Foreign/Business/ConferencesItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Business/Contact.jsx b/src/components/Section/Foreign/Business/Contact.jsx
index a30dc5d9c..5ec77f5d1 100644
--- a/src/components/Section/Foreign/Business/Contact.jsx
+++ b/src/components/Section/Foreign/Business/Contact.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameText, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_CONTACT } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/ContactItem.jsx b/src/components/Section/Foreign/Business/ContactItem.jsx
index 788d2fa18..6856a02a2 100644
--- a/src/components/Section/Foreign/Business/ContactItem.jsx
+++ b/src/components/Section/Foreign/Business/ContactItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Business/Employment.jsx b/src/components/Section/Foreign/Business/Employment.jsx
index be4082d77..259b70ae0 100644
--- a/src/components/Section/Foreign/Business/Employment.jsx
+++ b/src/components/Section/Foreign/Business/Employment.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_EMPLOYMENT } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/Family.jsx b/src/components/Section/Foreign/Business/Family.jsx
index 2a3fb728b..da1d93dfb 100644
--- a/src/components/Section/Foreign/Business/Family.jsx
+++ b/src/components/Section/Foreign/Business/Family.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_FAMILY } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/FamilyItem.jsx b/src/components/Section/Foreign/Business/FamilyItem.jsx
index cdd8fe52c..9c12bfbc3 100644
--- a/src/components/Section/Foreign/Business/FamilyItem.jsx
+++ b/src/components/Section/Foreign/Business/FamilyItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Name,
diff --git a/src/components/Section/Foreign/Business/JobOffer.jsx b/src/components/Section/Foreign/Business/JobOffer.jsx
index d0b4deb2f..c6260a426 100644
--- a/src/components/Section/Foreign/Business/JobOffer.jsx
+++ b/src/components/Section/Foreign/Business/JobOffer.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/Foreign/Business/Political.jsx b/src/components/Section/Foreign/Business/Political.jsx
index 50443b488..8a5297299 100644
--- a/src/components/Section/Foreign/Business/Political.jsx
+++ b/src/components/Section/Foreign/Business/Political.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_POLITICAL } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/PoliticalItem.jsx b/src/components/Section/Foreign/Business/PoliticalItem.jsx
index 1866e8b31..3cc57f76e 100644
--- a/src/components/Section/Foreign/Business/PoliticalItem.jsx
+++ b/src/components/Section/Foreign/Business/PoliticalItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Business/Sponsorship.jsx b/src/components/Section/Foreign/Business/Sponsorship.jsx
index a71f2d09c..46d324678 100644
--- a/src/components/Section/Foreign/Business/Sponsorship.jsx
+++ b/src/components/Section/Foreign/Business/Sponsorship.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameSummary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_SPONSORSHIP } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/Sponsorship.test.jsx b/src/components/Section/Foreign/Business/Sponsorship.test.jsx
index c0e4a0fae..907b522dc 100644
--- a/src/components/Section/Foreign/Business/Sponsorship.test.jsx
+++ b/src/components/Section/Foreign/Business/Sponsorship.test.jsx
@@ -3,7 +3,7 @@ import { mount } from 'enzyme'
 import configureMockStore from 'redux-mock-store'
 import { Provider } from 'react-redux'
 import { Sponsorship } from './Sponsorship'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 
 describe('The foreign business sponsorship component', () => {
   const mockStore = configureMockStore()
diff --git a/src/components/Section/Foreign/Business/SponsorshipItem.jsx b/src/components/Section/Foreign/Business/SponsorshipItem.jsx
index 8ddfc67fb..e0a838fb8 100644
--- a/src/components/Section/Foreign/Business/SponsorshipItem.jsx
+++ b/src/components/Section/Foreign/Business/SponsorshipItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { pickDate } from '../../../../validators/helpers'
 import {
   ValidationElement,
diff --git a/src/components/Section/Foreign/Business/SubsequentContacts.jsx b/src/components/Section/Foreign/Business/SubsequentContacts.jsx
index 73264d66c..17f0d4c5e 100644
--- a/src/components/Section/Foreign/Business/SubsequentContacts.jsx
+++ b/src/components/Section/Foreign/Business/SubsequentContacts.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   BranchCollection,
diff --git a/src/components/Section/Foreign/Business/Ventures.jsx b/src/components/Section/Foreign/Business/Ventures.jsx
index 83b98229b..0506e723f 100644
--- a/src/components/Section/Foreign/Business/Ventures.jsx
+++ b/src/components/Section/Foreign/Business/Ventures.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_VENTURES } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/VenturesItem.jsx b/src/components/Section/Foreign/Business/VenturesItem.jsx
index ed585175e..b71cfd1ea 100644
--- a/src/components/Section/Foreign/Business/VenturesItem.jsx
+++ b/src/components/Section/Foreign/Business/VenturesItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Business/Voting.jsx b/src/components/Section/Foreign/Business/Voting.jsx
index 077d89eec..2225cd5a3 100644
--- a/src/components/Section/Foreign/Business/Voting.jsx
+++ b/src/components/Section/Foreign/Business/Voting.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_BUSINESS_VOTING } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Business/VotingItem.jsx b/src/components/Section/Foreign/Business/VotingItem.jsx
index 1ad81da6f..6fe30696b 100644
--- a/src/components/Section/Foreign/Business/VotingItem.jsx
+++ b/src/components/Section/Foreign/Business/VotingItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Foreign/Contacts/Contacts.jsx b/src/components/Section/Foreign/Contacts/Contacts.jsx
index 915454d5d..87ba50258 100644
--- a/src/components/Section/Foreign/Contacts/Contacts.jsx
+++ b/src/components/Section/Foreign/Contacts/Contacts.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, NameSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_CONTACTS } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Contacts/Contacts.test.jsx b/src/components/Section/Foreign/Contacts/Contacts.test.jsx
index 37f53ad02..c06c79b91 100644
--- a/src/components/Section/Foreign/Contacts/Contacts.test.jsx
+++ b/src/components/Section/Foreign/Contacts/Contacts.test.jsx
@@ -3,7 +3,7 @@ import { mount } from 'enzyme'
 import configureMockStore from 'redux-mock-store'
 import { Provider } from 'react-redux'
 import { Contacts } from './Contacts'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 
 describe('The contacts component', () => {
   const mockStore = configureMockStore()
diff --git a/src/components/Section/Foreign/Contacts/ForeignNational.jsx b/src/components/Section/Foreign/Contacts/ForeignNational.jsx
index 5c9212ac4..70f4311d4 100644
--- a/src/components/Section/Foreign/Contacts/ForeignNational.jsx
+++ b/src/components/Section/Foreign/Contacts/ForeignNational.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import classNames from 'classnames'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { pickDate } from 'validators/helpers'
 import {
   ValidationElement,
diff --git a/src/components/Section/Foreign/Foreign.jsx b/src/components/Section/Foreign/Foreign.jsx
index 478728e98..1ae061806 100644
--- a/src/components/Section/Foreign/Foreign.jsx
+++ b/src/components/Section/Foreign/Foreign.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { Route } from 'react-router'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import * as formTypes from 'config/formTypes'
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
diff --git a/src/components/Section/Foreign/Travel/Travel.jsx b/src/components/Section/Foreign/Travel/Travel.jsx
index 285b02f7f..e506786c0 100644
--- a/src/components/Section/Foreign/Travel/Travel.jsx
+++ b/src/components/Section/Foreign/Travel/Travel.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Branch, Show, Accordion } from 'components/Form'
 import { FOREIGN, FOREIGN_TRAVEL } from 'config/formSections/foreign'
diff --git a/src/components/Section/Foreign/Travel/TravelDays.jsx b/src/components/Section/Foreign/Travel/TravelDays.jsx
index 712b74e9b..6b8a65def 100644
--- a/src/components/Section/Foreign/Travel/TravelDays.jsx
+++ b/src/components/Section/Foreign/Travel/TravelDays.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, RadioGroup, Radio } from '../../../Form'
 
 export default class TravelDays extends ValidationElement {
diff --git a/src/components/Section/Foreign/Travel/TravelPurpose.jsx b/src/components/Section/Foreign/Travel/TravelPurpose.jsx
index fd885ec1f..250f497bc 100644
--- a/src/components/Section/Foreign/Travel/TravelPurpose.jsx
+++ b/src/components/Section/Foreign/Travel/TravelPurpose.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, CheckboxGroup, Checkbox } from '../../../Form'
 
 export default class TravelPurpose extends ValidationElement {
diff --git a/src/components/Section/Foreign/Travel/TravelQuestions.jsx b/src/components/Section/Foreign/Travel/TravelQuestions.jsx
index 7993a62fe..b3d62cb1d 100644
--- a/src/components/Section/Foreign/Travel/TravelQuestions.jsx
+++ b/src/components/Section/Foreign/Travel/TravelQuestions.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/History/Education/Diploma.jsx b/src/components/Section/History/Education/Diploma.jsx
index b7570dc19..17a3c7931 100644
--- a/src/components/Section/History/Education/Diploma.jsx
+++ b/src/components/Section/History/Education/Diploma.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateControl,
diff --git a/src/components/Section/History/Employment/AdditionalActivity.jsx b/src/components/Section/History/Employment/AdditionalActivity.jsx
index 26be3393d..5c5339e0f 100644
--- a/src/components/Section/History/Employment/AdditionalActivity.jsx
+++ b/src/components/Section/History/Employment/AdditionalActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Show,
diff --git a/src/components/Section/History/Employment/EmploymentActivity.jsx b/src/components/Section/History/Employment/EmploymentActivity.jsx
index d300a59c3..d1b17f4c0 100644
--- a/src/components/Section/History/Employment/EmploymentActivity.jsx
+++ b/src/components/Section/History/Employment/EmploymentActivity.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Textarea,
diff --git a/src/components/Section/History/Employment/EmploymentStatus.jsx b/src/components/Section/History/Employment/EmploymentStatus.jsx
index 5e89765b2..6f15b184f 100644
--- a/src/components/Section/History/Employment/EmploymentStatus.jsx
+++ b/src/components/Section/History/Employment/EmploymentStatus.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Radio, RadioGroup } from '../../../Form'
 
 export default class EmploymentStatus extends ValidationElement {
diff --git a/src/components/Section/History/Employment/EmploymentSummaryProgress.jsx b/src/components/Section/History/Employment/EmploymentSummaryProgress.jsx
index 2aa439fe2..f734d8a18 100644
--- a/src/components/Section/History/Employment/EmploymentSummaryProgress.jsx
+++ b/src/components/Section/History/Employment/EmploymentSummaryProgress.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import SummaryProgress from 'components/Section/History/SummaryProgress'
 import { Svg } from 'components/Form'
diff --git a/src/components/Section/History/Employment/PhysicalAddress.jsx b/src/components/Section/History/Employment/PhysicalAddress.jsx
index 956aca396..07f874de0 100644
--- a/src/components/Section/History/Employment/PhysicalAddress.jsx
+++ b/src/components/Section/History/Employment/PhysicalAddress.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/History/Employment/ReasonLeft.test.jsx b/src/components/Section/History/Employment/ReasonLeft.test.jsx
index 84061ec6f..d16dd3b8d 100644
--- a/src/components/Section/History/Employment/ReasonLeft.test.jsx
+++ b/src/components/Section/History/Employment/ReasonLeft.test.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import configureMockStore from 'redux-mock-store'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { today, daysAgo } from '../dateranges'
 import ReasonLeft from './ReasonLeft'
 
diff --git a/src/components/Section/History/Employment/ReasonOptions.jsx b/src/components/Section/History/Employment/ReasonOptions.jsx
index c354d4601..c645f0190 100644
--- a/src/components/Section/History/Employment/ReasonOptions.jsx
+++ b/src/components/Section/History/Employment/ReasonOptions.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   Radio,
diff --git a/src/components/Section/History/Employment/ReprimandItem.jsx b/src/components/Section/History/Employment/ReprimandItem.jsx
index 77dde7ef3..286784785 100644
--- a/src/components/Section/History/Employment/ReprimandItem.jsx
+++ b/src/components/Section/History/Employment/ReprimandItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, Textarea, DateControl } from '../../../Form'
 
 export default class ReprimandItem extends ValidationElement {
diff --git a/src/components/Section/History/Employment/Supervisor.jsx b/src/components/Section/History/Employment/Supervisor.jsx
index 7d47fd5cc..9b38e4aeb 100644
--- a/src/components/Section/History/Employment/Supervisor.jsx
+++ b/src/components/Section/History/Employment/Supervisor.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Email,
diff --git a/src/components/Section/History/Federal/FederalItem.jsx b/src/components/Section/History/Federal/FederalItem.jsx
index 6b19e0c19..66a04df4a 100644
--- a/src/components/Section/History/Federal/FederalItem.jsx
+++ b/src/components/Section/History/Federal/FederalItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/History/Residence/ResidenceSummaryProgress.jsx b/src/components/Section/History/Residence/ResidenceSummaryProgress.jsx
index eeaccff87..ae2a27122 100644
--- a/src/components/Section/History/Residence/ResidenceSummaryProgress.jsx
+++ b/src/components/Section/History/Residence/ResidenceSummaryProgress.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import SummaryProgress from 'components/Section/History/SummaryProgress'
 import { Svg } from 'components/Form'
diff --git a/src/components/Section/History/Review.jsx b/src/components/Section/History/Review.jsx
index a13e4748d..61b77b00c 100644
--- a/src/components/Section/History/Review.jsx
+++ b/src/components/Section/History/Review.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import {
   HISTORY,
   HISTORY_RESIDENCE,
diff --git a/src/components/Section/History/SummaryCounter/SummaryCounter.jsx b/src/components/Section/History/SummaryCounter/SummaryCounter.jsx
index 2c563f430..5135c9bd5 100644
--- a/src/components/Section/History/SummaryCounter/SummaryCounter.jsx
+++ b/src/components/Section/History/SummaryCounter/SummaryCounter.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import classnames from 'classnames'
 
 import { Svg } from 'components/Form'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 const SummaryCounter = (props) => {
   const {
diff --git a/src/components/Section/History/summaries.jsx b/src/components/Section/History/summaries.jsx
index ddb5a02b0..d4128d263 100644
--- a/src/components/Section/History/summaries.jsx
+++ b/src/components/Section/History/summaries.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { gaps, extractDate } from 'components/Section/History/dateranges'
 import { Svg } from 'components/Form'
 import { newGuid } from 'components/Form/ValidationElement'
diff --git a/src/components/Section/Identification/ApplicantBirthDate/ApplicantBirthDate.jsx b/src/components/Section/Identification/ApplicantBirthDate/ApplicantBirthDate.jsx
index f9707391c..97c2eb94a 100644
--- a/src/components/Section/Identification/ApplicantBirthDate/ApplicantBirthDate.jsx
+++ b/src/components/Section/Identification/ApplicantBirthDate/ApplicantBirthDate.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { TODAY } from '../../../../constants/dateLimits'
 import {
   Field, DateControl, Show, Checkbox,
@@ -78,7 +78,7 @@ export class ApplicantBirthDate extends Subsection {
     const hasMinError = local.some(
       x => (x.valid === false) && (x.code === 'date.min')
     )
-    
+
     //too young
     const hasMaxError = local.some(
       x => (x.valid === false) && (x.code === 'date.max')
@@ -145,7 +145,7 @@ export class ApplicantBirthDate extends Subsection {
             name="birthdate"
             {...this.props.Date}
             relationship="Self"
-            
+
             maxDate={TODAY}
             overrideError={(this.props.Confirmed || {}).checked}
             onUpdate={this.updateDate}
diff --git a/src/components/Section/Identification/ApplicantBirthPlace/ApplicantBirthPlace.jsx b/src/components/Section/Identification/ApplicantBirthPlace/ApplicantBirthPlace.jsx
index f1054fcbe..3c7892e79 100644
--- a/src/components/Section/Identification/ApplicantBirthPlace/ApplicantBirthPlace.jsx
+++ b/src/components/Section/Identification/ApplicantBirthPlace/ApplicantBirthPlace.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Location, Field } from 'components/Form'
 
 import {
diff --git a/src/components/Section/Identification/ApplicantName/ApplicantName.jsx b/src/components/Section/Identification/ApplicantName/ApplicantName.jsx
index 238167104..799ac4208 100644
--- a/src/components/Section/Identification/ApplicantName/ApplicantName.jsx
+++ b/src/components/Section/Identification/ApplicantName/ApplicantName.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { Name, Field } from 'components/Form'
 
diff --git a/src/components/Section/Identification/ApplicantSSN/ApplicantSSN.jsx b/src/components/Section/Identification/ApplicantSSN/ApplicantSSN.jsx
index c26e250aa..8e062ba3e 100644
--- a/src/components/Section/Identification/ApplicantSSN/ApplicantSSN.jsx
+++ b/src/components/Section/Identification/ApplicantSSN/ApplicantSSN.jsx
@@ -1,7 +1,7 @@
 
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { validSSN } from 'validators/helpers'
 
 import { Field, SSN, Show } from 'components/Form'
diff --git a/src/components/Section/Identification/ContactInformation/ContactInformation.jsx b/src/components/Section/Identification/ContactInformation/ContactInformation.jsx
index 1f3dc986d..9c7ae3301 100644
--- a/src/components/Section/Identification/ContactInformation/ContactInformation.jsx
+++ b/src/components/Section/Identification/ContactInformation/ContactInformation.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import {
   Field,
diff --git a/src/components/Section/Identification/Identification.jsx b/src/components/Section/Identification/Identification.jsx
index fe2eb9f2c..734b01791 100644
--- a/src/components/Section/Identification/Identification.jsx
+++ b/src/components/Section/Identification/Identification.jsx
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types'
 import { Route } from 'react-router'
 import { connect } from 'react-redux'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
diff --git a/src/components/Section/Identification/OtherNames/OtherNameItem.jsx b/src/components/Section/Identification/OtherNames/OtherNameItem.jsx
index 6047ca24f..205aec435 100644
--- a/src/components/Section/Identification/OtherNames/OtherNameItem.jsx
+++ b/src/components/Section/Identification/OtherNames/OtherNameItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { Field, MaidenName, Name, Textarea, DateRange } from '../../../Form'
 
 export default class OtherNameItem extends React.Component {
diff --git a/src/components/Section/Identification/OtherNames/OtherNames.jsx b/src/components/Section/Identification/OtherNames/OtherNames.jsx
index 7071cf592..32508ebbd 100644
--- a/src/components/Section/Identification/OtherNames/OtherNames.jsx
+++ b/src/components/Section/Identification/OtherNames/OtherNames.jsx
@@ -1,7 +1,7 @@
 
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import {
   Field,
diff --git a/src/components/Section/Identification/Physical/Physical.jsx b/src/components/Section/Identification/Physical/Physical.jsx
index 17528d981..79afdc7ba 100644
--- a/src/components/Section/Identification/Physical/Physical.jsx
+++ b/src/components/Section/Identification/Physical/Physical.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import {
   Field, Height, Weight, HairColor, EyeColor, Sex,
diff --git a/src/components/Section/Legal/Associations/ActivitiesToOverthrow.jsx b/src/components/Section/Legal/Associations/ActivitiesToOverthrow.jsx
index 885ef0da1..264d0bbe0 100644
--- a/src/components/Section/Legal/Associations/ActivitiesToOverthrow.jsx
+++ b/src/components/Section/Legal/Associations/ActivitiesToOverthrow.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Associations/ActivitiesToOverthrowItem.jsx b/src/components/Section/Legal/Associations/ActivitiesToOverthrowItem.jsx
index 282b50c76..fd43d3211 100644
--- a/src/components/Section/Legal/Associations/ActivitiesToOverthrowItem.jsx
+++ b/src/components/Section/Legal/Associations/ActivitiesToOverthrowItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, DateRange, Textarea } from '../../../Form'
 
 export default class ActivitiesToOverthrowItem extends ValidationElement {
diff --git a/src/components/Section/Legal/Associations/Advocating.jsx b/src/components/Section/Legal/Associations/Advocating.jsx
index e567a18f5..ab37b539d 100644
--- a/src/components/Section/Legal/Associations/Advocating.jsx
+++ b/src/components/Section/Legal/Associations/Advocating.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Associations/AdvocatingItem.jsx b/src/components/Section/Legal/Associations/AdvocatingItem.jsx
index 79d88add1..1d337732a 100644
--- a/src/components/Section/Legal/Associations/AdvocatingItem.jsx
+++ b/src/components/Section/Legal/Associations/AdvocatingItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, DateRange, Textarea } from '../../../Form'
 
 export default class AdvocatingItem extends ValidationElement {
diff --git a/src/components/Section/Legal/Associations/EngagedInTerrorism.jsx b/src/components/Section/Legal/Associations/EngagedInTerrorism.jsx
index 29f4fd644..8389ea068 100644
--- a/src/components/Section/Legal/Associations/EngagedInTerrorism.jsx
+++ b/src/components/Section/Legal/Associations/EngagedInTerrorism.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Associations/EngagedInTerrorismItem.jsx b/src/components/Section/Legal/Associations/EngagedInTerrorismItem.jsx
index 5b50d6b8b..77d8eb03f 100644
--- a/src/components/Section/Legal/Associations/EngagedInTerrorismItem.jsx
+++ b/src/components/Section/Legal/Associations/EngagedInTerrorismItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Field, DateRange, Textarea } from '../../../Form'
 
 export default class EngagedInTerrorismItem extends ValidationElement {
diff --git a/src/components/Section/Legal/Associations/MembershipOverthrow.jsx b/src/components/Section/Legal/Associations/MembershipOverthrow.jsx
index 142ec7b49..c264449b4 100644
--- a/src/components/Section/Legal/Associations/MembershipOverthrow.jsx
+++ b/src/components/Section/Legal/Associations/MembershipOverthrow.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Associations/MembershipOverthrowItem.jsx b/src/components/Section/Legal/Associations/MembershipOverthrowItem.jsx
index 8727578bd..3b4dfaf45 100644
--- a/src/components/Section/Legal/Associations/MembershipOverthrowItem.jsx
+++ b/src/components/Section/Legal/Associations/MembershipOverthrowItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Associations/MembershipViolence.jsx b/src/components/Section/Legal/Associations/MembershipViolence.jsx
index 0ded99acd..a886057f5 100644
--- a/src/components/Section/Legal/Associations/MembershipViolence.jsx
+++ b/src/components/Section/Legal/Associations/MembershipViolence.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Associations/MembershipViolenceItem.jsx b/src/components/Section/Legal/Associations/MembershipViolenceItem.jsx
index 7b8ca4af7..e5b1c8568 100644
--- a/src/components/Section/Legal/Associations/MembershipViolenceItem.jsx
+++ b/src/components/Section/Legal/Associations/MembershipViolenceItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Associations/TerrorismAssociation.jsx b/src/components/Section/Legal/Associations/TerrorismAssociation.jsx
index 86d83c044..bae354cde 100644
--- a/src/components/Section/Legal/Associations/TerrorismAssociation.jsx
+++ b/src/components/Section/Legal/Associations/TerrorismAssociation.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import {
   Branch,
   Show,
diff --git a/src/components/Section/Legal/Associations/TerroristOrganizationItem.jsx b/src/components/Section/Legal/Associations/TerroristOrganizationItem.jsx
index 34610605d..0eeed2f76 100644
--- a/src/components/Section/Legal/Associations/TerroristOrganizationItem.jsx
+++ b/src/components/Section/Legal/Associations/TerroristOrganizationItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Investigations/ClearanceLevel.jsx b/src/components/Section/Legal/Investigations/ClearanceLevel.jsx
index 6cd64af10..2391b8bca 100644
--- a/src/components/Section/Legal/Investigations/ClearanceLevel.jsx
+++ b/src/components/Section/Legal/Investigations/ClearanceLevel.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Show,
diff --git a/src/components/Section/Legal/Investigations/DebarredItem.jsx b/src/components/Section/Legal/Investigations/DebarredItem.jsx
index 88bcef4c3..66cf17b3e 100644
--- a/src/components/Section/Legal/Investigations/DebarredItem.jsx
+++ b/src/components/Section/Legal/Investigations/DebarredItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Investigations/History.jsx b/src/components/Section/Legal/Investigations/History.jsx
index 6539f106e..67987f4ab 100644
--- a/src/components/Section/Legal/Investigations/History.jsx
+++ b/src/components/Section/Legal/Investigations/History.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Investigations/InvestigatingAgency.jsx b/src/components/Section/Legal/Investigations/InvestigatingAgency.jsx
index bb9f05d20..310003ad5 100644
--- a/src/components/Section/Legal/Investigations/InvestigatingAgency.jsx
+++ b/src/components/Section/Legal/Investigations/InvestigatingAgency.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Show,
diff --git a/src/components/Section/Legal/Investigations/RevokedItem.jsx b/src/components/Section/Legal/Investigations/RevokedItem.jsx
index 9195aa297..a1c7189e8 100644
--- a/src/components/Section/Legal/Investigations/RevokedItem.jsx
+++ b/src/components/Section/Legal/Investigations/RevokedItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Legal.jsx b/src/components/Section/Legal/Legal.jsx
index 47c63f24d..683457cd7 100644
--- a/src/components/Section/Legal/Legal.jsx
+++ b/src/components/Section/Legal/Legal.jsx
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
 import { Route } from 'react-router-dom'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { ErrorList } from 'components/ErrorList'
 import * as formTypes from 'config/formTypes'
 import { LEGAL } from 'constants/sections'
diff --git a/src/components/Section/Legal/NonCriminalCourtAction.jsx b/src/components/Section/Legal/NonCriminalCourtAction.jsx
index 3084ec4b9..d452fe3b3 100644
--- a/src/components/Section/Legal/NonCriminalCourtAction.jsx
+++ b/src/components/Section/Legal/NonCriminalCourtAction.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Location,
diff --git a/src/components/Section/Legal/Police/DomesticViolence.jsx b/src/components/Section/Legal/Police/DomesticViolence.jsx
index f16b2ca27..0cdfd9b96 100644
--- a/src/components/Section/Legal/Police/DomesticViolence.jsx
+++ b/src/components/Section/Legal/Police/DomesticViolence.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Location,
diff --git a/src/components/Section/Legal/Police/DomesticViolenceList.jsx b/src/components/Section/Legal/Police/DomesticViolenceList.jsx
index 172674592..fdf213d7a 100644
--- a/src/components/Section/Legal/Police/DomesticViolenceList.jsx
+++ b/src/components/Section/Legal/Police/DomesticViolenceList.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Accordion, Branch, Show } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import {
diff --git a/src/components/Section/Legal/Police/Intro.jsx b/src/components/Section/Legal/Police/Intro.jsx
index 35ba037cd..16d3648ba 100644
--- a/src/components/Section/Legal/Police/Intro.jsx
+++ b/src/components/Section/Legal/Police/Intro.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Field } from 'components/Form'
 
 const PoliceIntro = () => (
diff --git a/src/components/Section/Legal/Police/OtherOffense.jsx b/src/components/Section/Legal/Police/OtherOffense.jsx
index af156458c..2cad67015 100644
--- a/src/components/Section/Legal/Police/OtherOffense.jsx
+++ b/src/components/Section/Legal/Police/OtherOffense.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import Sentence from './Sentence'
 import {
   ValidationElement,
diff --git a/src/components/Section/Legal/Police/OtherOffenses.jsx b/src/components/Section/Legal/Police/OtherOffenses.jsx
index edf8c3dfb..f5ad6b0c0 100644
--- a/src/components/Section/Legal/Police/OtherOffenses.jsx
+++ b/src/components/Section/Legal/Police/OtherOffenses.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Branch, Show, Accordion } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import {
diff --git a/src/components/Section/Legal/Technology/Manipulating.jsx b/src/components/Section/Legal/Technology/Manipulating.jsx
index b6abdca50..6f7d8f179 100644
--- a/src/components/Section/Legal/Technology/Manipulating.jsx
+++ b/src/components/Section/Legal/Technology/Manipulating.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Technology/ManipulatingItem.jsx b/src/components/Section/Legal/Technology/ManipulatingItem.jsx
index 2dfb5a611..585dc4b86 100644
--- a/src/components/Section/Legal/Technology/ManipulatingItem.jsx
+++ b/src/components/Section/Legal/Technology/ManipulatingItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Technology/Unauthorized.jsx b/src/components/Section/Legal/Technology/Unauthorized.jsx
index 8a4153bf5..a908db426 100644
--- a/src/components/Section/Legal/Technology/Unauthorized.jsx
+++ b/src/components/Section/Legal/Technology/Unauthorized.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Technology/UnauthorizedItem.jsx b/src/components/Section/Legal/Technology/UnauthorizedItem.jsx
index c09206a15..025b6275c 100644
--- a/src/components/Section/Legal/Technology/UnauthorizedItem.jsx
+++ b/src/components/Section/Legal/Technology/UnauthorizedItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Legal/Technology/Unlawful.jsx b/src/components/Section/Legal/Technology/Unlawful.jsx
index b056f4a79..cccf9e44d 100644
--- a/src/components/Section/Legal/Technology/Unlawful.jsx
+++ b/src/components/Section/Legal/Technology/Unlawful.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Summary, DateSummary } from 'components/Summary'
 import { Accordion, Branch, Show } from 'components/Form'
 import {
diff --git a/src/components/Section/Legal/Technology/UnlawfulItem.jsx b/src/components/Section/Legal/Technology/UnlawfulItem.jsx
index ed0e0834b..7bafe3ea3 100644
--- a/src/components/Section/Legal/Technology/UnlawfulItem.jsx
+++ b/src/components/Section/Legal/Technology/UnlawfulItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Military/Disciplinary/Procedure.jsx b/src/components/Section/Military/Disciplinary/Procedure.jsx
index 36a3f10a2..8b96a8ba4 100644
--- a/src/components/Section/Military/Disciplinary/Procedure.jsx
+++ b/src/components/Section/Military/Disciplinary/Procedure.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   DateControl,
diff --git a/src/components/Section/Military/Foreign/Foreign.jsx b/src/components/Section/Military/Foreign/Foreign.jsx
index 5c57de7ca..4b2ca95c9 100644
--- a/src/components/Section/Military/Foreign/Foreign.jsx
+++ b/src/components/Section/Military/Foreign/Foreign.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 
 import { MILITARY, MILITARY_FOREIGN } from 'config/formSections/military'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import Subsection from 'components/Section/shared/Subsection'
 import connectSubsection from 'components/Section/shared/SubsectionConnector'
diff --git a/src/components/Section/Military/Foreign/ForeignContact.jsx b/src/components/Section/Military/Foreign/ForeignContact.jsx
index bdd762b70..09abf3c64 100644
--- a/src/components/Section/Military/Foreign/ForeignContact.jsx
+++ b/src/components/Section/Military/Foreign/ForeignContact.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { Name, Location, DateRange, Text, Field } from '../../../Form'
 
 export default class ForeignContact extends React.Component {
diff --git a/src/components/Section/Military/Foreign/ForeignService.jsx b/src/components/Section/Military/Foreign/ForeignService.jsx
index 4c0d7e916..f56a5477e 100644
--- a/src/components/Section/Military/Foreign/ForeignService.jsx
+++ b/src/components/Section/Military/Foreign/ForeignService.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import {
   ValidationElement,
diff --git a/src/components/Section/Military/History/History.jsx b/src/components/Section/Military/History/History.jsx
index 03a7b3edf..b7fa638b2 100644
--- a/src/components/Section/Military/History/History.jsx
+++ b/src/components/Section/Military/History/History.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { MILITARY, MILITARY_HISTORY } from 'config/formSections/military'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Branch, Show, Accordion } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import MilitaryService from 'components/Section/Military/History/MilitaryService'
diff --git a/src/components/Section/Military/History/MilitaryService.jsx b/src/components/Section/Military/History/MilitaryService.jsx
index 925830b9b..254fbf29e 100644
--- a/src/components/Section/Military/History/MilitaryService.jsx
+++ b/src/components/Section/Military/History/MilitaryService.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/Military/Military.jsx b/src/components/Section/Military/Military.jsx
index c1a616b2b..6dbe8c65f 100644
--- a/src/components/Section/Military/Military.jsx
+++ b/src/components/Section/Military/Military.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Route } from 'react-router-dom'
 import { connect } from 'react-redux'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { MILITARY } from 'constants/sections'
 import * as formTypes from 'config/formTypes'
 import { ErrorList } from 'components/ErrorList'
diff --git a/src/components/Section/Military/Selective/Selective.jsx b/src/components/Section/Military/Selective/Selective.jsx
index 89020c2da..730c79e78 100644
--- a/src/components/Section/Military/Selective/Selective.jsx
+++ b/src/components/Section/Military/Selective/Selective.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { MILITARY, MILITARY_SELECTIVE } from 'config/formSections/military'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Subsection from 'components/Section/shared/Subsection'
 import connectSubsection from 'components/Section/shared/SubsectionConnector'
 import {
diff --git a/src/components/Section/Package/AdditionalComments.jsx b/src/components/Section/Package/AdditionalComments.jsx
index 97a4cca20..fdcccd103 100644
--- a/src/components/Section/Package/AdditionalComments.jsx
+++ b/src/components/Section/Package/AdditionalComments.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Subsection from 'components/Section/shared/Subsection'
 import { SignatureValidator } from 'validators'
 import Signature from './Signature'
diff --git a/src/components/Section/Package/Attachments.jsx b/src/components/Section/Package/Attachments.jsx
index 7bbe28b18..130bd5d2b 100644
--- a/src/components/Section/Package/Attachments.jsx
+++ b/src/components/Section/Package/Attachments.jsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import FileSaver from 'file-saver'
-import { i18n, env } from '../../../config'
+import { env } from 'config'
+import i18n from 'util/i18n'
 import { api } from '../../../services'
 import { Show, Field, Text, RadioGroup, Radio, Svg } from '../../Form'
 
diff --git a/src/components/Section/Package/Credit.jsx b/src/components/Section/Package/Credit.jsx
index 5d2508a84..d1e99f5b0 100644
--- a/src/components/Section/Package/Credit.jsx
+++ b/src/components/Section/Package/Credit.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import Subsection from 'components/Section/shared/Subsection'
 import { SignatureValidator } from 'validators'
 import Signature from './Signature'
diff --git a/src/components/Section/Package/General.jsx b/src/components/Section/Package/General.jsx
index ec8dd6cf6..8d6a07244 100644
--- a/src/components/Section/Package/General.jsx
+++ b/src/components/Section/Package/General.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Link } from 'react-router-dom'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement } from '../../Form'
 import Signature from './Signature'
 
diff --git a/src/components/Section/Package/Medical.jsx b/src/components/Section/Package/Medical.jsx
index af0e43ad1..e38825ef4 100644
--- a/src/components/Section/Package/Medical.jsx
+++ b/src/components/Section/Package/Medical.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement } from '../../Form'
 import Signature from './Signature'
 
diff --git a/src/components/Section/Package/Signature.jsx b/src/components/Section/Package/Signature.jsx
index c6086d12a..fe189fff1 100644
--- a/src/components/Section/Package/Signature.jsx
+++ b/src/components/Section/Package/Signature.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { ValidationElement, Show } from '../../Form'
 import { NameSummary, NameText, DateSummary } from '../../Summary'
 import { validDate } from '../History/dateranges'
diff --git a/src/components/Section/Package/Verify.jsx b/src/components/Section/Package/Verify.jsx
index 19f8148fb..dbb1efa3b 100644
--- a/src/components/Section/Package/Verify.jsx
+++ b/src/components/Section/Package/Verify.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { Link } from 'react-router-dom'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Field } from 'components/Form'
 import {
   NameSummary,
diff --git a/src/components/Section/Psychological/AppealItem.jsx b/src/components/Section/Psychological/AppealItem.jsx
index 69a422659..810eb6701 100644
--- a/src/components/Section/Psychological/AppealItem.jsx
+++ b/src/components/Section/Psychological/AppealItem.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { Location, ValidationElement, Field, Text, Svg } from '../../Form'
 
 export class AppealItem extends ValidationElement {
diff --git a/src/components/Section/Psychological/Diagnoses/Diagnosis.jsx b/src/components/Section/Psychological/Diagnoses/Diagnosis.jsx
index ebda5ac33..6a1dd39b6 100644
--- a/src/components/Section/Psychological/Diagnoses/Diagnosis.jsx
+++ b/src/components/Section/Psychological/Diagnoses/Diagnosis.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Psychological/Order.jsx b/src/components/Section/Psychological/Order.jsx
index dbd943761..481fd923a 100644
--- a/src/components/Section/Psychological/Order.jsx
+++ b/src/components/Section/Psychological/Order.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import {
   Location,
   ValidationElement,
diff --git a/src/components/Section/Psychological/Psychological.jsx b/src/components/Section/Psychological/Psychological.jsx
index f4a2aca38..1243aba1a 100644
--- a/src/components/Section/Psychological/Psychological.jsx
+++ b/src/components/Section/Psychological/Psychological.jsx
@@ -4,7 +4,7 @@ import { Route } from 'react-router'
 import { connect } from 'react-redux'
 import classnames from 'classnames'
 
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
diff --git a/src/components/Section/Psychological/Treatment.jsx b/src/components/Section/Psychological/Treatment.jsx
index 7193f5d78..1eae734b4 100644
--- a/src/components/Section/Psychological/Treatment.jsx
+++ b/src/components/Section/Psychological/Treatment.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../config'
+import i18n from 'util/i18n'
 import { Location, ValidationElement, Field, Text, Telephone } from '../../Form'
 
 export default class Treatment extends ValidationElement {
diff --git a/src/components/Section/Relationships/RelationshipStatus/CivilUnion.jsx b/src/components/Section/Relationships/RelationshipStatus/CivilUnion.jsx
index aa14ea569..7c0014bf6 100644
--- a/src/components/Section/Relationships/RelationshipStatus/CivilUnion.jsx
+++ b/src/components/Section/Relationships/RelationshipStatus/CivilUnion.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { pickDate } from 'validators/helpers'
 import {
   Branch,
diff --git a/src/components/Section/Relationships/RelationshipStatus/Divorce.jsx b/src/components/Section/Relationships/RelationshipStatus/Divorce.jsx
index 313ee4544..669d2afa8 100644
--- a/src/components/Section/Relationships/RelationshipStatus/Divorce.jsx
+++ b/src/components/Section/Relationships/RelationshipStatus/Divorce.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { pickDate } from '../../../../validators/helpers'
 import {
   Location,
diff --git a/src/components/Section/Relationships/RelationshipStatus/OtherName.jsx b/src/components/Section/Relationships/RelationshipStatus/OtherName.jsx
index 5efad16da..d2382cd79 100644
--- a/src/components/Section/Relationships/RelationshipStatus/OtherName.jsx
+++ b/src/components/Section/Relationships/RelationshipStatus/OtherName.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Field,
diff --git a/src/components/Section/Relationships/Relatives/Alias.jsx b/src/components/Section/Relationships/Relatives/Alias.jsx
index 2fc181f08..d469b6003 100644
--- a/src/components/Section/Relationships/Relatives/Alias.jsx
+++ b/src/components/Section/Relationships/Relatives/Alias.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   ValidationElement,
   Branch,
diff --git a/src/components/Section/Relationships/Relatives/Relative.jsx b/src/components/Section/Relationships/Relatives/Relative.jsx
index b102b8a9d..e70e75447 100644
--- a/src/components/Section/Relationships/Relatives/Relative.jsx
+++ b/src/components/Section/Relationships/Relatives/Relative.jsx
@@ -2,7 +2,7 @@
 /* eslint jsx-a11y/label-has-for: 0 */
 
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { pickDate, alphaNumericRegEx } from 'validators/helpers'
 import {
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/Alcohol/NegativeImpact.jsx b/src/components/Section/SubstanceUse/Alcohol/NegativeImpact.jsx
index 44bca9d85..6908e8b5e 100644
--- a/src/components/Section/SubstanceUse/Alcohol/NegativeImpact.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/NegativeImpact.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   DateRange,
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/Alcohol/NegativeImpacts.jsx b/src/components/Section/SubstanceUse/Alcohol/NegativeImpacts.jsx
index 8e97f5852..940c76ef0 100644
--- a/src/components/Section/SubstanceUse/Alcohol/NegativeImpacts.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/NegativeImpacts.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Accordion, Branch, Show } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import {
diff --git a/src/components/Section/SubstanceUse/Alcohol/OrderedCounseling.jsx b/src/components/Section/SubstanceUse/Alcohol/OrderedCounseling.jsx
index 60804607a..428e864bd 100644
--- a/src/components/Section/SubstanceUse/Alcohol/OrderedCounseling.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/OrderedCounseling.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Location,
   CheckboxGroup,
diff --git a/src/components/Section/SubstanceUse/Alcohol/ReceivedCounseling.jsx b/src/components/Section/SubstanceUse/Alcohol/ReceivedCounseling.jsx
index 54b3ccf77..b3104e0a2 100644
--- a/src/components/Section/SubstanceUse/Alcohol/ReceivedCounseling.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/ReceivedCounseling.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import { validDate } from '../../History/dateranges'
 import {
   Location,
diff --git a/src/components/Section/SubstanceUse/Alcohol/ReceivedCounselings.jsx b/src/components/Section/SubstanceUse/Alcohol/ReceivedCounselings.jsx
index 9275a65f5..7421202b7 100644
--- a/src/components/Section/SubstanceUse/Alcohol/ReceivedCounselings.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/ReceivedCounselings.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Accordion, Branch, Show } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import {
diff --git a/src/components/Section/SubstanceUse/Alcohol/VoluntaryCounseling.jsx b/src/components/Section/SubstanceUse/Alcohol/VoluntaryCounseling.jsx
index 083953adf..e195fe58c 100644
--- a/src/components/Section/SubstanceUse/Alcohol/VoluntaryCounseling.jsx
+++ b/src/components/Section/SubstanceUse/Alcohol/VoluntaryCounseling.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Location,
   Text,
diff --git a/src/components/Section/SubstanceUse/Drugs/DrugClearanceUse.jsx b/src/components/Section/SubstanceUse/Drugs/DrugClearanceUse.jsx
index 6eef17eb8..071d74850 100644
--- a/src/components/Section/SubstanceUse/Drugs/DrugClearanceUse.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/DrugClearanceUse.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/Drugs/DrugClearanceUses.jsx b/src/components/Section/SubstanceUse/Drugs/DrugClearanceUses.jsx
index 1f2ef2e24..664792ca1 100644
--- a/src/components/Section/SubstanceUse/Drugs/DrugClearanceUses.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/DrugClearanceUses.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import { Accordion, Branch, Show } from 'components/Form'
 import { Summary, DateSummary } from 'components/Summary'
 import {
diff --git a/src/components/Section/SubstanceUse/Drugs/DrugPublicSafetyUse.jsx b/src/components/Section/SubstanceUse/Drugs/DrugPublicSafetyUse.jsx
index 345bb3ddd..bea571dca 100644
--- a/src/components/Section/SubstanceUse/Drugs/DrugPublicSafetyUse.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/DrugPublicSafetyUse.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/Drugs/DrugType.jsx b/src/components/Section/SubstanceUse/Drugs/DrugType.jsx
index 552d1664d..e4eb444ac 100644
--- a/src/components/Section/SubstanceUse/Drugs/DrugType.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/DrugType.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   RadioGroup,
diff --git a/src/components/Section/SubstanceUse/Drugs/OrderedTreatment.jsx b/src/components/Section/SubstanceUse/Drugs/OrderedTreatment.jsx
index 78eedc8d5..65c2ca4b4 100644
--- a/src/components/Section/SubstanceUse/Drugs/OrderedTreatment.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/OrderedTreatment.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/Drugs/VoluntaryTreatment.jsx b/src/components/Section/SubstanceUse/Drugs/VoluntaryTreatment.jsx
index 4d7ca49e1..d97f2edd3 100644
--- a/src/components/Section/SubstanceUse/Drugs/VoluntaryTreatment.jsx
+++ b/src/components/Section/SubstanceUse/Drugs/VoluntaryTreatment.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { i18n } from '../../../../config'
+import i18n from 'util/i18n'
 import {
   Field,
   ValidationElement,
diff --git a/src/components/Section/SubstanceUse/SubstanceUse.jsx b/src/components/Section/SubstanceUse/SubstanceUse.jsx
index 8020e8bfa..47296dc58 100644
--- a/src/components/Section/SubstanceUse/SubstanceUse.jsx
+++ b/src/components/Section/SubstanceUse/SubstanceUse.jsx
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import { connect } from 'react-redux'
 import { Route } from 'react-router-dom'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 import * as formTypes from 'config/formTypes'
 import { ErrorList } from 'components/ErrorList'
 import SectionNavigation from 'components/Section/shared/SectionNavigation'
diff --git a/src/components/Section/__snapshots__/Section.test.jsx.snap b/src/components/Section/__snapshots__/Section.test.jsx.snap
index 4c0c80eef..896b70fa6 100644
--- a/src/components/Section/__snapshots__/Section.test.jsx.snap
+++ b/src/components/Section/__snapshots__/Section.test.jsx.snap
@@ -5325,8 +5325,6 @@ exports[`The section component renders FOREIGN_ACTIVITIES_DIRECT 1`] = `
                   <p>
                     Foreign financial interest examples:  stocks, property, investments, bank accounts, ownership of corporate entities, corporate interests or exchange traded funds (ETFs) held in specific geographical or economic sectors.
                   </p>
-                </div>
-                <div>
                   <p>
                     Exclude financial interests in companies or diversified mutual funds or diversified ETFs that are publicly traded on a U.S. exchange.
                   </p>
@@ -6675,8 +6673,6 @@ exports[`The section component renders FOREIGN_BUSINESS_CONTACT 1`] = `
                   <p>
                     Such as  embassy, consulate, agency, military service, intelligence or security service, etc.
                   </p>
-                </div>
-                <div>
                   <p>
                     Answer 
                     <strong>
@@ -7120,8 +7116,6 @@ exports[`The section component renders FOREIGN_BUSINESS_FAMILY 1`] = `
                   <p>
                     For this question, "Immediate Family" means your spouse or legally recognized civil union/domestic partner, parents, step-parents, siblings, half and step-siblings, children, step-children, and cohabitant.
                   </p>
-                </div>
-                <div>
                   <p>
                     Answer 
                     <strong>
@@ -8836,8 +8830,6 @@ exports[`The section component renders FOREIGN_REVIEW 1`] = `
                       <p>
                         Foreign financial interest examples:  stocks, property, investments, bank accounts, ownership of corporate entities, corporate interests or exchange traded funds (ETFs) held in specific geographical or economic sectors.
                       </p>
-                    </div>
-                    <div>
                       <p>
                         Exclude financial interests in companies or diversified mutual funds or diversified ETFs that are publicly traded on a U.S. exchange.
                       </p>
@@ -9763,8 +9755,6 @@ exports[`The section component renders FOREIGN_REVIEW 1`] = `
                       <p>
                         For this question, "Immediate Family" means your spouse or legally recognized civil union/domestic partner, parents, step-parents, siblings, half and step-siblings, children, step-children, and cohabitant.
                       </p>
-                    </div>
-                    <div>
                       <p>
                         Answer 
                         <strong>
@@ -10379,8 +10369,6 @@ exports[`The section component renders FOREIGN_REVIEW 1`] = `
                       <p>
                         Such as  embassy, consulate, agency, military service, intelligence or security service, etc.
                       </p>
-                    </div>
-                    <div>
                       <p>
                         Answer 
                         <strong>
@@ -26911,8 +26899,6 @@ exports[`The section component renders LEGAL_REVIEW 1`] = `
               <p>
                 We note, with reference to this section, that neither your truthful responses nor information derived from your responses to this section will be used as evidence against you in a subsequent criminal proceeding.
               </p>
-            </div>
-            <div>
               <p>
                 As to this particular section, this applies whether or not you are currently employed by the Federal government. The following questions ask about your use of information technology systems. Information technology systems include all related computer hardware, software, firmware, and data used for the communication, transmission, processing, manipulation, storage or protection of information.
               </p>
@@ -28705,8 +28691,6 @@ exports[`The section component renders LEGAL_TECHNOLOGY_UNAUTHORIZED 1`] = `
           <p>
             We note, with reference to this section, that neither your truthful responses nor information derived from your responses to this section will be used as evidence against you in a subsequent criminal proceeding.
           </p>
-        </div>
-        <div>
           <p>
             As to this particular section, this applies whether or not you are currently employed by the Federal government. The following questions ask about your use of information technology systems. Information technology systems include all related computer hardware, software, firmware, and data used for the communication, transmission, processing, manipulation, storage or protection of information.
           </p>
diff --git a/src/components/Summary/DateSummary.js b/src/components/Summary/DateSummary.js
index a62d11329..3bc7d891c 100644
--- a/src/components/Summary/DateSummary.js
+++ b/src/components/Summary/DateSummary.js
@@ -1,5 +1,5 @@
 import React from 'react' // eslint-disable-line no-unused-vars
-import { i18n } from '../../config'
+import i18n from 'util/i18n'
 import { validDate } from '../Section/History/dateranges'
 
 export const DateSummary = (
diff --git a/src/config/__mocks__/index.js b/src/config/__mocks__/index.js
index 3e1db6f9a..7e5b67f54 100644
--- a/src/config/__mocks__/index.js
+++ b/src/config/__mocks__/index.js
@@ -1,4 +1,4 @@
-import { i18n } from 'config/locales'
+import i18n from 'util/i18n'
 
 const env = {
   SamlEnabled: () => true,
diff --git a/src/config/formSections/citizenship.js b/src/config/formSections/citizenship.js
index aefef55bc..99758a80b 100644
--- a/src/config/formSections/citizenship.js
+++ b/src/config/formSections/citizenship.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const CITIZENSHIP = {
   key: sections.CITIZENSHIP,
diff --git a/src/config/formSections/financial.js b/src/config/formSections/financial.js
index cc140f9cf..940659f7a 100644
--- a/src/config/formSections/financial.js
+++ b/src/config/formSections/financial.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const FINANCIAL = {
   key: sections.FINANCIAL,
diff --git a/src/config/formSections/foreign.js b/src/config/formSections/foreign.js
index eb6e12a6d..dcafe96f4 100644
--- a/src/config/formSections/foreign.js
+++ b/src/config/formSections/foreign.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 // TODO: The `name` includes the nested subsection.
 // We need to come up with a more permanent solution or confirm this config.
diff --git a/src/config/formSections/history.js b/src/config/formSections/history.js
index 6455e73ff..b69ac93d4 100644
--- a/src/config/formSections/history.js
+++ b/src/config/formSections/history.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const HISTORY = {
   key: sections.HISTORY,
diff --git a/src/config/formSections/identification.js b/src/config/formSections/identification.js
index 0747bc350..09527d194 100644
--- a/src/config/formSections/identification.js
+++ b/src/config/formSections/identification.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const IDENTIFICATION = {
   key: sections.IDENTIFICATION,
diff --git a/src/config/formSections/legal.js b/src/config/formSections/legal.js
index 15a36d0a7..39ad783c5 100644
--- a/src/config/formSections/legal.js
+++ b/src/config/formSections/legal.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const LEGAL = {
   key: sections.LEGAL,
diff --git a/src/config/formSections/military.js b/src/config/formSections/military.js
index ef8ea6170..64188cdd2 100644
--- a/src/config/formSections/military.js
+++ b/src/config/formSections/military.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const MILITARY = {
   key: sections.MILITARY,
diff --git a/src/config/formSections/psychological.js b/src/config/formSections/psychological.js
index 932e77378..282aa7889 100644
--- a/src/config/formSections/psychological.js
+++ b/src/config/formSections/psychological.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const PSYCHOLOGICAL = {
   key: sections.PSYCHOLOGICAL,
diff --git a/src/config/formSections/relationships.js b/src/config/formSections/relationships.js
index 7a1dafb20..9d191f5c4 100644
--- a/src/config/formSections/relationships.js
+++ b/src/config/formSections/relationships.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const RELATIONSHIPS = {
   key: sections.RELATIONSHIPS,
diff --git a/src/config/formSections/substanceUse.js b/src/config/formSections/substanceUse.js
index 05e6e797a..f6d9f3db6 100644
--- a/src/config/formSections/substanceUse.js
+++ b/src/config/formSections/substanceUse.js
@@ -1,5 +1,5 @@
 import * as sections from 'constants/sections'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 export const SUBSTANCE_USE = {
   key: sections.SUBSTANCE_USE,
diff --git a/src/config/index.js b/src/config/index.js
index c3feaaa6a..f2d7e1df9 100644
--- a/src/config/index.js
+++ b/src/config/index.js
@@ -1,11 +1,8 @@
 import env from './environment'
-import { i18n, markdown } from './locales'
 import { isZipcodeState, zipcodes } from './zipcodes'
 
 export {
   env,
-  i18n,
   isZipcodeState,
-  markdown,
   zipcodes,
 }
diff --git a/src/config/locales/en/error.js b/src/config/locales/en/error.js
index 2744b9c99..2adae633b 100644
--- a/src/config/locales/en/error.js
+++ b/src/config/locales/en/error.js
@@ -69,6 +69,7 @@ export const error = {
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
   },
   birthdate: {
@@ -129,10 +130,12 @@ export const error = {
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
     invalid: {
       title: 'Invalid social security number',
       message: 'The social security number is considered invalid.',
+      note: '',
     },
   },
   selective: {
@@ -675,6 +678,7 @@ export const error = {
       message:
         'All parts of the date(s) are required even if it is **estimated**.',
     },
+    note: '',
   },
   weight: {
     min: {
@@ -690,6 +694,7 @@ export const error = {
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
   },
   height: {
@@ -720,6 +725,7 @@ export const error = {
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
   },
   location: {
@@ -774,6 +780,7 @@ export const error = {
       required: {
         title: 'Your response is required',
         message: '',
+        note: '',
       },
       city: {
         length: {
@@ -848,6 +855,7 @@ export const error = {
       required: {
         title: 'Your response is required',
         message: '',
+        note: '',
       },
       city: {
         length: {
@@ -915,6 +923,13 @@ export const error = {
       },
     },
   },
+  toggleablelocation: {
+    required: {
+      title: '',
+      message: '',
+      note: '',
+    },
+  },
   city: {
     length: {
       title: 'There is a problem with the City',
@@ -1015,6 +1030,7 @@ export const error = {
         required: {
           title: 'Your response is required',
           message: '',
+          note: '',
         },
       },
       second: {
@@ -1033,6 +1049,7 @@ export const error = {
         required: {
           title: 'Your response is required',
           message: '',
+          note: '',
         },
       },
       third: {
@@ -1051,6 +1068,7 @@ export const error = {
         required: {
           title: 'Your response is required',
           message: '',
+          note: '',
         },
       },
       extension: {
@@ -1090,11 +1108,13 @@ export const error = {
       required: {
         title: 'Your response is required',
         message: '',
+        note: '',
       },
     },
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
   },
   geocode: {
@@ -1142,6 +1162,7 @@ export const error = {
     required: {
       title: 'Your response is required',
       message: '',
+      note: '',
     },
   },
   treatment: {
@@ -1194,6 +1215,7 @@ export const error = {
   required: {
     title: 'Your response is required',
     message: '',
+    note: '',
   },
   submission: {
     message:
diff --git a/src/config/locales/en/index.js b/src/config/locales/en/index.js
index ad67541a6..f83466071 100644
--- a/src/config/locales/en/index.js
+++ b/src/config/locales/en/index.js
@@ -6,7 +6,6 @@ import { citizenship } from './citizenship'
 import { collection } from './collection'
 import { comments } from './comments'
 import { consent } from './consent'
-import { countries } from './countries'
 import { country } from './country'
 import { currency } from './currency'
 import { date } from './date'
@@ -85,8 +84,7 @@ const en = {
   application,
 
   // Misc
-  countries,
-  temp
+  temp,
 }
 
 export default en
diff --git a/src/config/locales/en/name.js b/src/config/locales/en/name.js
index 503cbb08c..d6efd8403 100644
--- a/src/config/locales/en/name.js
+++ b/src/config/locales/en/name.js
@@ -20,5 +20,5 @@ export const name = {
     viii: 'VIII',
     ix: 'IX',
     x: 'X'
-  }
+  },
 }
diff --git a/src/config/locales/index.js b/src/config/locales/index.js
deleted file mode 100644
index c8d278a00..000000000
--- a/src/config/locales/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import { i18n, markdown } from './i18n'
-export { i18n, markdown }
diff --git a/src/views/AccessDenied/AccessDenied.jsx b/src/views/AccessDenied/AccessDenied.jsx
index 04bd8b945..db0b5d119 100644
--- a/src/views/AccessDenied/AccessDenied.jsx
+++ b/src/views/AccessDenied/AccessDenied.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from '../../config'
+import i18n from 'util/i18n'
 
 class AccessDenied extends React.Component {
   render() {
diff --git a/src/views/AccessDenied/AccessDenied.test.jsx b/src/views/AccessDenied/AccessDenied.test.jsx
index cb5ce7ef0..579410a7f 100644
--- a/src/views/AccessDenied/AccessDenied.test.jsx
+++ b/src/views/AccessDenied/AccessDenied.test.jsx
@@ -4,7 +4,7 @@ import { MemoryRouter } from 'react-router'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import AccessDenied from 'views/AccessDenied/AccessDenied'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 describe('The access denied view', () => {
   const mockStore = configureMockStore()
diff --git a/src/views/Error/Error.jsx b/src/views/Error/Error.jsx
index b552ad118..5705cf6ac 100644
--- a/src/views/Error/Error.jsx
+++ b/src/views/Error/Error.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from '../../config'
+import i18n from 'util/i18n'
 
 export default class Error extends React.Component {
   render() {
diff --git a/src/views/Error/Error.test.jsx b/src/views/Error/Error.test.jsx
index 4ad958fe4..8dfdbfea4 100644
--- a/src/views/Error/Error.test.jsx
+++ b/src/views/Error/Error.test.jsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { mount } from 'enzyme'
+import i18n from 'util/i18n'
 import Error from './Error'
-import { i18n } from '../../config'
 
 describe('The Error view', () => {
   it('is visible with context', () => {
diff --git a/src/views/Locked/Locked.jsx b/src/views/Locked/Locked.jsx
index a8d920147..03bd546d4 100644
--- a/src/views/Locked/Locked.jsx
+++ b/src/views/Locked/Locked.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { connect } from 'react-redux'
-import { i18n } from '../../config'
+import i18n from 'util/i18n'
 
 class Locked extends React.Component {
   render() {
diff --git a/src/views/Locked/Locked.test.jsx b/src/views/Locked/Locked.test.jsx
index e7d7c4ed8..6b2f25df1 100644
--- a/src/views/Locked/Locked.test.jsx
+++ b/src/views/Locked/Locked.test.jsx
@@ -4,7 +4,7 @@ import { MemoryRouter } from 'react-router'
 import { Provider } from 'react-redux'
 import { mount } from 'enzyme'
 import Locked from 'views/Locked/Locked'
-import { i18n } from 'config'
+import i18n from 'util/i18n'
 
 describe('The locked view', () => {
   const mockStore = configureMockStore()