diff --git a/app/Http/Controllers/ContractController.php b/app/Http/Controllers/ContractController.php
index 8072ec521..7d58bb0b5 100644
--- a/app/Http/Controllers/ContractController.php
+++ b/app/Http/Controllers/ContractController.php
@@ -64,8 +64,18 @@ class ContractController extends Controller
 
         //Fetch all of the current contracts from the database
         $contracts = Contract::where('end_date', '>=', $today)
-                             ->where(['type' => 'public'])->get();
+                             ->where(['type' => 'public'])->toArray()->get();
 
+        //Count the number of bids, and add them to the arrays
+        foreach($contracts as $contract) {
+            $tempCount = Bid::where(['contract_id' => $contract['id']])->count('contract_id');
+            $bids = Bid::where(['contract_id' => $contract['id']])->toArray()->get();
+
+            $contract['bid_count'] = $tempCount;
+            $contract['bids'] = $bids;
+        }        
+
+        /*
         if($count($contract->contract_id) > 0) {
             foreach($contract->contract_id as $id) {
                 //Get the bid data
@@ -77,11 +87,11 @@ class ContractController extends Controller
         } else {
             $bids = null;
         }
+        */
         
 
         //Call for the view to be displayed
-        return view('contracts.publiccontracts')->with('contracts', $contracts)
-                                                ->with('bids', $bids);
+        return view('contracts.publiccontracts')->with('contracts', $contracts);
     }
 
     /**
diff --git a/resources/views/contracts/publiccontracts.blade.php b/resources/views/contracts/publiccontracts.blade.php
index 439c3bd25..2a2aac3c1 100644
--- a/resources/views/contracts/publiccontracts.blade.php
+++ b/resources/views/contracts/publiccontracts.blade.php
@@ -7,74 +7,72 @@
 </div>
 <br>
 @if(count($data))
-@foreach($data as $contract)
+@foreach($contracts as $contract)
 <div class="container">
-        <div class="row justify-content-center">
-            <div class="col-md-8">
-                <div class="card">
-                    <div class="card-header">
-                        <div class="row">
-                            <div class="col-sm" align="left">
-                                {{ $contract['contract']->title }}
-                            </div>
-                            <div class="col-sm" align="center">
-                                Type: Public
-                            </div>
-                            <div class="col-sm" align="right">
-                                <a href="/contracts/display/newbid/{{ $contract['contract']->contract_id }}" class="btn btn-primary" role="button">Bid on Contract</a>
-                            </div>
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            <div class="card">
+                <div class="card-header">
+                    <div class="row">
+                        <div class="col-sm" align="left">
+                            {{ $contract['contract']->title }}
+                        </div>
+                        <div class="col-sm" align="center">
+                            Type: Public
+                        </div>
+                        <div class="col-sm" align="right">
+                            <a href="/contracts/display/newbid/{{ $contract['contract']->contract_id }}" class="btn btn-primary" role="button">Bid on Contract</a>
                         </div>
                     </div>
-                    <div class="card-body">
+                </div>
+                <div class="card-body">
+                    <div class="container">
+                        End Date: {{ $contract['end_date'] }}
+                    </div>
+                    <span class="border-dark">
                         <div class="container">
-                            End Date: {{ $contract['contract']->end_date }}
+                            {{ $contract['body'] }}
                         </div>
+                    </span>
+                    <hr>
+                    <!--  Count the number of bids for the current contract -->
+                    @if($contract['bid_count'] > 0)
                         <span class="border-dark">
-                            <div class="container">
-                                {{ $contract['contract']->body }}
-                            </div>
-                        </span>
-                        <hr>
-                        <span class="border-dark">
-                            @if(isset($contract['bids']))
                             <table class="table table-striped">
-                                    <thead>
-                                        <th>Corporation</th>
-                                        <th>Amount</th>
-                                    </thead>
-                                    <tbody>
-                                    @foreach($contract['bids'] as $bid)
-                                        <tr>
-                                            <td>{{ $bid['corporation_name'] }}</td>
-                                            <td>{{ $bid['bid_amount'] }}</td>
-                                            @if(auth()->user()->character_id == $bid['character_id'])
-                                                {{ Form::open(['action' => 'ContractController@displayModifyBid', 'method' => 'POST']) }}
-                                                    {{ Form::hidden('id', $bid['id']) }}
-                                                    {{ Form::hidden('contract_id', $bid['contract_id']) }}
-                                                    {{ Form::submit('Modify Bid', ['class' => 'btn btn-primary']) }}
-                                                {!! Form::close() !!}
-                                
-                                                {{ Form::open(['action' => 'ContractController@deleteBid', 'method' => 'POST']) }}
-                                                    {{ Form::hidden('id', $bid['id']) }}
-                                                    {{ Form::hidden('contract_id', $bid['contract_id']) }}
-                                                    {{ Form::submit('Delete Bid', ['class' => 'btn btn-primary']) }}
-                                                {!! Form::close() !!}
-                                            @endif
-                                        </tr>
-                                    @endforeach
-                                    </tbody>
-                                </table>
-                            @else
-                                No Bids have been entered.
-                            @endif
+                                <thead>
+                                    <th>Corporation</th>
+                                    <th>Amount</th>
+                                </thead>
+                                <tbody>
+                                @foreach($contracts['bids'] as $bid)
+                                    <tr>
+                                        <td>{{ $bid['corporation_name'] }}</td>
+                                        <td>{{ $bid['bid_amount'] }}</td>
+                                        @if(auth()->user()->character_id == $bid['character_id'])
+                                            {{ Form::open(['action' => 'ContractController@displayModifyBid', 'method' => 'POST']) }}
+                                                {{ Form::hidden('id', $bid['id']) }}
+                                                {{ Form::hidden('contract_id', $bid['contract_id']) }}
+                                                {{ Form::submit('Modify Bid', ['class' => 'btn btn-primary']) }}
+                                            {!! Form::close() !!}
+                            
+                                            {{ Form::open(['action' => 'ContractController@deleteBid', 'method' => 'POST']) }}
+                                                {{ Form::hidden('id', $bid['id']) }}
+                                                {{ Form::hidden('contract_id', $bid['contract_id']) }}
+                                                {{ Form::submit('Delete Bid', ['class' => 'btn btn-primary']) }}
+                                            {!! Form::close() !!}
+                                        @endif
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
                         </span>
-                    </div>
+                    @endif
                 </div>
             </div>
         </div>
     </div>
+</div>
 @endforeach
-<br>
 @else
     @include('contracts.includes.nocontracts')
 @endif