diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html
index fb71d3b98d779..049f49bb6b879 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/create_index_pattern_wizard.html
@@ -6,13 +6,21 @@
       class="kuiViewContent"
     >
       <!-- Intro -->
-      <h1 class="euiTitle">
+      <h1 class="euiTitle euiTitle--medium">
         Create index pattern
       </h1>
-      <div class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--responsive">
-        <p class="euiFlexItem euiFlexItem--flexGrowZero euiTextColor euiTextColor--subdued">
-          Kibana uses index patterns to retrieve data from Elasticsearch indices for things like visualizations.
-        </p>
+
+      <div class="euiSpacer euiSpacer--small"></div>
+
+      <div class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--alignItemsEnd euiFlexGroup--responsive">
+        <div class="euiFlexItem euiFlexItem--flexGrowZero">
+          <div class="euiText">
+            <p class="euiTextColor euiTextColor--subdued">
+              Kibana uses index patterns to retrieve data from Elasticsearch indices for things like visualizations.
+            </p>
+          </div>
+        </div>
+
         <div class="euiFlexItem euiFlexItem--flexGrowZero">
           <label
             ng-if="controller.isSystemIndicesCheckBoxVisible()"
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
index 337771d2a39db..4a454e1c0c559 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_index_pattern/step_index_pattern.html
@@ -10,47 +10,48 @@ <h2 class="euiTitle">
     role="form"
     ng-submit="stepIndexPattern.goToNextStep()"
   >
-    <div class="euiFormRow">
-      <label
-        for="indexPatternNameField"
-        class="euiFormLabel"
-      >
-        Index pattern
-      </label>
-      <div class="euiFormControlLayout">
-        <!-- Index pattern input -->
-        <input
-          id="indexPatternNameField"
-          class="euiFieldText euiFieldText--fullWidth createIndexPatternInputField"
-          data-test-subj="createIndexPatternNameInput"
-          ng-model="stepIndexPattern.indexPatternName"
-          placeholder="index-name-*"
-          validate-index-pattern
-          validate-index-pattern-allow-wildcard
-          append-wildcard
-          name="name"
-          required
-          type="text"
-          aria-describedby="indexPatternNameFieldHelp1 indexPatternNameFieldHelp2"
-        >
-      </div>
-    </div>
-    <div class="euiSpacer euiSpacer--xs"></div>
-    <div class="euiFlexGroup">
-      <div class="euiFlexItem">
-        <p
-          id="indexPatternNameFieldHelp1"
-          class="euiTextColor euiTextColor--subdued"
-        >
-          You can use a <strong>*</strong> as a wildcard in your index pattern.
-        </p>
-        <div class="euiSpacer euiSpacer--xs"></div>
-        <p
-          id="indexPatternNameFieldHelp2"
-          class="euiTextColor euiTextColor--subdued"
-        >
-          You can't use empty spaces or the characters <strong>\ / ? " < > |</strong>.
-        </p>
+    <div class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween euiFlexGroup--alignItemsEnd euiFlexGroup--responsive">
+      <div class="euiFlexItem euiFlexItem--flexGrowZero">
+        <div class="euiFormRow">
+          <label
+            for="indexPatternNameField"
+            class="euiFormLabel"
+          >
+            Index pattern
+          </label>
+          <div class="euiFormControlLayout">
+            <!-- Index pattern input -->
+            <input
+              id="indexPatternNameField"
+              class="euiFieldText euiFieldText--fullWidth createIndexPatternInputField"
+              data-test-subj="createIndexPatternNameInput"
+              ng-model="stepIndexPattern.indexPatternName"
+              placeholder="index-name-*"
+              validate-index-pattern
+              validate-index-pattern-allow-wildcard
+              append-wildcard
+              name="name"
+              required
+              type="text"
+              aria-describedby="indexPatternNameFieldHelp1 indexPatternNameFieldHelp2"
+            >
+          </div>
+          <div class="euiFormHelpText euiFormRow__text">
+            <p
+              id="indexPatternNameFieldHelp1"
+              class="euiTextColor euiTextColor--subdued"
+            >
+              You can use a <strong>*</strong> as a wildcard in your index pattern.
+            </p>
+            <div class="euiSpacer euiSpacer--xs"></div>
+            <p
+              id="indexPatternNameFieldHelp2"
+              class="euiTextColor euiTextColor--subdued"
+            >
+              You can't use empty spaces or the characters <strong>\ / ? " < > |</strong>.
+            </p>
+          </div>
+        </div>
       </div>
       <div class="euiFlexItem euiFlexItem--flexGrowZero">
         <!-- Action -->
