diff --git a/resources/views/admin/pireps/map.blade.php b/resources/views/admin/pireps/map.blade.php
new file mode 100644
index 00000000..e69de29b
diff --git a/resources/views/admin/pireps/show.blade.php b/resources/views/admin/pireps/show.blade.php
index 68cbfa1b..608865eb 100644
--- a/resources/views/admin/pireps/show.blade.php
+++ b/resources/views/admin/pireps/show.blade.php
@@ -6,8 +6,21 @@
 @endsection
 
 @section('content')
-    <div class="card">
-        @include('admin.pireps.show_fields')
-        @include('admin.pireps.field_values')
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.pireps.show_fields')
+        </div>
+    </div>
+
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.pireps.field_values')
+        </div>
+    </div>
+
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.pireps.map')
+        </div>
     </div>
 @endsection
diff --git a/resources/views/admin/pireps/show_fields.blade.php b/resources/views/admin/pireps/show_fields.blade.php
index f5346f04..6a23e505 100644
--- a/resources/views/admin/pireps/show_fields.blade.php
+++ b/resources/views/admin/pireps/show_fields.blade.php
@@ -1,103 +1,85 @@
-<div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{!! Form::label('dpt_airport_id', 'Dep ICAO') !!}</h3>
-        </div>
-        <div class="box-body"><p class="lead">
-                {!! $pirep->dpt_airport->icao !!} - {!! $pirep->dpt_airport->name !!}
-        </p></div>
-    </div>
-</div>
-
-<div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{!! Form::label('arr_airport_id', 'Arrival ICAO') !!}</h3>
-        </div>
-        <div class="box-body"><p class="lead">
-                {!! $pirep->arr_airport->icao !!} - {!! $pirep->arr_airport->name !!}
-            </p>
-        </div>
-    </div>
-</div>
-
-
-<div class="form-group col-sm-12">
-    <div class="box box-primary">
-        <div class="box-body">
-
-            <!-- User Id Field -->
-            <div class="form-group">
-                {!! Form::label('user_id', 'Pilot:') !!}
-                <p>{!! $pirep->user->name !!}</p>
+<div class="row">
+    <div class="form-group col-sm-6">
+        <div class="box box-solid">
+            <div class="box-header with-border">
+                {{--<i class="fa fa-text-width"></i>--}}
+                <h3 class="box-title">{!! Form::label('dpt_airport_id', 'Dep ICAO') !!}</h3>
             </div>
+            <div class="box-body"><p class="lead">
+                    {!! $pirep->dpt_airport->icao !!} - {!! $pirep->dpt_airport->name !!}
+            </p></div>
+        </div>
+    </div>
 
-            <!-- Flight Id Field -->
-            <div class="form-group">
-                {!! Form::label('flight_id', 'Flight Id:') !!}
-                <p>
-                    <a href="{!! route('admin.flights.show', [$pirep->flight_id]) !!}" target="_blank">
-                        {!! $pirep->airline->code !!}
-                        @if($pirep->flight_id)
-                            {!! $pirep->flight->flight_number !!}
-                        @else
-                            {!! $pirep->flight_number !!}
-                        @endif
-                    </a>
+    <div class="form-group col-sm-6">
+        <div class="box box-solid">
+            <div class="box-header with-border">
+                {{--<i class="fa fa-text-width"></i>--}}
+                <h3 class="box-title">{!! Form::label('arr_airport_id', 'Arrival ICAO') !!}</h3>
+            </div>
+            <div class="box-body"><p class="lead">
+                    {!! $pirep->arr_airport->icao !!} - {!! $pirep->arr_airport->name !!}
                 </p>
             </div>
-
-            <!-- Aircraft Id Field -->
-            <div class="form-group">
-                {!! Form::label('aircraft_id', 'Aircraft:') !!}
-                <p>{!! $pirep->aircraft->subfleet->name !!}, {!! $pirep->aircraft->name !!}
-                    ({!! $pirep->aircraft->registration !!})
-                </p>
-            </div>
-
-            <!-- Flight Time Field -->
-            <div class="form-group">
-                {!! Form::label('flight_time', 'Flight Time:') !!}
-                <p>{!! Utils::secondsToTime($pirep->flight_time) !!}</p>
-            </div>
-
-            <!-- Level Field -->
-            <div class="form-group">
-                {!! Form::label('level', 'Level:') !!}
-                <p>{!! $pirep->level !!}</p>
-            </div>
-
-            <!-- Route Field -->
-            <div class="form-group">
-                {!! Form::label('route', 'Route:') !!}
-                <p>{!! $pirep->route !!}</p>
-            </div>
-
-            <!-- Notes Field -->
-            <div class="form-group">
-                {!! Form::label('notes', 'Notes:') !!}
-                <p>{!! $pirep->notes !!}</p>
-            </div>
-
-            <!-- Raw Data Field -->
-            <div class="form-group">
-                {!! Form::label('raw_data', 'Raw Data:') !!}
-                <p>{!! $pirep->raw_data !!}</p>
-            </div>
-
-            <!-- Created At Field -->
-            <div class="form-group">
-                {!! Form::label('created_at', 'Created At:') !!}
-                <p>{!! $pirep->created_at !!}</p>
-            </div>
-
-            <!-- Updated At Field -->
-            <div class="form-group">
-                {!! Form::label('updated_at', 'Updated At:') !!}
-                <p>{!! $pirep->updated_at !!}</p>
-            </div>
         </div>
     </div>
 </div>
+<div class="row">
+    <div class="col-md-12">
+        <table class="table">
+            <tr>
+                <td>Pilot</td>
+                <td>
+                    <p>
+                        <a href="{!! route('admin.users.show', ['id' => $pirep->pilot->id]) !!}"
+                            target="_blank">{!! $pirep->user->name !!}</a>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>Flight</td>
+                <td>
+                    <p>
+                        <a href="{!! route('admin.flights.show', [$pirep->flight_id]) !!}"
+                           target="_blank">
+                            {!! $pirep->ident !!}
+                        </a>
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>Aircraft</td>
+                <td>
+                    <p>{!! $pirep->aircraft->subfleet->name !!}, {!! $pirep->aircraft->name !!}
+                        ({!! $pirep->aircraft->registration !!})
+                    </p>
+                </td>
+            </tr>
+            <tr>
+                <td>Flight Time</td>
+                <td><p>{!! Utils::minutesToTimeString($pirep->flight_time) !!}</p></td>
+            </tr>
+            <tr>
+                <td>Flight Level</td>
+                <td><p>{!! $pirep->level !!}</p></td>
+            </tr>
+            <tr>
+                <td>Route</td>
+                <td>{!! $pirep->route !!}</td>
+            </tr>
+            <tr>
+                <td>Notes</td>
+                <td>{!! $pirep->notes !!}</td>
+            </tr>
+            <tr>
+                <td>Filed On</td>
+                <td><p>{!! show_datetime($pirep->created_at) !!}</p></td>
+            </tr>
+
+            <tr>
+                <td>Updated On</td>
+                <td><p>{!! show_datetime($pirep->updated_at) !!}</p></td>
+            </tr>
+        </table>
+    </div>
+</div>