diff --git a/components/Pages/Bonding/RewardsComponent.tsx b/components/Pages/Bonding/RewardsComponent.tsx
index 028aafa3..6adf0cfe 100644
--- a/components/Pages/Bonding/RewardsComponent.tsx
+++ b/components/Pages/Bonding/RewardsComponent.tsx
@@ -168,6 +168,8 @@ const RewardsComponent = ({
 
   const bondingHasStarted: boolean = useMemo(() => genesisStartTimeInNano / 1_000_000 < Date.now(),
     [genesisStartTimeInNano])
+  const epochsToForce = Math.floor((Date.now() - (Number(currentEpoch?.epoch?.start_time ?? 0) / 1_000_000)) /
+    (1_000 * 3_600 * 24))
   return (
     <VStack
       px={8}
@@ -309,7 +311,7 @@ const RewardsComponent = ({
               bg="transparent"
               borderRadius="full"
               border="1px solid white"
-              width="50%"
+              width="55%"
               variant="primary"
               _hover={{
                 border: '1px solid #6ACA70',
@@ -317,7 +319,7 @@ const RewardsComponent = ({
               }}
               onClick={() => forceEpochAndTakeSnapshots.submit()}
             >
-              {'Force Epoch'}
+              {`Force Epoch (${epochsToForce})`}
             </Button>
           </Tooltip>
         )}
diff --git a/components/Pages/Dashboard/Dashboard.tsx b/components/Pages/Dashboard/Dashboard.tsx
index c8a4d516..f939f6b1 100644
--- a/components/Pages/Dashboard/Dashboard.tsx
+++ b/components/Pages/Dashboard/Dashboard.tsx
@@ -27,8 +27,8 @@ export const Dashboard: FC = () => {
   const chains = useChainInfos()
   const prices = usePrices()
   useEffect(() => {
-    const fetchDashboardData = async () => {
-      const circulatingWhaleSupply = dashboardData.supply?.circulating / (10 ** 6) || 0
+    const fetchDashboardData = () => {
+      const circulatingWhaleSupply = (dashboardData.supply?.circulating ?? 0) / (10 ** 6)
       const marketCap = circulatingWhaleSupply * (prices?.WHALE || 0) || 0
       const mappedDashboardData = []
       dashboardData.dashboardData?.map((data) => {