@@ -105,14 +106,12 @@ <h2 class="euiTitle">
         indices="stepIndexPattern.allIndices"
         pattern="stepIndexPattern.indexPatternName"
       >
-        <span class="euiTextColor euiTextColor--primary">
-          <span ng-if="!stepIndexPattern.allIndices.length">
-            You only have a single index. You can create an index pattern to match it.
-          </span>
+        <span ng-if="!stepIndexPattern.allIndices.length">
+          You only have a single index. You can create an index pattern to match it.
+        </span>
 
-          <span ng-if="stepIndexPattern.allIndices.length">
-            Your index pattern can match any of your <strong>{{stepIndexPattern.allIndices.length}} indices</strong>, below.
-          </span>
+        <span ng-if="stepIndexPattern.allIndices.length">
+          Your index pattern can match any of your <strong>{{stepIndexPattern.allIndices.length}} indices</strong>, below.
         </span>
       </matching-indices-list>
     </div>
diff --git a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
index a227c28c4e560..8de041d8cb1b4 100644
--- a/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
+++ b/src/core_plugins/kibana/public/management/sections/indices/create_index_pattern_wizard/step_time_field/step_time_field.html
@@ -15,89 +15,108 @@ <h2 class="euiTitle">
 
   <div class="euiSpacer euiSpacer--m"></div>
 
-  <div class="timeFieldNameLabel">
-    <label
-      id="timeFilterFieldSelectLabel"
-      class="euiLabel"
-      for="timeFilterFieldSelect"
-    >
-      Time Filter field name
-    </label>
+  <div class="euiFormRow">
+    <div class="euiFormLabel">
+      <div class="euiFlexGroup euiFlexGroup--justifyContentSpaceBetween">
+        <div class="euiFlexItem euiFlexItem--flexGrowZero">
+          <label
+            id="timeFilterFieldSelectLabel"
+            for="timeFilterFieldSelect"
+          >
+            Time Filter field name
+          </label>
+        </div>
+
+        <div class="euiFlexItem euiFlexItem--flexGrowZero">
+          <a
+            ng-if="!stepTimeField.isFetchingTimeFieldOptions"
+            class="euiLink euiText euiText--extraSmall"
+            ng-click="stepTimeField.fetchTimeFieldOptions()"
+            kbn-accessible-click
+            aria-describedby="timeFilterFieldSelectLabel"
+          >
+            Refresh
+          </a>
+
+          <p
+            ng-if="stepTimeField.isFetchingTimeFieldOptions"
+            class="euiTextColor euiTextColor--subdued"
+            aria-label="Please wait while we fetch your time field options"
+            aria-describedby="timeFilterFieldSelectLabel"
+          >
+            <svg
+              aria-hidden="true"
+              class="euiIcon euiIcon--medium"
+              xmlns="http://www.w3.org/2000/svg"
+              width="16"
+              height="16"
+              viewBox="0 0 16 16"
+            >
+              <g fill="none" fill-rule="evenodd">
+                <circle cx="5" cy="5" r="1" fill="#13252D" />
+                <circle cx="10" cy="5" r="1" fill="#13252D" />
+                <circle cx="7.5" cy="7.5" r="7" stroke="#13252D" />
+                <path stroke="#13252D" stroke-linecap="round" stroke-linejoin="bevel"
+                d="M3 8c1.167 2 2.667 3 4.5 3 1.833 0 3.333-1 4.5-3" />
+              </g>
+            </svg>
+          </p>
+        </div>
+      </div>
+    </div>
 
-    <a
-      ng-if="!stepTimeField.isFetchingTimeFieldOptions"
-      class="euiLink euiText euiText--extraSmall"
-      ng-click="stepTimeField.fetchTimeFieldOptions()"
-      kbn-accessible-click
-      aria-describedby="timeFilterFieldSelectLabel"
+    <div class="euiFormControlLayout">
+      <select
+        ng-show="stepTimeField.canShowMainSelect()"
+        id="timeFilterFieldSelect"
+        aria-describedby="timeFilterFieldSelectHelpText1 timeFilterFieldSelectHelpText2"
+        class="euiSelect euiSelect--large"
+        data-test-subj="createIndexPatternTimeFieldSelect"
+        ng-disabled="stepTimeField.isTimeFieldSelectDisabled()"
+        ng-required="stepTimeField.hasTimeFieldOptions()"
+        ng-options="option as option.display disable when option.isDisabled for option in stepTimeField.timeFieldOptions"
+        ng-model="stepTimeField.selectedTimeFieldOption"
+      ></select>
+
+      <select
+        ng-show="stepTimeField.canShowLoadingSelect()"
+        id="timeFilterFieldSelect"
+        aria-describedby="timeFilterFieldSelectHelpText1 timeFilterFieldSelectHelpText2"
+        class="euiSelect euiSelect--large"
+        data-test-subj="createIndexPatternTimeFieldSelect"
+        disabled="disabled"
+      >
+        <option>Loading...</option>
+      </select>
+
+      <p
+        ng-if="stepTimeField.canShowNoTimeBasedFieldsMessage()"
+        class="euiTextColor euiTextColor--subdued euiText euiText--small"
+      >
+        The indices which match this index pattern don't contain any time fields.
+      </p>
+    </div>
+
+    <div
+      ng-if="stepTimeField.canShowHelpText()"
+      class="euiFormHelpText euiFormRow__text"
+      id="timeFilterFieldSelectHelpText1"
     >
