diff --git a/cypress/integration/create_index.js b/cypress/integration/create_index.js
index f1a78f55d..1b6709568 100644
--- a/cypress/integration/create_index.js
+++ b/cypress/integration/create_index.js
@@ -181,7 +181,7 @@ describe("Create Index", () => {
         .type('{ "index.blocks.write": true, "index.number_of_shards": "3" }', { parseSpecialCharSequences: false, force: true })
         .end()
         .wait(1000)
-        .get('[placeholder="The number of replica shards each primary shard should have."]')
+        .get('[placeholder="Specify number of replicas."]')
         .clear()
         .type(2)
         .end();
diff --git a/public/lib/field/rules/index.ts b/public/lib/field/rules/index.ts
index 9ca515d6d..d26b0d365 100644
--- a/public/lib/field/rules/index.ts
+++ b/public/lib/field/rules/index.ts
@@ -45,6 +45,10 @@ const rules = {
     const isNum = typeof value === "number";
     const isStr = typeof value === "string";
 
+    if (value === "") {
+      return "";
+    }
+
     if (isNum) {
       key = "number";
     } else if (isStr) {
diff --git a/public/pages/Aliases/containers/CreateAlias/index.tsx b/public/pages/Aliases/containers/CreateAlias/index.tsx
index 5003d8d12..4cbb815ec 100644
--- a/public/pages/Aliases/containers/CreateAlias/index.tsx
+++ b/public/pages/Aliases/containers/CreateAlias/index.tsx
@@ -123,7 +123,9 @@ export default function CreateAlias(props: ICreateAliasProps) {
       <EuiModalBody>
         {isEdit && filterByMinimatch(props.alias?.alias || "", SYSTEM_ALIAS) ? (
           <>
-            <EuiCallOut color="warning">You are editing a system-like alias, please be careful before you do any change to it.</EuiCallOut>
+            <EuiCallOut color="warning">
+              This alias may contain critical system data. Changing system aliases may break OpenSearch.
+            </EuiCallOut>
             <EuiSpacer />
           </>
         ) : null}
@@ -202,14 +204,20 @@ export default function CreateAlias(props: ICreateAliasProps) {
                   alias: values.alias,
                   index,
                 }));
-                result = await services?.commonService.apiCaller({
-                  endpoint: "indices.updateAliases",
-                  data: {
-                    body: {
-                      actions,
+                if (actions.length === 0) {
+                  result = {
+                    ok: true,
+                  };
+                } else {
+                  result = await services?.commonService.apiCaller({
+                    endpoint: "indices.updateAliases",
+                    data: {
+                      body: {
+                        actions,
+                      },
                     },
-                  },
-                });
+                  });
+                }
               } else {
                 result = await services?.commonService.apiCaller({
                   endpoint: "indices.putAlias",
diff --git a/public/pages/Aliases/containers/DeleteAliasModal/DeleteAliasModal.tsx b/public/pages/Aliases/containers/DeleteAliasModal/DeleteAliasModal.tsx
index 5b3b320e0..727c1f3ee 100644
--- a/public/pages/Aliases/containers/DeleteAliasModal/DeleteAliasModal.tsx
+++ b/public/pages/Aliases/containers/DeleteAliasModal/DeleteAliasModal.tsx
@@ -74,7 +74,9 @@ export default function DeleteAliasModal(props: DeleteAliasModalProps) {
       <EuiModalBody>
         {hasSystemIndex ? (
           <>
-            <EuiCallOut color="warning">You are trying to delete system-like alias, please be careful.</EuiCallOut>
+            <EuiCallOut color="warning">
+              These aliases may contain critical system data. Deleting system aliases may break OpenSearch.
+            </EuiCallOut>
             <EuiSpacer />
           </>
         ) : null}
diff --git a/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx b/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
index a55f1ba11..f718fdcee 100644
--- a/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
+++ b/public/pages/CreateIndex/components/IndexDetail/IndexDetail.tsx
@@ -261,6 +261,9 @@ const IndexDetail = (
             },
             {
               validator(rule, value, values) {
+                if (!value) {
+                  return Promise.reject("Number of primary shards is required.");
+                }
                 if (Number(value) !== parseInt(value)) {
                   return Promise.reject("Number of primary shards must be an integer.");
                 }
@@ -270,7 +273,7 @@ const IndexDetail = (
             },
           ],
           props: {
-            placeholder: "The number of primary shards in the index. Default is 1.",
+            placeholder: "Specify primary shard count.",
           },
         },
       },
@@ -290,6 +293,9 @@ const IndexDetail = (
             },
             {
               validator(rule, value, values) {
+                if (!value) {
+                  return Promise.reject("Number of replicas is required.");
+                }
                 if (Number(value) !== parseInt(value)) {
                   return Promise.reject("Number of replicas must be an integer.");
                 }
@@ -299,7 +305,7 @@ const IndexDetail = (
             },
           ],
           props: {
-            placeholder: "The number of replica shards each primary shard should have.",
+            placeholder: "Specify number of replicas.",
           },
         },
       },
@@ -329,7 +335,9 @@ const IndexDetail = (
     <>
       {isEdit && !readonly && filterByMinimatch(value?.index as string, SYSTEM_INDEX) ? (
         <>
-          <EuiCallOut color="warning">You are editing a system-like index, please be careful before you do any change to it.</EuiCallOut>
+          <EuiCallOut color="warning">
+            This index may contain critical system data. Changing system indexes may break OpenSearch.
+          </EuiCallOut>
           <EuiSpacer />
         </>
       ) : null}
@@ -475,13 +483,13 @@ const IndexDetail = (
                     helpText: (
                       <>
                         <p>
-                          Specify a comma-delimited list of settings.
+                          Specify a comma-delimited list of settings.{" "}
                           <EuiLink external href={INDEX_SETTINGS_URL} target="_blank">
                             View index settings.
                           </EuiLink>
                         </p>
                         <p>
-                          All the settings will be handled in flat structure.
+                          All the settings will be handled in flat structure.{" "}
                           <EuiLink
                             href={`https://opensearch.org/docs/${docVersion}/api-reference/index-apis/get-index/#url-parameters`}
                             external
diff --git a/public/pages/CreateIndex/components/IndexMapping/IndexMapping.tsx b/public/pages/CreateIndex/components/IndexMapping/IndexMapping.tsx
index 2fe2cb7a3..d4cfeed79 100644
--- a/public/pages/CreateIndex/components/IndexMapping/IndexMapping.tsx
+++ b/public/pages/CreateIndex/components/IndexMapping/IndexMapping.tsx
@@ -229,7 +229,7 @@ const IndexMapping = (
                   });
                 }}
               >
-                See previous settings
+                See previous mappings
               </EuiButton>
               <EuiSpacer />
             </>
diff --git a/public/pages/CreateIndexTemplate/components/IndexSettings/IndexSettings.tsx b/public/pages/CreateIndexTemplate/components/IndexSettings/IndexSettings.tsx
index 8d08b50f6..058fb6888 100644
--- a/public/pages/CreateIndexTemplate/components/IndexSettings/IndexSettings.tsx
+++ b/public/pages/CreateIndexTemplate/components/IndexSettings/IndexSettings.tsx
@@ -50,6 +50,9 @@ export default function IndexSettings(props: SubDetailProps) {
                   },
                   {
                     validator(rule, value) {
+                      if (!value) {
+                        return Promise.reject("Number of primary shards is required.");
+                      }
                       if (Number(value) !== parseInt(value)) {
                         return Promise.reject("Number of primary shards must be an integer.");
                       }
@@ -78,6 +81,9 @@ export default function IndexSettings(props: SubDetailProps) {
                   },
                   {
                     validator(rule, value) {
+                      if (!value) {
+                        return Promise.reject("Number of replicas is required.");
+                      }
                       if (Number(value) !== parseInt(value)) {
                         return Promise.reject("Number of replicas must be an integer");
                       }
diff --git a/public/pages/CreateIndexTemplate/containers/CreateIndexTemplate/__snapshots__/CreateIndexTemplate.test.tsx.snap b/public/pages/CreateIndexTemplate/containers/CreateIndexTemplate/__snapshots__/CreateIndexTemplate.test.tsx.snap
index 10df6b780..3d704df9a 100644
--- a/public/pages/CreateIndexTemplate/containers/CreateIndexTemplate/__snapshots__/CreateIndexTemplate.test.tsx.snap
+++ b/public/pages/CreateIndexTemplate/containers/CreateIndexTemplate/__snapshots__/CreateIndexTemplate.test.tsx.snap
@@ -23,7 +23,7 @@ exports[`<CreateIndexTemplate /> spec it goes to templates page when click cance
         style="flex-direction: row;"
       >
         <button
-          class="euiButton euiButton--primary euiButton--fill"
+          class="euiButton euiButton--primary"
           style="margin-right: 20px;"
           type="button"
         >
diff --git a/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx b/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
index 3ac2bf9aa..3940ce490 100644
--- a/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
+++ b/public/pages/CreateIndexTemplate/containers/TemplateDetail/TemplateDetail.tsx
@@ -94,6 +94,7 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
         })
         .catch(() => {
           // do nothing
+          props.history.replace(ROUTES.TEMPLATES);
         });
     }
     return () => {
@@ -134,7 +135,6 @@ const TemplateDetail = (props: TemplateDetailProps, ref: Ref<FieldInstance>) =>
         {readonly ? (
           <EuiFlexItem grow={false} style={{ flexDirection: "row" }}>
             <EuiButton
-              fill
               style={{ marginRight: 20 }}
               onClick={() => {
                 const showValue: TemplateItemRemote = {
diff --git a/public/pages/Indices/components/CloseIndexModal/CloseIndexModal.tsx b/public/pages/Indices/components/CloseIndexModal/CloseIndexModal.tsx
index 6e3335482..8da8bee1a 100644
--- a/public/pages/Indices/components/CloseIndexModal/CloseIndexModal.tsx
+++ b/public/pages/Indices/components/CloseIndexModal/CloseIndexModal.tsx
@@ -50,7 +50,7 @@ export default function CloseIndexModal(props: CloseIndexModalProps) {
       <EuiModalBody>
         <>
           <EuiCallOut color="warning" hidden={!showWarning}>
-            You are closing system like index, please be careful before you do any change to it.
+            This index may contain critical system data. Closing system indexes may break OpenSearch.
           </EuiCallOut>
           <EuiSpacer />
         </>
diff --git a/public/pages/Indices/components/CloseIndexModal/__snapshots__/CloseIndexModal.test.tsx.snap b/public/pages/Indices/components/CloseIndexModal/__snapshots__/CloseIndexModal.test.tsx.snap
index 77d591b0d..04fde70d1 100644
--- a/public/pages/Indices/components/CloseIndexModal/__snapshots__/CloseIndexModal.test.tsx.snap
+++ b/public/pages/Indices/components/CloseIndexModal/__snapshots__/CloseIndexModal.test.tsx.snap
@@ -58,7 +58,7 @@ HTMLCollection [
                   <div
                     class="euiTextColor euiTextColor--default"
                   >
-                    You are closing system like index, please be careful before you do any change to it.
+                    This index may contain critical system data. Closing system indexes may break OpenSearch.
                   </div>
                 </div>
               </div>
diff --git a/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.test.tsx b/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.test.tsx
index 1011b9a2d..96d587f4b 100644
--- a/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.test.tsx
+++ b/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.test.tsx
@@ -13,7 +13,9 @@ describe("<DeleteIndexModal /> spec", () => {
   it("renders the component", async () => {
     const { getByText } = render(<DeleteIndexModal selectedItems={[".kibana", "test"]} visible onConfirm={() => {}} onClose={() => {}} />);
 
-    await waitFor(() => expect(getByText("You are trying to delete system-like index, please be careful.")).toBeInTheDocument());
+    await waitFor(() =>
+      expect(getByText("These indexes may contain critical system data. Deleting system indexes may break OpenSearch.")).toBeInTheDocument()
+    );
     expect(document.body.children).toMatchSnapshot();
   });
 
diff --git a/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.tsx b/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.tsx
index 490f06209..cfa742a97 100644
--- a/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.tsx
+++ b/public/pages/Indices/components/DeleteIndexModal/DeleteIndexModal.tsx
@@ -50,7 +50,9 @@ export default function DeleteIndexModal(props: DeleteIndexModalProps) {
       <EuiModalBody>
         {hasSystemIndex ? (
           <>
-            <EuiCallOut color="warning">You are trying to delete system-like index, please be careful.</EuiCallOut>
+            <EuiCallOut color="warning">
+              These indexes may contain critical system data. Deleting system indexes may break OpenSearch.
+            </EuiCallOut>
             <EuiSpacer />
           </>
         ) : null}
diff --git a/public/pages/Indices/components/DeleteIndexModal/__snapshots__/DeleteIndexModal.test.tsx.snap b/public/pages/Indices/components/DeleteIndexModal/__snapshots__/DeleteIndexModal.test.tsx.snap
index 6207dd6e6..19062a096 100644
--- a/public/pages/Indices/components/DeleteIndexModal/__snapshots__/DeleteIndexModal.test.tsx.snap
+++ b/public/pages/Indices/components/DeleteIndexModal/__snapshots__/DeleteIndexModal.test.tsx.snap
@@ -57,7 +57,7 @@ HTMLCollection [
                   <div
                     class="euiTextColor euiTextColor--default"
                   >
-                    You are trying to delete system-like index, please be careful.
+                    These indexes may contain critical system data. Deleting system indexes may break OpenSearch.
                   </div>
                 </div>
               </div>
diff --git a/public/pages/Reindex/components/CreateIndexFlyout/__snapshots__/CreateIndexFlyout.test.tsx.snap b/public/pages/Reindex/components/CreateIndexFlyout/__snapshots__/CreateIndexFlyout.test.tsx.snap
index 16b7d4cd9..514b4daeb 100644
--- a/public/pages/Reindex/components/CreateIndexFlyout/__snapshots__/CreateIndexFlyout.test.tsx.snap
+++ b/public/pages/Reindex/components/CreateIndexFlyout/__snapshots__/CreateIndexFlyout.test.tsx.snap
@@ -291,7 +291,7 @@ Object {
                               >
                                 <input
                                   class="euiFieldNumber"
-                                  placeholder="The number of primary shards in the index. Default is 1."
+                                  placeholder="Specify primary shard count."
                                   type="number"
                                   value="1"
                                 />
@@ -336,7 +336,7 @@ Object {
                               >
                                 <input
                                   class="euiFieldNumber"
-                                  placeholder="The number of replica shards each primary shard should have."
+                                  placeholder="Specify number of replicas."
                                   type="number"
                                   value="1"
                                 />
@@ -459,6 +459,7 @@ Object {
                                   >
                                     <p>
                                       Specify a comma-delimited list of settings.
+                                       
                                       <a
                                         class="euiLink euiLink--primary"
                                         href="https://opensearch.org/docs/latest/api-reference/index-apis/create-index#index-settings"
@@ -476,6 +477,7 @@ Object {
                                     </p>
                                     <p>
                                       All the settings will be handled in flat structure.
+                                       
                                       <a
                                         class="euiLink euiLink--primary"
                                         href="https://opensearch.org/docs/undefined/api-reference/index-apis/get-index/#url-parameters"