diff --git a/templates/panel/sitekey/view/__delete-btn.html b/templates/panel/sitekey/view/__delete-btn.html
new file mode 100644
index 00000000..94dd40ee
--- /dev/null
+++ b/templates/panel/sitekey/view/__delete-btn.html
@@ -0,0 +1,6 @@
+<a href="<.= crate::PAGES.panel.sitekey.get_delete(&key) .>">
+    <img class="sitekey-form__delete" 
+         src="<.= crate::FILES.get("./static/cache/img/svg/trash.svg").unwrap() .>"
+         alt="Delete sitekey" 
+    />
+</a>
diff --git a/templates/panel/sitekey/view/__edit-sitekey-icon.html b/templates/panel/sitekey/view/__edit-sitekey-icon.html
index a6123e43..fe71d177 100644
--- a/templates/panel/sitekey/view/__edit-sitekey-icon.html
+++ b/templates/panel/sitekey/view/__edit-sitekey-icon.html
@@ -1,4 +1,4 @@
-<a href="<.= key .>/edit/">
+<a href="<.= edit_url .>">
   <img class="sitekey-form__edit" src="<.=
   crate::FILES.get("./static/cache/img/svg/edit.svg").unwrap() .>" alt="Edit
   sitekey" />
diff --git a/templates/panel/sitekey/view/__form-body.html b/templates/panel/sitekey/view/__form-body.html
new file mode 100644
index 00000000..0431a332
--- /dev/null
+++ b/templates/panel/sitekey/view/__form-body.html
@@ -0,0 +1,32 @@
+</h1>
+<label class="sitekey-form__label" for="description">
+    Description
+  <input
+    <. if READONLY { .>
+      <.= "readonly='readonly'" .>
+    <. } .>
+    class="sitekey-form__input"
+    type="text"
+    name="description"
+    id="description"
+    required
+    <. if !name.trim().is_empty() { .>
+    value="<.= name .>"
+    <. } .>
+  />
+</label>
+<label class="sitekey-form__label" for="duration">
+    Cooldown Duratoin(in seconds)
+  <input
+    <. if READONLY { .>
+    <.= "readonly='readonly'" .>
+    <. } .>
+    class="sitekey-form__input"
+    type="number"
+    name="duration"
+    id="duration"
+    min=0
+    required
+    value="<.= duration .>"
+  />
+</label>
diff --git a/templates/panel/sitekey/view/__form-container-setup.html b/templates/panel/sitekey/view/__form-container-setup.html
new file mode 100644
index 00000000..ca2008e7
--- /dev/null
+++ b/templates/panel/sitekey/view/__form-container-setup.html
@@ -0,0 +1,11 @@
+<. include!("../../../components/headers/widget-headers.html"); .> 
+<body class="layout">
+<. include!("../../navbar/index.html"); .>
+<div class="tmp-layout">
+<. include!("../../header/index.html"); .>
+<main class="panel-main">
+  <. include!("../../help-banner/index.html"); .>
+  <!-- Main content container -->
+  <div class="inner-container">
+    <!-- Main menu/ important actions roaster -->
+    <form class="sitekey-form" action="<.= URL .>" method="post">
diff --git a/templates/panel/sitekey/view/__form-top.html b/templates/panel/sitekey/view/__form-top.html
deleted file mode 100644
index c32a5d52..00000000
--- a/templates/panel/sitekey/view/__form-top.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<. include!("../../../components/headers/widget-headers.html"); .> 
-<body class="layout">
-<. include!("../../navbar/index.html"); .>
-<div class="tmp-layout">
-<. include!("../../header/index.html"); .>
-<main class="panel-main">
-  <. include!("../../help-banner/index.html"); .>
-  <!-- Main content container -->
-  <div class="inner-container">
-    <!-- Main menu/ important actions roaster -->
-    <form class="sitekey-form" action="<.= URL .>" method="post">
-	  <h1 class="form__title">Sitekey: <.= name .> 
-        <a 
-          target="_blank"
-		  href="<.= crate::WIDGET_ROUTES.verification_widget .>/?sitekey=<.= key.>"
-        >View deployment
-          <img class="sitekey-form__widget-link" 
-            src="<.= crate::FILES.get("./static/cache/img/svg/external-link.svg").unwrap() .>"
-            alt="View widget deployment" 
-          />
-        </a> 
-        <. if READONLY { .>
-			<. let key = "."; .>
-            <. include!("./__edit-sitekey-icon.html"); .>
-			<a href="./delete/<.= key .>">
-        <. } else {  .>
-		<a href="../delete/<.= key .>">
-        <. } .>
-          <img class="sitekey-form__delete" 
-               src="<.= crate::FILES.get("./static/cache/img/svg/trash.svg").unwrap() .>"
-               alt="Delete sitekey" 
-          />
-        </a>
-	  </h1>
-      <label class="sitekey-form__label" for="description">
-          Description
-        <input
-          <. if READONLY { .>
-            <.= "readonly='readonly'" .>
-		  <. } .>
-          class="sitekey-form__input"
-          type="text"
-          name="description"
-          id="description"
-          required
-          <. if !name.trim().is_empty() { .>
-          value="<.= name .>"
-          <. } .>
-        />
-      </label>
-      <label class="sitekey-form__label" for="duration">
-          Cooldown Duratoin(in seconds)
-        <input
-		  <. if READONLY { .>
-		  <.= "readonly='readonly'" .>
-		  <. } .>
-          class="sitekey-form__input"
-          type="number"
-          name="duration"
-          id="duration"
-          min=0
-          required
-          value="<.= duration .>"
-        />
-      </label>
diff --git a/templates/panel/sitekey/view/index.html b/templates/panel/sitekey/view/index.html
index bf0b71aa..648b3bac 100644
--- a/templates/panel/sitekey/view/index.html
+++ b/templates/panel/sitekey/view/index.html
@@ -1,8 +1,27 @@
 <. const URL: &str = crate::V1_API_ROUTES.captcha.create; .>
 <. const READONLY: bool = true; .>
-<. include!("./__form-top.html"); .>
+<. let edit_url = crate::PAGES.panel.sitekey.get_edit_easy(&key) ;.>
+<. include!("./__form-container-setup.html"); .>
+    <h1 class="form__title">Sitekey: <.= name .> 
+    <a 
+      target="_blank"
+      href="<.= crate::WIDGET_ROUTES.verification_widget .>/?sitekey=<.= &key.>"
+    >View deployment
+      <img class="sitekey-form__widget-link" 
+        src="<.= crate::FILES.get("./static/cache/img/svg/external-link.svg").unwrap() .>"
+        alt="View widget deployment" 
+      />
+    </a> 
+
+  <. if READONLY { .>
+    <. let edit_url = crate::PAGES.panel.sitekey.get_edit_easy(&key) ;.>
+      <. include!("./__edit-sitekey-icon.html"); .>
+    <. } .>
+    <. include!("./__delete-btn.html"); .>
+
+      <. include!("./__form-body.html"); .>
       <. for (count, level) in levels.iter().enumerate() { .>
-        <. include!("./existing-level.html"); .> 
+        <. include!("./existing-level.html"); .>
       <. } .>
 <./* synchronise with "./__form-bottom.html" Lines below should break form */.>
     </form>
