diff --git a/src/lib/components/AnalystEstimate.svelte b/src/lib/components/AnalystEstimate.svelte
index 948a5f81..41d32f6d 100644
--- a/src/lib/components/AnalystEstimate.svelte
+++ b/src/lib/components/AnalystEstimate.svelte
@@ -423,7 +423,7 @@ $: {
                                 </th>
                                 {#each tableDataForecast as item}
                                     <td class="text-white text-sm sm:text-[1rem] text-end font-medium bg-[#27272A]">
-                                        {item?.numOfAnalysts === null ? '-' : item?.numOfAnalysts}
+                                        {item?.numOfAnalysts === (null || 0) ? '-' : item?.numOfAnalysts}
                                     </td>
                                 {/each}
                            
diff --git a/src/lib/components/FundamentalAnalysis.svelte b/src/lib/components/FundamentalAnalysis.svelte
index a9305acd..65a22301 100644
--- a/src/lib/components/FundamentalAnalysis.svelte
+++ b/src/lib/components/FundamentalAnalysis.svelte
@@ -101,7 +101,7 @@ $: {
            
 
             <div class="w-full mt-5 mb-5 flex justify-start items-center">
-                <div class="w-full grid grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-y-3 gap-x-3 ">
+                <div class="w-full grid grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-y-3 gap-x-3 ">
                   <!--Start Flow Sentiment-->  
                   <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-5 bg-[#27272A] shadow-lg rounded-lg h-20">
                       <div class="flex flex-col items-start">
diff --git a/src/lib/components/PriceAnalysis.svelte b/src/lib/components/PriceAnalysis.svelte
index 50dcad28..d6d52a3f 100644
--- a/src/lib/components/PriceAnalysis.svelte
+++ b/src/lib/components/PriceAnalysis.svelte
@@ -224,7 +224,7 @@ $: {
             </div>
 
             <div class="w-full mt-5 mb-5 flex justify-start items-center">
-                <div class="w-full grid grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-y-3 gap-x-3 ">
+                <div class="w-full grid grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-y-3 gap-x-3 ">
                   <!--Start Flow Sentiment-->  
                   <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-5 bg-[#27272A] shadow-lg rounded-lg h-20">
                       <div class="flex flex-col items-start">
diff --git a/src/lib/components/TrendAnalysis.svelte b/src/lib/components/TrendAnalysis.svelte
index 8b8f8852..1926cde5 100644
--- a/src/lib/components/TrendAnalysis.svelte
+++ b/src/lib/components/TrendAnalysis.svelte
@@ -114,7 +114,7 @@ $: {
            
 
             <div class="w-full mt-5 mb-5 flex justify-start items-center">
-                <div class="w-full grid grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-y-3 gap-x-3 ">
+                <div class="w-full grid grid-cols-2 lg:grid-cols-3 2xl:grid-cols-4 gap-y-3 gap-x-3 ">
                   <!--Start Flow Sentiment-->  
                   <div class="flex flex-row items-center flex-wrap w-full px-3 sm:px-5 bg-[#27272A] shadow-lg rounded-lg h-20">
                       <div class="flex flex-col items-start">