diff --git a/src/components/BullpenTable.vue b/src/components/BullpenTable.vue
index d4a3ede..0f211a1 100644
--- a/src/components/BullpenTable.vue
+++ b/src/components/BullpenTable.vue
@@ -15,20 +15,23 @@
             <tr>
               <th>Name</th>
               <th>Positions</th>
-              <th>W{{weekNumber - 1}}G1</th>
-              <th>W{{weekNumber - 1}}G2</th>
-              <th>W{{weekNumber - 1}}G3</th>
-              <th>W{{weekNumber - 1}}G4</th>
-              <th v-if="weekNumber - 1 > 18">W{{weekNumber - 1}}G5</th>
-              <th v-if="weekNumber - 1 > 19">W{{weekNumber - 1}}G6</th>
-              <th v-if="weekNumber - 1 > 19">W{{weekNumber - 1}}G7</th>
-              <th>W{{weekNumber}}G1</th>
-              <th>W{{weekNumber}}G2</th>
-              <th>W{{weekNumber}}G3</th>
-              <th>W{{weekNumber}}G4</th>
-              <th v-if="weekNumber > 18">W{{weekNumber}}G5</th>
-              <th v-if="weekNumber > 19">W{{weekNumber}}G6</th>
               <th v-if="weekNumber > 19">W{{weekNumber}}G7</th>
+              <th v-if="weekNumber > 19">W{{weekNumber}}G6</th>
+              <th v-if="weekNumber > 18">W{{weekNumber}}G5</th>
+              <th>W{{weekNumber}}G4</th>
+              <th>W{{weekNumber}}G3</th>
+              <th>W{{weekNumber}}G2</th>
+              <th>W{{weekNumber}}G1</th>
+              <!-- Previous week -->
+              <template v-if="weekNumber > 1">
+                <th v-if="weekNumber - 1 > 19">W{{weekNumber - 1}}G7</th>
+                <th v-if="weekNumber - 1 > 19">W{{weekNumber - 1}}G6</th>
+                <th v-if="weekNumber - 1 > 18">W{{weekNumber - 1}}G5</th>
+                <th>W{{weekNumber - 1}}G4</th>
+                <th>W{{weekNumber - 1}}G3</th>
+                <th>W{{weekNumber - 1}}G2</th>
+                <th>W{{weekNumber - 1}}G1</th>
+              </template>
             </tr>
           </thead>
           <tbody>
@@ -43,20 +46,23 @@
               <td>
                 {{ allPositions(player) }}
               </td>
-              <td>{{getStatForPitcherGame(player, weekNumber - 1, 1)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber - 1, 2)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber - 1, 3)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber - 1, 4)}}</td>
-              <td v-if="weekNumber - 1 > 18">{{getStatForPitcherGame(player, weekNumber - 1, 5)}}</td>
-              <td v-if="weekNumber - 1 > 19">{{getStatForPitcherGame(player, weekNumber - 1, 6)}}</td>
-              <td v-if="weekNumber - 1 > 19">{{getStatForPitcherGame(player, weekNumber - 1, 7)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber, 1)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber, 2)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber, 3)}}</td>
-              <td>{{getStatForPitcherGame(player, weekNumber, 4)}}</td>
-              <td v-if="weekNumber > 18">{{getStatForPitcherGame(player, weekNumber, 5)}}</td>
-              <td v-if="weekNumber > 19">{{getStatForPitcherGame(player, weekNumber, 6)}}</td>
               <td v-if="weekNumber > 19">{{getStatForPitcherGame(player, weekNumber, 7)}}</td>
+              <td v-if="weekNumber > 19">{{getStatForPitcherGame(player, weekNumber, 6)}}</td>
+              <td v-if="weekNumber > 18">{{getStatForPitcherGame(player, weekNumber, 5)}}</td>
+              <td>{{getStatForPitcherGame(player, weekNumber, 4)}}</td>
+              <td>{{getStatForPitcherGame(player, weekNumber, 3)}}</td>
+              <td>{{getStatForPitcherGame(player, weekNumber, 2)}}</td>
+              <td>{{getStatForPitcherGame(player, weekNumber, 1)}}</td>
+              <!-- Previous week -->
+              <template v-if="weekNumber > 1">
+                <td v-if="weekNumber - 1 > 19">{{getStatForPitcherGame(player, weekNumber - 1, 7)}}</td>
+                <td v-if="weekNumber - 1 > 19">{{getStatForPitcherGame(player, weekNumber - 1, 6)}}</td>
+                <td v-if="weekNumber - 1 > 18">{{getStatForPitcherGame(player, weekNumber - 1, 5)}}</td>
+                <td>{{getStatForPitcherGame(player, weekNumber - 1, 4)}}</td>
+                <td>{{getStatForPitcherGame(player, weekNumber - 1, 3)}}</td>
+                <td>{{getStatForPitcherGame(player, weekNumber - 1, 2)}}</td>
+                <td>{{getStatForPitcherGame(player, weekNumber - 1, 1)}}</td>
+              </template>     
             </tr>
           </tbody>
         </table>