diff --git a/src/components/ApiErrors.tsx b/src/components/ApiErrors.tsx
index 96afd196b..d64227e96 100644
--- a/src/components/ApiErrors.tsx
+++ b/src/components/ApiErrors.tsx
@@ -27,7 +27,7 @@ export default React.memo(
             errors:{" "}
             <span
               className={typographyStyles.typeText}
-            >{`Record<string, Object>`}</span>
+            >{`Record<string, object>`}</span>
           </h2>
         </code>
 
diff --git a/src/components/ApiWatch.tsx b/src/components/ApiWatch.tsx
index 42e60f90c..d8d21fc24 100644
--- a/src/components/ApiWatch.tsx
+++ b/src/components/ApiWatch.tsx
@@ -107,7 +107,7 @@ export default function ApiWatch({
                 <code>watch('inputName')</code>
               </td>
               <td>
-                <code className={typographyStyles.typeText}>unkown</code>
+                <code className={typographyStyles.typeText}>unknown</code>
               </td>
             </tr>
             <tr>
diff --git a/src/components/UseWatchContent.tsx b/src/components/UseWatchContent.tsx
index 0ab11feb9..c41fbccc5 100644
--- a/src/components/UseWatchContent.tsx
+++ b/src/components/UseWatchContent.tsx
@@ -140,7 +140,7 @@ export default function UseFieldArray({
                 <code>useWatch('inputName')</code>
               </td>
               <td>
-                <code className={typographyStyles.typeText}>unkown</code>
+                <code className={typographyStyles.typeText}>unknown</code>
               </td>
             </tr>
             <tr>
diff --git a/src/components/layout.tsx b/src/components/layout.tsx
index 099a10c49..b2b39a27d 100644
--- a/src/components/layout.tsx
+++ b/src/components/layout.tsx
@@ -22,6 +22,7 @@ const Layout = (props: {
   const { currentLanguage } =
     language && language.currentLanguage ? language : { currentLanguage: "en" }
   const lightMode = state?.setting?.lightMode
+  const currentVersion = state?.setting?.version
   const [show, setShow] = React.useState(false)
   const scrollHandler = () => {
     if (window.scrollY > 75) {
@@ -30,7 +31,11 @@ const Layout = (props: {
       setShow(false)
     }
   }
-  const editLink = getEditLink(currentLanguage, props.location?.pathname)
+  const editLink = getEditLink(
+    currentVersion,
+    currentLanguage,
+    props.location?.pathname
+  )
 
   React.useEffect(() => {
     window.addEventListener("scroll", scrollHandler)
diff --git a/src/components/logic/getEditLink.tsx b/src/components/logic/getEditLink.tsx
index b4c0641b5..5bae1e8ec 100644
--- a/src/components/logic/getEditLink.tsx
+++ b/src/components/logic/getEditLink.tsx
@@ -1,22 +1,31 @@
 const preFix =
-  "https://github.com/react-hook-form/documentation/edit/master/src/data/"
+  "https://github.com/react-hook-form/documentation/edit/v6-v5/src/data/"
 
 export const getEditLink = (
+  currentVersion: number,
   currentLanguage: string,
   pathname: string
 ): string => {
   if (!pathname) return ""
 
+  let versionTag = ""
+  if (currentVersion === 6) {
+    versionTag = "V6/"
+  } else if (currentVersion === 5) {
+    versionTag = "V5/"
+  }
+
   if (pathname === "/" || pathname === "") {
     return preFix + "home.tsx"
   } else if (pathname.includes("get-started")) {
     return `${preFix}${currentLanguage}/getStarted.tsx`
   } else if (pathname.includes("api")) {
-    return `${preFix}${currentLanguage}/api.tsx`
+    return `${preFix}${versionTag}${currentLanguage}/api.tsx`
   } else if (pathname.includes("ts")) {
     return `${preFix}ts.tsx`
   } else if (pathname.includes("advanced-usage")) {
-    return `${preFix}${currentLanguage}/advanced.tsx`
+    const tag = currentVersion < 7 && currentLanguage === "en" ? "V6/" : ""
+    return `${preFix}${tag}${currentLanguage}/advanced.tsx`
   } else if (pathname.includes("faqs")) {
     return `${preFix}${currentLanguage}/faq.tsx`
   } else if (pathname.includes("dev-tools")) {