diff --git a/app.mjs b/app.mjs
index 84582ac..af225e2 100755
--- a/app.mjs
+++ b/app.mjs
@@ -167,19 +167,21 @@ async function GenerateHtml() {
     '25': '0.13.0',
   };
   let repoHistories = [];
+  const repoFields = [
+    'forks',
+    'stars',
+    'watchers',
+    'open_pulls',
+    'closed_pulls',
+    'merged_pulls',
+    'open_issues',
+    'closed_issues',
+  ];
   {
     const rs = await client.execute(
       `
 SELECT
-  created_at,
-  forks,
-  stars,
-  watchers,
-  open_pulls,
-  closed_pulls,
-  merged_pulls,
-  open_issues,
-  closed_issues
+  created_at, ${repoFields.join(', ')}
 FROM
     repo_histories
 ORDER BY
@@ -203,9 +205,9 @@ limit 1000
   }
 
   const idsToShow = [
-    '25', // 0.13.0
-    '23', // 0.12.0
-    // '20', // '0.14.0',
+    // '25', // 0.13.0
+    // '23', // 0.12.0
+    '20', // '0.14.0',
     // '19', // '0.15.0',
   ];
 
@@ -237,6 +239,7 @@ limit 1000
     repoHistoriesStr: JSON.stringify(repoHistories),
     idToTitle: idToTitle,
     idsToShow: idsToShow,
+    repoFields: repoFields,
   });
   fs.writeFileSync('web/raw.html', body, fileOpts);
 }
diff --git a/template.ejs b/template.ejs
index c70cb63..483b5ba 100644
--- a/template.ejs
+++ b/template.ejs
@@ -14,7 +14,10 @@
       const repoHistories = <%- repoHistoriesStr  %>;
       window.onload = function() {
         const charts = [
-          renderRepoChart(repoHistories, "repo-chart"),
+            <% for(const [index, field] of repoFields.entries()) { %>
+                                                                   renderRepoChart(repoHistories, '<%= field %>', <%= index+1 %>),
+          <% } %>
+
           <% for(const id of idsToShow) { %>
           renderMilestoneChart(historiesById, <%= id %>),
           <% } %>
@@ -31,8 +34,6 @@
   <body>
     <main>
       <h1><a href="https://github.com/ziglang/zig/milestones">Zig Milestone</a> Monitor</h1>
-      <h3><a href="https://github.com/ziglang/zig">Zig repository</a></h3>
-      <div class="chart" id="repo-chart"></div>
       <% for(const id of idsToShow) { %>
       <section>
         <h3><a href="https://github.com/ziglang/zig/milestone/<%= id %>"><%= idToTitle[id] %></a></h3>
@@ -55,6 +56,11 @@
       </section>
       <% } %>
 
+      <h3><a href="https://github.com/ziglang/zig">Zig repository</a></h3>
+      <% for(const field of repoFields) { %>
+      <div class="chart" id="repo-<%= field %>"></div>
+      <% } %>
+
       <footer> &copy; 2024 <a href="https://ziglang.cc">ZigCC</a>
         | <a href="https://github.com/zigcc/zig-milestone">GitHub</a>
         | <a href="mailto:hello@ziglang.cc">Feedback</a>
diff --git a/web/app.js b/web/app.js
index 050efe5..365f309 100644
--- a/web/app.js
+++ b/web/app.js
@@ -23,7 +23,8 @@ const commonChartOpts = {
     boundaryGap: false,
   },
   yAxis: {
-    type: 'value'
+    type: 'value',
+    scale: true,
   },
   dataZoom: [{
     start: 0,
@@ -81,45 +82,22 @@ function renderMilestoneChart(historiesById, milestoneId) {
 }
 
 
-function renderRepoChart(repoHistories, repoId) {
-  const dom = document.getElementById(`${repoId}`);
+function renderRepoChart(repoHistories, repoField, fieldIdx) {
+  const dom = document.getElementById(`repo-${repoField}`);
   const chart = echarts.init(dom, null, {
     renderer: 'canvas',
     useDirtyRect: false
   });
-  const columns = [
-    'forks',
-    'stars',
-    'watchers',
-    'open_pulls',
-    'closed_pulls',
-    'merged_pulls',
-    'open_issues',
-    'closed_issues',
-  ];
   var opt = {...commonChartOpts};
-  const series = columns.map((col, colIdx) => {
-    let series = {
-      name: col, type: 'line', stack: 'Total',
-      data: [],
-    };
-    for(const row of repoHistories) {
-      // first col is timestamp, shift by one.
-      series['data'].push([row[0], row[colIdx+1]]);
-    }
-
-    return series;
-  });
   opt['legend'] = {
-    selected: columns.reduce((acc, curr) => {
-      // By default only show stars
-      acc[curr] = curr === 'stars';
-      return acc;
-    }, {}),
-    data: columns,
+    data: [repoField],
   };
-  opt['toolbox'] = {};
-  opt['series'] = series;
+  opt['series'] = [{
+    name: repoField,
+    type: 'line',
+    stack: 'Total',
+    data: repoHistories.map((item) => [item[0], item[fieldIdx]])
+ }];
 
   chart.setOption(opt);
   addLegendClick(chart);
