diff --git a/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx b/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
index 6a6d6a987..4f2b52f7a 100644
--- a/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
+++ b/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
@@ -405,6 +405,7 @@ const IndexDetail = (
               panels={[
                 {
                   id: 0,
+                  width: 400,
                   items: sourceIndices.map((sourceIndex) => ({
                     name: sourceIndex,
                     "data-test-subj": `import-settings-${sourceIndex}`,
diff --git a/public/pages/Reindex/components/ReindexAdvancedOptions/ReindexAdvancedOptions.tsx b/public/pages/Reindex/components/ReindexAdvancedOptions/ReindexAdvancedOptions.tsx
index 8e027de9b..f247fe8ca 100644
--- a/public/pages/Reindex/components/ReindexAdvancedOptions/ReindexAdvancedOptions.tsx
+++ b/public/pages/Reindex/components/ReindexAdvancedOptions/ReindexAdvancedOptions.tsx
@@ -78,7 +78,7 @@ const ReindexAdvancedOptions = (props: ReindexOptionsProps) => {
       </CustomFormRow>
 
       <EuiSpacer />
-      <CustomFormRow label="Pipeline" helpText="Pipeline pre-process documents before writing into destination">
+      <CustomFormRow label="Pipeline" helpText="Pipeline pre-process documents before writing into destination.">
         <EuiComboBox
           aria-label="Ingest Pipeline"
           placeholder="Select a single pipeline"
diff --git a/public/pages/Reindex/components/ReindexAdvancedOptions/__snapshots__/ReindexAdvancedOptions.test.tsx.snap b/public/pages/Reindex/components/ReindexAdvancedOptions/__snapshots__/ReindexAdvancedOptions.test.tsx.snap
index fbf556ef7..d8de70df8 100644
--- a/public/pages/Reindex/components/ReindexAdvancedOptions/__snapshots__/ReindexAdvancedOptions.test.tsx.snap
+++ b/public/pages/Reindex/components/ReindexAdvancedOptions/__snapshots__/ReindexAdvancedOptions.test.tsx.snap
@@ -143,7 +143,7 @@ Object {
               class="euiFormHelpText euiFormRow__text"
               style="padding-top: 0px; padding-bottom: 4px;"
             >
-              Pipeline pre-process documents before writing into destination
+              Pipeline pre-process documents before writing into destination.
             </div>
             <div
               aria-expanded="false"
@@ -344,7 +344,7 @@ Object {
             class="euiFormHelpText euiFormRow__text"
             style="padding-top: 0px; padding-bottom: 4px;"
           >
-            Pipeline pre-process documents before writing into destination
+            Pipeline pre-process documents before writing into destination.
           </div>
           <div
             aria-expanded="false"
diff --git a/public/pages/Reindex/container/Reindex/Reindex.tsx b/public/pages/Reindex/container/Reindex/Reindex.tsx
index 642aea515..a64d32a86 100644
--- a/public/pages/Reindex/container/Reindex/Reindex.tsx
+++ b/public/pages/Reindex/container/Reindex/Reindex.tsx
@@ -257,7 +257,7 @@ export default class Reindex extends Component<ReindexProps, ReindexState> {
     });
     if (res && res.ok) {
       // @ts-ignore
-      const toast = `Successfully started reindexing ${reindexRequest.body.source.index}.The reindex index will be named ${reindexRequest.body.dest.index}.`;
+      const toast = `Successfully started reindexing ${reindexRequest.body.source.index}.The reindexed index will be named ${reindexRequest.body.dest.index}.`;
       const toastInstance = (this.context as CoreStart).notifications.toasts.addSuccess(toast, {
         toastLifeTimeMs: 1000 * 60 * 60 * 24 * 5,
       });
@@ -523,55 +523,54 @@ export default class Reindex extends Component<ReindexProps, ReindexState> {
 
           <EuiSpacer />
           <CustomFormRow>
-            <>
-              <EuiRadioGroup
-                options={[
-                  {
-                    id: "all",
-                    label: "Reindex all documents",
-                  },
-                  {
-                    id: "subset",
-                    label: "Reindex a subset of documents (Advanced)",
-                  },
-                ]}
-                idSelected={subset ? "subset" : "all"}
-                onChange={(id) => {
-                  this.setState({ subset: id === "subset" });
-                }}
-                name="subsetOption"
-                data-test-subj="subsetOption"
-                legend={{
-                  children: <span>Specify a reindex option</span>,
-                }}
-              />
-              <EuiSpacer />
-              {subset ? (
-                <CustomFormRow
-                  label="Query expression"
-                  isInvalid={!!sourceQueryErr}
-                  error={sourceQueryErr}
-                  labelAppend={
-                    <EuiText size="xs">
-                      <EuiLink href={this.context.docLinks.links.opensearch.queryDSL.base} target="_blank" rel="noopener noreferrer">
-                        learn more about query-dsl
-                      </EuiLink>
-                    </EuiText>
-                  }
-                >
-                  <JSONEditor
-                    mode="json"
-                    width="100%"
-                    value={sourceQuery}
-                    onChange={this.onSourceQueryChange}
-                    aria-label="Query DSL Editor"
-                    height="150px"
-                    data-test-subj="queryJsonEditor"
-                  />
-                </CustomFormRow>
-              ) : null}
-            </>
+            <EuiRadioGroup
+              options={[
+                {
+                  id: "all",
+                  label: "Reindex all documents",
+                },
+                {
+                  id: "subset",
+                  label: "Reindex a subset of documents (Advanced)",
+                },
+              ]}
+              idSelected={subset ? "subset" : "all"}
+              onChange={(id) => {
+                this.setState({ subset: id === "subset" });
+              }}
+              name="subsetOption"
+              data-test-subj="subsetOption"
+              legend={{
+                children: <span>Specify a reindex option</span>,
+              }}
+            />
           </CustomFormRow>
+          <EuiSpacer />
+          {subset ? (
+            <CustomFormRow
+              fullWidth={true}
+              label="Query expression"
+              isInvalid={!!sourceQueryErr}
+              error={sourceQueryErr}
+              labelAppend={
+                <EuiText size="xs">
+                  <EuiLink href={this.context.docLinks.links.opensearch.queryDSL.base} target="_blank" rel="noopener noreferrer">
+                    Learn more about query DSL
+                  </EuiLink>
+                </EuiText>
+              }
+            >
+              <JSONEditor
+                mode="json"
+                width="100%"
+                value={sourceQuery}
+                onChange={this.onSourceQueryChange}
+                aria-label="Query DSL Editor"
+                height="200px"
+                data-test-subj="queryJsonEditor"
+              />
+            </CustomFormRow>
+          ) : null}
         </ContentPanel>
 
         <EuiSpacer />
diff --git a/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap b/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
index 09c99028c..9b3493e5d 100644
--- a/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
+++ b/public/pages/Reindex/container/Reindex/__snapshots__/Reindex.test.tsx.snap
@@ -212,11 +212,11 @@ exports[`<Reindex /> spec renders the component 1`] = `
               </label>
             </div>
           </fieldset>
-          <div
-            class="euiSpacer euiSpacer--l"
-          />
         </div>
       </div>
+      <div
+        class="euiSpacer euiSpacer--l"
+      />
     </div>
   </div>
   <div