diff --git a/src/components/process/processStepOne/ProcessStepOne.tsx b/src/components/process/processStepOne/ProcessStepOne.tsx
index bdd1270..4c1b9ea 100644
--- a/src/components/process/processStepOne/ProcessStepOne.tsx
+++ b/src/components/process/processStepOne/ProcessStepOne.tsx
@@ -69,7 +69,7 @@ const ProcessStepOne = () => {
     // Fetching Transaction Details - START 
     (async () => {
       try {
-        const res = await api.get(`/api/accounts/${accountId}/transactions/${transactionId}`);
+        const res = await api.get(`/api/accounts/${accountId}/${transactionTemplateToggle}/${transactionId}`);
         setTransactionDetails(res.data)
       } catch (e) {
         console.log("Error - transactions details")
@@ -323,7 +323,7 @@ const ProcessStepOne = () => {
               onClick={() => handleNextClick(false)}
               className="text-sm px-4 py-2 rounded bg-[var(--primary)] text-white shadow hover:bg-[var(--primaryLight2)] transition"
             >
-              {signType === SignTypeEnum.selfSign ? "Add Tags" : "Add Tags"}
+              {signType === SignTypeEnum.selfSign ? "Sign" : "Next"}
             </button>
           </div>
         </div>
diff --git a/src/components/templates/Templates.tsx b/src/components/templates/Templates.tsx
index 47c22c6..a75a6e6 100644
--- a/src/components/templates/Templates.tsx
+++ b/src/components/templates/Templates.tsx
@@ -30,7 +30,7 @@ const Templates = () => {
     console.log("handleAddTemplate called");
     try {
       const res = await api.post(`/api/accounts/${activeAccountId}/templates`);
-      navigate(`/process-step-one/${activeAccountId}/template/${res.data}`)
+      navigate(`/process-step-one/${activeAccountId}/template/${res.data.id}`)
     } catch (error) {
       console.log(error)
     }
diff --git a/src/index.css b/src/index.css
index c140aab..e4f589e 100644
--- a/src/index.css
+++ b/src/index.css
@@ -113,14 +113,14 @@ canvas {
   left: 50%;
   transform: translateX(-50%);
   z-index: 50;
-  background-color: var(--primary); 
+  background-color: var(--primary);
   color: var(--primaryLight);
   padding: 2px 8px;
   border-radius: 5px;
 }
 
 .bottom-border>div:hover {
-  background-color: var(--primaryLight2) ;
+  background-color: var(--primaryLight2);
   opacity: 0.9;
   transition: all 0.3s ease-in-out;
   cursor: pointer;
@@ -129,8 +129,8 @@ canvas {
 /* Group Border - END */
 
 
-  /* Loader CSS */
- /* From Uiverse.io by Juanes200122 */ 
+/* Loader CSS */
+/* From Uiverse.io by Juanes200122 */
 .pl {
   width: 6em;
   height: 6em;
@@ -158,10 +158,12 @@ canvas {
   animation-name: ringD;
   stroke: #41644A;
 }
-  
-  /* Animations */
+
+/* Animations */
 @keyframes ringA {
-  from, 4% {
+
+  from,
+  4% {
     stroke-dasharray: 0 660;
     stroke-width: 20;
     stroke-dashoffset: -330;
@@ -179,7 +181,8 @@ canvas {
     stroke-dashoffset: -595;
   }
 
-  40%, 54% {
+  40%,
+  54% {
     stroke-dasharray: 0 660;
     stroke-width: 20;
     stroke-dashoffset: -660;
@@ -197,7 +200,8 @@ canvas {
     stroke-dashoffset: -925;
   }
 
-  90%, to {
+  90%,
+  to {
     stroke-dasharray: 0 660;
     stroke-width: 20;
     stroke-dashoffset: -990;
@@ -205,7 +209,9 @@ canvas {
 }
 
 @keyframes ringB {
-  from, 12% {
+
+  from,
+  12% {
     stroke-dasharray: 0 220;
     stroke-width: 20;
     stroke-dashoffset: -110;
@@ -223,7 +229,8 @@ canvas {
     stroke-dashoffset: -195;
   }
 
-  48%, 62% {
+  48%,
+  62% {
     stroke-dasharray: 0 220;
     stroke-width: 20;
     stroke-dashoffset: -220;
@@ -241,7 +248,8 @@ canvas {
     stroke-dashoffset: -305;
   }
 
-  98%, to {
+  98%,
+  to {
     stroke-dasharray: 0 220;
     stroke-width: 20;
     stroke-dashoffset: -330;
@@ -267,7 +275,8 @@ canvas {
     stroke-dashoffset: -175;
   }
 
-  36%, 58% {
+  36%,
+  58% {
     stroke-dasharray: 0 440;
     stroke-width: 20;
     stroke-dashoffset: -220;
@@ -285,7 +294,8 @@ canvas {
     stroke-dashoffset: -395;
   }
 
-  94%, to {
+  94%,
+  to {
     stroke-dasharray: 0 440;
     stroke-width: 20;
     stroke-dashoffset: -440;
@@ -293,7 +303,9 @@ canvas {
 }
 
 @keyframes ringD {
-  from, 8% {
+
+  from,
+  8% {
     stroke-dasharray: 0 440;
     stroke-width: 20;
     stroke-dashoffset: 0;
@@ -311,7 +323,8 @@ canvas {
     stroke-dashoffset: -175;
   }
 
-  44%, 50% {
+  44%,
+  50% {
     stroke-dasharray: 0 440;
     stroke-width: 20;
     stroke-dashoffset: -220;
@@ -329,14 +342,16 @@ canvas {
     stroke-dashoffset: -395;
   }
 
-  86%, to {
+  86%,
+  to {
     stroke-dasharray: 0 440;
     stroke-width: 20;
     stroke-dashoffset: -440;
   }
 }
+
 .bottom-border>div:hover {
-  background-color: var(--primaryLight2) ;
+  background-color: var(--primaryLight2);
   opacity: 0.9;
   transition: all 0.3s ease-in-out;
   cursor: pointer;
@@ -344,3 +359,11 @@ canvas {
 
 /* Group Border - END */
 
+
+
+/* JoyRide - START */
+.__floater__body > div > button:last-child {
+  display: none !important;
+}
+
+/* JoyRide - END */
\ No newline at end of file