diff --git a/ui/src/sources/components/ConnectionWizard.tsx b/ui/src/sources/components/ConnectionWizard.tsx
index 13e9cb809..c83ffded8 100644
--- a/ui/src/sources/components/ConnectionWizard.tsx
+++ b/ui/src/sources/components/ConnectionWizard.tsx
@@ -1,11 +1,17 @@
+// Libraries
 import React, {PureComponent} from 'react'
 import _ from 'lodash'
-import {ErrorHandling} from 'src/shared/decorators/errors'
 
+// Components
+import {ErrorHandling} from 'src/shared/decorators/errors'
 import WizardOverlay from 'src/reusable_ui/components/wizard/WizardOverlay'
 import WizardStep from 'src/reusable_ui/components/wizard/WizardStep'
 import SourceStep from 'src/sources/components/SourceStep'
 import KapacitorStep from 'src/sources/components/KapacitorStep'
+import DashboardsStep from 'src/sources/components/DashboardsStep'
+import CompletionStep from 'src/sources/components/CompletionStep'
+
+// Types
 import {Kapacitor, Source} from 'src/types'
 
 interface Props {
diff --git a/ui/src/sources/components/KapacitorStep.tsx b/ui/src/sources/components/KapacitorStep.tsx
index 2bfd6ae6c..a91b0d227 100644
--- a/ui/src/sources/components/KapacitorStep.tsx
+++ b/ui/src/sources/components/KapacitorStep.tsx
@@ -1,25 +1,32 @@
+// Libraries
 import React, {PureComponent} from 'react'
 import {connect} from 'react-redux'
 
+// Components
 import {ErrorHandling} from 'src/shared/decorators/errors'
-
 import WizardTextInput from 'src/reusable_ui/components/wizard/WizardTextInput'
 import WizardCheckbox from 'src/reusable_ui/components/wizard/WizardCheckbox'
 
+// Actions
 import {notify as notifyAction} from 'src/shared/actions/notifications'
-import {insecureSkipVerifyText} from 'src/shared/copy/tooltipText'
 
+// Utils
+import {getDeep} from 'src/utils/wrappers'
+
+// APIs
 import {createKapacitor, pingKapacitor} from 'src/shared/apis'
 
+// Constants
+import {insecureSkipVerifyText} from 'src/shared/copy/tooltipText'
 import {
   notifyKapacitorCreateFailed,
   notifyKapacitorCreated,
   notifyKapacitorConnectionFailed,
 } from 'src/shared/copy/notifications'
-
-import {Kapacitor, Source} from 'src/types'
 import {DEFAULT_KAPACITOR} from 'src/shared/constants'
-import {getDeep} from 'src/utils/wrappers'
+
+// Types
+import {Kapacitor, Source} from 'src/types'
 
 interface Props {
   notify: typeof notifyAction
diff --git a/ui/src/sources/components/SourceStep.tsx b/ui/src/sources/components/SourceStep.tsx
index fbbd5a7c6..6d1352555 100644
--- a/ui/src/sources/components/SourceStep.tsx
+++ b/ui/src/sources/components/SourceStep.tsx
@@ -1,24 +1,32 @@
+// Libraries
 import React, {PureComponent} from 'react'
 import {connect} from 'react-redux'
 
+// Components
 import {ErrorHandling} from 'src/shared/decorators/errors'
-import {createSource} from 'src/shared/apis'
-
 import WizardTextInput from 'src/reusable_ui/components/wizard/WizardTextInput'
 import WizardCheckbox from 'src/reusable_ui/components/wizard/WizardCheckbox'
 
+// Actions
 import {addSource as addSourceAction} from 'src/shared/actions/sources'
 import {notify as notifyAction} from 'src/shared/actions/notifications'
 
+// Utils
+import {getDeep} from 'src/utils/wrappers'
+
+// APIs
+import {createSource} from 'src/shared/apis'
+
+// Constants
 import {
   notifySourceCreationFailed,
   notifySourceCreationSucceeded,
 } from 'src/shared/copy/notifications'
 import {insecureSkipVerifyText} from 'src/shared/copy/tooltipText'
-
-import {Source} from 'src/types'
 import {DEFAULT_SOURCE} from 'src/shared/constants'
-import {getDeep} from 'src/utils/wrappers'
+
+// Types
+import {Source} from 'src/types'
 
 interface Props {
   notify: typeof notifyAction