diff --git a/app/server.js b/app/server.js
index 9c81b5d..427e105 100644
--- a/app/server.js
+++ b/app/server.js
@@ -237,16 +237,18 @@ async function generateIncByWeekChart(numberOfDays) {
       },
     },
   });
-  chart.setWidth(800);
-  chart.setHeight(400);
-  return chart.getUrl();
+    // Increase chart size
+    chart.setWidth(1200);
+    chart.setHeight(600);
+  return chart.getShortUrl();
 }
 
 async function generateIncByCategoryChart(numberOfDays) {
   const dbResponse = await getIncByCategory(numberOfDays);
+  const sortedCategories = dbResponse.rows.sort((a, b) => b.count - a.count); 
 
-  const labels = dbResponse.rows.map((row) => row.category);
-  const data = dbResponse.rows.map((row) => parseInt(row.count, 10));
+  const labels = sortedCategories.map((row) => row.category);
+  const data = sortedCategories.map((row) => parseInt(row.count, 10));
 
   // Generate the bar chart URL using QuickChart
   const chart = new QuickChart();
@@ -266,13 +268,22 @@ async function generateIncByCategoryChart(numberOfDays) {
     },
     options: {
       scales: {
+        x: {
+          ticks: {
+            autoSkip: false, // Disable auto-skip for labels to show all categories
+            maxTicksLimit: labels.length, // Limit the number of labels to show
+          },
+        },
         y: {
-          beginAtZero: true,
+          beginAtZero: true, // Ensure Y-axis starts at zero
+          min: 0 // Ensure Y-axis starts at zero
         },
       },
     },
   });
-  chart.setWidth(800);
-  chart.setHeight(400);
-  return chart.getUrl();
+    // Increase chart size
+    chart.setWidth(1200);
+    chart.setHeight(600);
+  return chart.getShortUrl();
+
 }