-      Refresh
-    </a>
+      The Time Filter will use this field to filter your data by time.
+    </div>
 
-    <p
-      ng-if="stepTimeField.isFetchingTimeFieldOptions"
-      class="euiTextColor euiTextColor--subdued"
-      aria-label="Please wait while we fetch your time field options"
-      aria-describedby="timeFilterFieldSelectLabel"
+    <div
+      ng-if="stepTimeField.canShowHelpText()"
+      class="euiFormHelpText euiFormRow__text"
+      id="timeFilterFieldSelectHelpText2"
     >
-      <svg aria-hidden="true" class="euiIcon euiIcon--medium" xmlns="http://www.w3.org/2000/svg"
-      width="16" height="16" viewBox="0 0 16 16">
-        <g fill="none" fill-rule="evenodd">
-          <circle cx="5" cy="5" r="1" fill="#13252D" />
-          <circle cx="10" cy="5" r="1" fill="#13252D" />
-          <circle cx="7.5" cy="7.5" r="7" stroke="#13252D" />
-          <path stroke="#13252D" stroke-linecap="round" stroke-linejoin="bevel"
-          d="M3 8c1.167 2 2.667 3 4.5 3 1.833 0 3.333-1 4.5-3" />
-        </g>
-      </svg>
-    </p>
+      You can choose not to have a time field, but you will not be able to narrow down your data by a time range.
+    </div>
   </div>
 
-  <div class="euiSpacer euiSpacer--m"></div>
-
-  <select
-    ng-show="stepTimeField.canShowMainSelect()"
-    id="timeFilterFieldSelect"
-    aria-describedby="timeFilterFieldSelectHelpText"
-    class="euiSelect euiSelect--large"
-    data-test-subj="createIndexPatternTimeFieldSelect"
-    ng-disabled="stepTimeField.isTimeFieldSelectDisabled()"
-    ng-required="stepTimeField.hasTimeFieldOptions()"
-    ng-options="option as option.display disable when option.isDisabled for option in stepTimeField.timeFieldOptions"
-    ng-model="stepTimeField.selectedTimeFieldOption"
-  ></select>
-  <select
-    ng-show="stepTimeField.canShowLoadingSelect()"
-    id="timeFilterFieldSelect"
-    aria-describedby="timeFilterFieldSelectHelpText"
-    class="euiSelect euiSelect--large"
-    data-test-subj="createIndexPatternTimeFieldSelect"
-    disabled="disabled"
-  >
-    <option>Loading...</option>
-  </select>
-  <p
-    ng-if="stepTimeField.canShowNoTimeBasedFieldsMessage()"
-    class="euiTextColor euiTextColor--subdued euiText euiText--small"
-  >
-    The indices which match this index pattern don't contain any time fields.
-  </p>
-
-  <div class="euiSpacer euiSpacer--s"></div>
-
-  <p
-    ng-if="stepTimeField.canShowHelpText()"
-    id="timeFilterFieldSelectHelpText"
-    class="euiTextColor euiTextColor--subdued"
-  >
-    The Time Filter will use this field to filter your data by time.
-    You can choose not to have a time field, but you will not be able to narrow down your data by a time range.
-  </p>
-
-  <div class="euiSpacer euiSpacer--m"></div>
-
   <button
     class="euiButtonEmpty"
+    type="button"
     data-id="toggleButton"
     ng-click="stepTimeField.toggleAdvancedOptions()"
   >
@@ -123,73 +142,74 @@ <h2 class="euiTitle">
   </button>
 
   <!-- Index pattern id input -->
