diff --git a/404.md b/404.md
index f21d3a51..93f35f9b 100644
--- a/404.md
+++ b/404.md
@@ -1,3 +1,17 @@
 ---
 permalink: /404.html
+layout: error
+errormessage: 🙅‍♀️ 404
+body_class: homepage
+errorhuman: "OpenSearch can't find that page." 
 ---
+
+Sorry about that. Perhaps we moved something around, or you mistyped the URL? 
+
+
+Head to the [OpenSearch Documentation home page](https://opensearch.org/docs/latest/) or try our [community forum](https://forum.opensearch.org/).
+
+
+
+
+
diff --git a/index.md b/index.md
index 910b258d..8b1ab0b9 100755
--- a/index.md
+++ b/index.md
@@ -3,7 +3,6 @@ layout: default
 title: OpenSearch documentation
 nav_order: 1
 has_children: true
-redirect_from: /404.html
 permalink: /
 ---