diff --git a/src/components/ProjectCard.tsx b/src/components/ProjectCard.tsx
index 98aa77b..384e72d 100644
--- a/src/components/ProjectCard.tsx
+++ b/src/components/ProjectCard.tsx
@@ -357,7 +357,7 @@ const ProjectCard = (props: ProjectCardProps) => {
         </div> : null}
 
         <div
-          className={`relative stats-section grid grid-cols-1 gap-2 ${ mini ? '' : 'h-28' } overflow-y-scroll tinker-scrollbar scrollbar-thumb-amber-300 scrollbar-thin scrollbar pr-3`}
+          className={`relative stats-section grid grid-cols-1 gap-2 ${ mini ? '' : 'h-28' } overflow-y-scroll tinker-scrollbar scrollbar-thumb-amber-300 scrollbar pr-3`}
           onScroll={(e) => {
             // Update the stored scroll position
             scrollPositionRef.current = (e.target as HTMLElement).scrollTop;
diff --git a/src/modals/ManageStaking.tsx b/src/modals/ManageStaking.tsx
index 0073dcb..c3710ed 100644
--- a/src/modals/ManageStaking.tsx
+++ b/src/modals/ManageStaking.tsx
@@ -269,14 +269,20 @@ const ManageStaking = (props: { isOpen: boolean; }) => {
     if (!metadata) throw new Error(NO_METADATA_ERROR);
 
     const availableBalance = new BigNumber(metadata.availableBalance as string)
-      .dividedBy(new BigNumber(10).pow(12))
-      .toString();
+      .dividedBy(new BigNumber(10).pow(12));
 
-    const balance = altBalance ? coreStakedBalance : availableBalance;
+    let balance = altBalance ? coreStakedBalance : availableBalance.toString();
+    // Remove commas before performing the subtraction
+    balance = balance.replace(/,/g, '');
+
+    // Subtract 1 TNKR to cover fees if balance is greater than 1
+    const balanceToStake = new BigNumber(balance).gte(new BigNumber(1))
+      ? new BigNumber(balance).minus(new BigNumber(1)).toString()
+      : balance;
 
     stakeForm.setValue(
       "amount",
-      balance
+      balanceToStake
     );
 
     stakeForm.trigger("amount", {
@@ -287,11 +293,21 @@ const ManageStaking = (props: { isOpen: boolean; }) => {
   const handleUnstakeMax = () => {
     if (!metadata) throw new Error(NO_METADATA_ERROR);
 
+    const totalUserStaked = new BigNumber(metadata.totalUserStaked as string)
+      .dividedBy(new BigNumber(10).pow(12));
+
+    let balance = totalUserStaked.toString();
+    // Remove commas before performing the subtraction
+    balance = balance.replace(/,/g, '');
+
+    // Subtract 1 TNKR to cover fees if balance is greater than 1
+    const balanceToUnstake = new BigNumber(balance).gt(1)
+      ? new BigNumber(balance).minus(1).toString()
+      : balance;
+
     unstakeForm.setValue(
       "amount",
-      new BigNumber(metadata.totalUserStaked as string)
-        .dividedBy(new BigNumber(10).pow(12))
-        .toString()
+      balanceToUnstake
     );
 
     unstakeForm.trigger("amount", {
@@ -367,11 +383,27 @@ const ManageStaking = (props: { isOpen: boolean; }) => {
       const currentAmount = parseFloat(stakeForm.getValues('amount'));
       const maxBalance = parseFloat(coreStakedBalance);
       if (currentAmount > maxBalance) {
-        stakeForm.setValue('amount', maxBalance.toString());
+        stakeForm.setValue('amount', maxBalance.toString().replace(/,/g, ''));
       }
     }
   }, [altBalance, coreStakedBalance, stakeForm]);
 
+  // Watch for changes in stakeForm.amount
+  useEffect(() => {
+    const value = stakeForm.getValues('amount');
+    if (value && !/^[0-9]*\.?[0-9]*$/.test(value)) {
+      stakeForm.setValue('amount', value.replace(/[^0-9.]/g, ''));
+    }
+  }, [stakeForm, watchedStakeAmount]);
+
+  // Watch for changes in unstakeForm.amount
+  useEffect(() => {
+    const value = unstakeForm.getValues('amount');
+    if (value && !/^[0-9]*\.?[0-9]*$/.test(value)) {
+      unstakeForm.setValue('amount', value.replace(/[^0-9.]/g, ''));
+    }
+  }, [unstakeForm, watchedUnstakeAmount]);
+
   const RestakingDropdown = memo(() => {
     const list = stakingCores.map(core => ({ id: core.key, userStaked: totalUserStakedData[core.key], name: core.metadata.name }) as SelectedCoreInfo);
     if (!list || list.length === 0) return null;
@@ -491,8 +523,7 @@ const ManageStaking = (props: { isOpen: boolean; }) => {
                             <div className="relative flex flex-row items-center">
                               <Input {...stakeForm.register("amount", {
                                 required: true,
-                              })} type="text" id="stakeAmount"
-                              />
+                              })} type="text" id="stakeAmount" />
                               <div className="absolute inset-y-0 right-0 flex flex-row items-center gap-4 transform -translate-x-1/2">
                                 <span
                                   className="block cursor-pointer text-white hover:text-tinkerYellow text-xs focus:outline-none"
@@ -534,8 +565,7 @@ const ManageStaking = (props: { isOpen: boolean; }) => {
                           <div className="relative flex flex-row items-center">
                             <Input {...unstakeForm.register("amount", {
                               required: true,
-                            })} type="text" id="unstakeAmount"
-                            />
+                            })} type="text" id="unstakeAmount" />
                             <div className="absolute inset-y-0 right-0 flex flex-row items-center gap-4 transform -translate-x-1/2">
                               <span
                                 className="block cursor-pointer text-white hover:text-tinkerYellow text-xs focus:outline-none"
diff --git a/src/routes/not-found.tsx b/src/routes/not-found.tsx
index 19b5bc1..329c09f 100644
--- a/src/routes/not-found.tsx
+++ b/src/routes/not-found.tsx
@@ -2,18 +2,20 @@ import { Link } from "react-router-dom";
 
 const NotFound = () => {
   return (
-    <>
-      <div className="mx-auto flex max-w-7xl flex-col gap-6 px-2 sm:px-8 xl:p-0">
-        <h1 className="text-4xl font-bold">Page not found</h1>
+    <div className="mx-auto w-full flex max-w-7xl flex-col justify-between p-4 sm:px-6 lg:px-8 mt-14 md:mt-0 gap-3">
+      <div className="z-10 w-full">
+        <h2 className="lg:text-xl font-bold mt-[8px] lg:mt-[12px] mb-[20px] lg:mb-[24px] flex flex-row items-center gap-4">
+          <span>Page not found</span>
+        </h2>
 
-        <span>
+        <span className="text-sm">
           I think you&apos;re lost. Let&apos;s get you back on track.{" "}
           <Link to="/" className="text-amber-400">
             Go to Home
           </Link>
         </span>
       </div>
-    </>
+    </div>
   );
 };