diff --git a/resources/views/admin/flights/search.blade.php b/resources/views/admin/flights/search.blade.php
index 4d8ea432..7bae0594 100644
--- a/resources/views/admin/flights/search.blade.php
+++ b/resources/views/admin/flights/search.blade.php
@@ -3,21 +3,31 @@
     <div class="col-sm-12">
       <div class="form-group">
         {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
-        &nbsp;&nbsp;
-        {{ Form::label('airlines', 'Airline:') }}
-        {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-        {{ Form::label('flight_number', 'Flight Number:') }}
-        {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
-        &nbsp;
-        {{ Form::label('dpt_airport_id', 'Departure:') }}
-        {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control']) }}
-        &nbsp;
-        {{ Form::label('arr_airport_id', 'Arrival:') }}
-        {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control']) }}
-        &nbsp;
-        {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
-        &nbsp;
-        <a href="{{ route('admin.flights.index') }}">clear</a>
+        <div class="row">
+          <div class="form-group col-sm-2">
+            {{ Form::label('airlines', 'Airline:') }}
+            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+          </div>
+          <div class="form-group input-group-sm col-sm-2">
+            {{ Form::label('flight_number', 'Flight Number:') }}
+            {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
+          </div>
+          <div class="form-group col-sm-4">
+            {{ Form::label('dpt_airport_id', 'Departure:') }}
+            {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+          </div>
+          <div class="form-group col-sm-4">
+            {{ Form::label('arr_airport_id', 'Arrival:') }}
+            {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+          </div>
+        </div>
+        <div class="row text-right">
+          <div class="col-sm-12">
+            {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
+            &nbsp;&nbsp;
+            <a href="{{ route('admin.flights.index') }}">clear</a>
+          </div>
+        </div>
         {{ Form::close() }}
       </div>
     </div>
diff --git a/resources/views/admin/pireps/actions.blade.php b/resources/views/admin/pireps/actions.blade.php
index b94046b6..6d341633 100644
--- a/resources/views/admin/pireps/actions.blade.php
+++ b/resources/views/admin/pireps/actions.blade.php
@@ -1,7 +1,7 @@
-<table class="">
-  <tr>
-    <td>
-      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
+<table class="table" style="border-style: hidden; margin-bottom: 0px;">
+  <tr style="border-style: hidden;">
+    @if ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
+      <td>
         {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
                         'method' => 'post',
                         'name' => 'accept_'.$pirep->id,
@@ -11,11 +11,9 @@
                         'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
         {{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
         {{ Form::close() }}
-      @endif
-    </td>
-    <td>&nbsp;</td>
-    <td>
-      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
+      </td>
+    @elseif ($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
+      <td>
         {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
                         'method' => 'post',
                         'name' => 'reject_'.$pirep->id,
@@ -25,8 +23,8 @@
                         'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
         {{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-warning']) }}
         {{ Form::close() }}
-      @endif
-    </td>
+      </td>
+    @endif
     <td>
       {{ Form::open(['url' => route('admin.pireps.destroy', [$pirep->id]),
             'method' => 'delete',
@@ -40,20 +38,18 @@
     @if ($on_edit_page === false)
       <td>
         <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
-          <button type="submit"
-                  class='btn btn-info'>
+          <button type="submit" class='btn btn-info'>
             <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
           </button>
         </form>
       </td>
     @endif
-        <td>
-        <form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank">
-          <button type="submit"
-                  class='btn btn-success'>
-            <i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep
-          </button>
-        </form>
-      </td>
+    <td>
+      <form action="{{ route('frontend.pireps.show', [$pirep->id]) }}" target="_blank">
+        <button type="submit" class='btn btn-success'>
+          <i class="fas fa-eye"></i>&nbsp;&nbsp; View Pirep
+        </button>
+      </form>
+    </td>
   </tr>
 </table>
diff --git a/resources/views/admin/pireps/pirep_card.blade.php b/resources/views/admin/pireps/pirep_card.blade.php
index 7b619e33..48d92d67 100644
--- a/resources/views/admin/pireps/pirep_card.blade.php
+++ b/resources/views/admin/pireps/pirep_card.blade.php
@@ -18,7 +18,7 @@
 					<div class="col-sm-6">
 						<div>
 							<span class="description">
-								<b>Pilot</b>&nbsp;{{ $pirep->user->name }}&nbsp;
+								<b>Pilot</b>&nbsp;{{ '('.$pirep->user_id.') '.optional($pirep->user)->name }}
 							</span>
 						</div>
             <div>
@@ -35,11 +35,11 @@
 						@if($pirep->aircraft)
 						<div>
 							<span class="description">
-								<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} ({{ $pirep->aircraft->name }})
+								<b>Aircraft</b>&nbsp;{{ $pirep->aircraft->registration }} @if($pirep->aircraft->registration != $pirep->aircraft->name) '{{ $pirep->aircraft->name }}' @endif
 							</span>
 						</div>
 						@endif
-						@if(filled($pirep->level))
+						@if(filled($pirep->level) && $pirep->level > 10)
 						<div>
 							<span class="description">
 								<b>Flight Level</b>&nbsp;{{ $pirep->level }}