-  <div class="euiSpacer euiSpacer--m"></div>
-  <div ng-if="stepTimeField.showAdvancedOptions">
-    <label
-      class="euiLabel"
-      for="indexPatternCreationId"
-    >
-      Custom index pattern ID
-    </label>
-
-    <div class="euiSpacer euiSpacer--xs"></div>
-
-    <input
-      class="euiFieldText euiFieldText--large"
-      id="indexPatternCreationId"
-      data-test-subj="createIndexPatternIdInput"
-      ng-model="stepTimeField.indexPatternId"
-      ng-model-options="{ updateOn: 'default blur', debounce: {'default': 500, 'blur': 0} }"
-      validate-index-pattern
-      validate-index-pattern-allow-wildcard
-      name="id"
-      type="text"
-    >
-
-    <div class="euiSpacer euiSpacer--xs"></div>
-
-    <p class="euiTextColor euiTextColor--subdued">
-      Kibana will provide a unique identifier for each index pattern.
-      If you do not want to use this unique ID, enter a custom one.
-    </p>
+  <div class="euiSpacer euiSpacer--xs"></div>
+  <div
+    ng-if="stepTimeField.showAdvancedOptions"
+    class="euiFormRow"
+  >
+    <div class="euiFormLabel">
+      <label
+        class="euiLabel"
+        for="indexPatternCreationId"
+      >
+        Custom index pattern ID
+      </label>
+    </div>
+    <div class="euiFormControlLayout">
+      <input
+        class="euiFieldText euiFieldText--large"
+        id="indexPatternCreationId"
+        data-test-subj="createIndexPatternIdInput"
+        ng-model="stepTimeField.indexPatternId"
+        ng-model-options="{ updateOn: 'default blur', debounce: {'default': 500, 'blur': 0} }"
+        validate-index-pattern
+        validate-index-pattern-allow-wildcard
+        name="id"
+        type="text"
+      >
+    </div>
+    <div class="euiFormHelpText euiFormRow__text">
+      <span class="euiTextColor euiTextColor--subdued">
+        Kibana will provide a unique identifier for each index pattern.
+        If you do not want to use this unique ID, enter a custom one.
+      </span>
+    </div>
   </div>
 
   <div class="euiSpacer euiSpacer--m"></div>
 
   <!-- Actions -->
-  <div class="euiFlexGroup euiFlexGroup--gutterLarge euiFlexGroup--justifyContentSpaceAround euiFlexGroup--responsive">
-    <div class="euiFlexItem euiFlexItem--flexGrowZero"></div>
+  <div class="euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--justifyContentFlexEnd">
     <div class="euiFlexItem euiFlexItem--flexGrowZero">
-      <div>
-        <button
-          class="euiButton euiButton--secondary kuiButton--iconText"
-          ng-click="stepTimeField.goToPreviousStep()"
-        >
-          <span class="euiButton__content">
-            <svg aria-hidden="true" class="euiIcon euiIcon--medium" xmlns="http://www.w3.org/2000/svg"
-              xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
-              <defs>
-                <path id="arrow_left-a" d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
-                />
-              </defs>
-              <use fill-rule="nonzero" transform="rotate(90 8 8)" href="#arrow_left-a"
+      <button
+        class="euiButtonEmpty euiButtonEmpty--primary kuiButton--iconText"
+        ng-click="stepTimeField.goToPreviousStep()"
+      >
+        <span class="euiButtonEmpty__content">
+          <svg aria-hidden="true" class="euiIcon euiIcon--medium" xmlns="http://www.w3.org/2000/svg"
+            xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+            <defs>
+              <path id="arrow_left-a" d="M13.069 5.157L8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0z"
               />
-            </svg>
-            <span>Back</span>
-          </span>
-        </button>
-
-        <button
-          data-test-subj="createIndexPatternCreateButton"
-          ng-disabled="!stepTimeField.canCreateIndexPattern()"
-          class="euiButton euiButton--primary"
-          type="submit"
-        >
-          <span class="euiButton__content">
-            Create index pattern
-          </span>
-        </button>
-      </div>
+            </defs>
+            <use fill-rule="nonzero" transform="rotate(90 8 8)" href="#arrow_left-a"
+            />
+          </svg>
+          <span>Back</span>
+        </span>
+      </button>
+    </div>
+    <div class="euiFlexItem euiFlexItem--flexGrowZero">
+      <button
+        data-test-subj="createIndexPatternCreateButton"
+        ng-disabled="!stepTimeField.canCreateIndexPattern()"
+        class="euiButton euiButton--primary"
+        type="submit"
+      >
+        <span class="euiButton__content">
+          Create index pattern
+        </span>
+      </button>
     </div>
   </div>
 </form>