diff --git a/resources/views/contracts/allcontracts.blade.php b/resources/views/contracts/allcontracts.blade.php
index 48d9a11d7..b3fe342d6 100644
--- a/resources/views/contracts/allcontracts.blade.php
+++ b/resources/views/contracts/allcontracts.blade.php
@@ -7,55 +7,7 @@
 </div>
 <br>
 @if(count($contracts))
-@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['title'] }}
-                        </div>
-                        <div class="col-sm" align="center">
-                            Type: {{ $contract['type'] }}
-                        </div>
-                        <div class="col-sm" align="right">
-                            {!! Form::open(['action' => 'ContractController@displayBid', 'method' => 'POST']) !!}
-                            {{ Form::hidden('contract_id', $contract['contract_id']) }}
-                            {{ Form::submit('Bid', ['class' => 'btn btn-primary']) }}
-                            {!! Form::close() !!}
-                        </div>
-                    </div>
-                </div>
-                <div class="card-body">
-                    <div class="container">
-                        End Date: {{ $contract['end_date'] }}
-                    </div>
-                    <span class="border-dark">
-                        <div class="container">
-                            {{ $contract['body'] }}
-                        </div>
-                    </span>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<br>
-@endforeach
+    @include('contracts.includes.all')
 @else
-<div class="container">
-    <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">
-                    No Contracts Issued
-                </div>
-                <div class="card-body">
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
+    @include('contracts.includes.nocontracts')
 @endsection
\ No newline at end of file
diff --git a/resources/views/contracts/includes/all.blade.php b/resources/views/contracts/includes/all.blade.php
new file mode 100644
index 000000000..d83936b5f
--- /dev/null
+++ b/resources/views/contracts/includes/all.blade.php
@@ -0,0 +1,70 @@
+@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['title'] }}
+                        </div>
+                        <div class="col-sm" align="center">
+                            Type: Public
+                        </div>
+                        <div class="col-sm" align="right">
+                            <a href="/contracts/display/newbid/{{ $contract['contract_id'] }}" class="btn btn-primary" role="button">Bid on Contract</a>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-body">
+                    <div class="container">
+                        End Date: {{ $contract['end_date'] }}
+                    </div>
+                    <span class="border-dark">
+                        <div class="container">
+                            {{ $contract['body'] }}
+                        </div>
+                    </span>
+                    <hr>
+                    <!--  Count the number of bids for the current contract -->
+                    @if($contract['bid_count'] > 0)
+                        <span class="border-dark">
+                            @if($contract['type'] == 'Public')
+                            <table class="table table-striped">
+                                <thead>
+                                    <th>Corporation</th>
+                                    <th>Amount</th>
+                                    <th></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'])
+                                        <td>
+                                            <a href="/contracts/modify/bid/{{ $bid['id'] }}" class="btn btn-primary" role="button">Modify Bid</a>
+                                            <a href="/contracts/delete/bid/{{ $bid['id'] }}" class="btn btn-primary" role="button">Delete Bid</a>
+                                        </td>
+                                        @else
+                                        <td></td>
+                                        @endif
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                            @else
+                                @if(auth()->user()->character_id == $bid['character_id'])
+                                    <a href="/contracts/modify/bid/{{ $bid['id'] }}" class="btn btn-primary" role="button">Modify Bid</a>
+                                    <a href="/contracts/delete/bid/{{ $bid['id'] }}" class="btn btn-primary" role="button">Delete Bid</a>
+                                @endif
+                            @endif
+                        </span>
+                    @endif
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<br>
+@endforeach
\ No newline at end of file
diff --git a/resources/views/contracts/includes/public.blade.php b/resources/views/contracts/includes/public.blade.php
index 9396d598b..754c2a1f6 100644
--- a/resources/views/contracts/includes/public.blade.php
+++ b/resources/views/contracts/includes/public.blade.php
@@ -1,3 +1,4 @@
+@foreach($contracts as $contract)
 <div class="container">
     <div class="row justify-content-center">
         <div class="col-md-8">
@@ -57,4 +58,6 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
+<br>
+@endforeach
\ No newline at end of file
diff --git a/resources/views/contracts/publiccontracts.blade.php b/resources/views/contracts/publiccontracts.blade.php
index 95b9c8e15..6ee5bd56f 100644
--- a/resources/views/contracts/publiccontracts.blade.php
+++ b/resources/views/contracts/publiccontracts.blade.php
@@ -7,9 +7,7 @@
 </div>
 <br>
 @if(count($contracts))
-@foreach($contracts as $contract)
     @include('contracts.includes.public')
-@endforeach
 @else
     @include('contracts.includes.nocontracts')
 @endif