diff --git a/app/Http/Controllers/StructureController.php b/app/Http/Controllers/StructureController.php
index b3869bcac..fd36dc3e8 100644
--- a/app/Http/Controllers/StructureController.php
+++ b/app/Http/Controllers/StructureController.php
@@ -45,7 +45,10 @@ class StructureController extends Controller
             $tax = StructureIndustryTaxJournal::select('amount')
                                 ->whereBetween('date', [$date['start'], $date['end']])
                                 ->sum('amount');
-            $taxes[] = ['date' => $date['start'], 'tax' => number_format($tax, 2, '.', ',')];    
+            $taxes[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'tax' => number_format($tax, 2, '.', ',')
+            ];    
         }
 
         return view('structures.industrytaxes')->with('taxes', $taxes);
@@ -60,22 +63,21 @@ class StructureController extends Controller
         $this->middleware('role:Admin');
 
         $corpId = $request->corpId;
+        $months = 3;
         
         //Declare the structure tax helper class
         $sHelper = new StructureTaxHelper();
         
         //Get the dates we are working with
-        $dates = $sHelper->GetTimeFrame();
-        
-        //Get the market taxes for this month from the database
-        $totalTaxes = [
-            'thisMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','),
-            'lastMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','),
-            'thisMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','),
-            'lastMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','),
-            'thisMonthStart' => $dates['ThisMonthStart']->toFormattedDateString(),
-            'lastMonthStart' => $dates['LastMonthStart']->toFormattedDateString(),
-        ];
+        $dates = $sHelper->GetTimeFrameInMonths($months);
+
+        foreach($dates as $date) {
+            $totalTaxes[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'tax' => number_format($sHelper->GetTaxes($corpId, 'Market', $date['start'], $date['end']), 2, '.', ','),
+                'revenue' => number_format($sHelper->GetRevenue($corpId, 'Market', $date['start'], $date['end']), 2, '.', ',')
+            ];
+        }
 
         //Return the view with the data passed to it
         return view('structures.choosecorptaxes')->with('totalTaxes', $totalTaxes);
@@ -84,6 +86,8 @@ class StructureController extends Controller
     public function displayTaxes() {
         //Make the helper esi class
         $helper = new Esi();
+
+        $months = 3;
         
         //Get the character's corporation from esi
         $corpId = $helper->FindCorporationId(Auth::user()->character_id);
@@ -92,17 +96,16 @@ class StructureController extends Controller
         $sHelper = new StructureTaxHelper();
         
         //Get the dates we are working with
-        $dates = $sHelper->GetTimeFrame();
+        $dates = $sHelper->GetTimeFrameInMonths($months);
         
         //Get the market taxes for this month from the database
-        $totalTaxes = [
-            'thisMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','),
-            'lastMonthMarket' => number_format($sHelper->GetTaxes($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','),
-            'thisMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['ThisMonthStart'], $dates['ThisMonthEnd']), 2, '.', ','),
-            'lastMonthRevMarket' => number_format($sHelper->GetRevenue($corpId, 'Market', $dates['LastMonthStart'], $dates['LastMonthEnd']), 2, '.', ','),
-            'thisMonthStart' => $dates['ThisMonthStart']->toFormattedDateString(),
-            'lastMonthStart' => $dates['LastMonthStart']->toFormattedDateString(),
-        ];
+        foreach($dates as $date) {
+            $totalTaxes[] = [
+                'date' => $date['start']->toFormattedDateString(),
+                'tax' => number_format($sHelper->GetTaxes($corpId, 'Market', $date['start'], $date['end']), 2, '.', ','),
+                'revenue' => number_format($sHelper->GetRevenue($corpId, 'Market', $date['start'], $date['end']), 2, '.', ',')
+            ];
+        }
 
         return view('structures.taxes')->with('totalTaxes', $totalTaxes);
     }
diff --git a/resources/views/structures/choosecorptaxes.blade.php b/resources/views/structures/choosecorptaxes.blade.php
index 8b2964bc4..81c0b7a58 100644
--- a/resources/views/structures/choosecorptaxes.blade.php
+++ b/resources/views/structures/choosecorptaxes.blade.php
@@ -14,17 +14,13 @@
                     <th>Market Revenue Minus Fuel Cost</th>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td>{{ $totalTaxes['thisMonthStart'] }}</td>
-                        <td>{{ $totalTaxes['thisMonthMarket'] }}</td>
-                        <td>{{ $totalTaxes['thisMonthRevMarket'] }}</td>
-                    </tr>
-                    <tr>
-                        <td>{{ $totalTaxes['lastMonthStart'] }}</td>
-                        <td>{{ $totalTaxes['lastMonthMarket'] }}</td>
-                        <td>{{ $totalTaxes['lastMonthRevMarket'] }}</td>
-                    </tr>
-                    </tr>
+                    @foreach($totalTaxes as $tax)
+                        <tr>
+                            <td>{{ $tax['start'] }}</td>
+                            <td>{{ $tax['tax'] }}</td>
+                            <td>{{ $tax['revenue'] }}<td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
         </div>
diff --git a/resources/views/structures/taxes.blade.php b/resources/views/structures/taxes.blade.php
index 656df4804..81299c08d 100644
--- a/resources/views/structures/taxes.blade.php
+++ b/resources/views/structures/taxes.blade.php
@@ -14,17 +14,13 @@
                     <th>Market Revenue</th>
                 </thead>
                 <tbody>
-                    <tr>
-                        <td>{{ $totalTaxes['thisMonthStart'] }}</td>
-                        <td>{{ $totalTaxes['thisMonthMarket'] }}</td>
-                        <td>{{ $totalTaxes['thisMonthRevMarket'] }}</td>
-                    </tr>
-                    <tr>
-                        <td>{{ $totalTaxes['lastMonthStart'] }}</td>
-                        <td>{{ $totalTaxes['lastMonthMarket'] }}</td>
-                        <td>{{ $totalTaxes['lastMonthRevMarket'] }}</td>
-                    </tr>
-                    </tr>
+                    @foreach($totalTaxes as $tax)
+                        <tr>
+                            <td>{{ $tax['start'] }}</td>
+                            <td>{{ $tax['tax'] }}</td>
+                            <td>{{ $tax['revenue'] }}<td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
         </div>
diff --git a/resources/views/structures/taxhistory.blade.php b/resources/views/structures/taxhistory.blade.php
index fbf35b9d6..81299c08d 100644
--- a/resources/views/structures/taxhistory.blade.php
+++ b/resources/views/structures/taxhistory.blade.php
@@ -14,13 +14,13 @@
                     <th>Market Revenue</th>
                 </thead>
                 <tbody>
-                    @for($i = 0; $i < $months; $i++)
-                    <tr>
-                        <td>{{ $totalTaxes[$i]['MonthStart'] }}</td>
-                        <td>{{ $totalTaxes[$i]['MarketTax'] }}</td>
-                        <td>{{ $totalTaxes[$i]['MarketRevenue'] }}</td>
-                    </tr>
-                    @endfor
+                    @foreach($totalTaxes as $tax)
+                        <tr>
+                            <td>{{ $tax['start'] }}</td>
+                            <td>{{ $tax['tax'] }}</td>
+                            <td>{{ $tax['revenue'] }}<td>
+                        </tr>
+                    @endforeach
                 </tbody>
             </table>
         </div>