diff --git a/resources/views/admin/flights/fares.blade.php b/resources/views/admin/flights/fares.blade.php
index 16506256..2daea72b 100644
--- a/resources/views/admin/flights/fares.blade.php
+++ b/resources/views/admin/flights/fares.blade.php
@@ -16,6 +16,7 @@
     <table id="flight_fares"
            class="table table-hover"
            role="grid" aria-describedby="aircraft_fares_info">
+        @if(count($flight->fares))
         <thead>
         <tr role="row">
             <th>Name</th>
@@ -26,6 +27,7 @@
             <th>Actions</th>
         </tr>
         </thead>
+        @endif
         <tbody>
         @foreach($flight->fares as $atf)
             <tr>
diff --git a/resources/views/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php
index a193466f..ab467f0a 100644
--- a/resources/views/admin/flights/fields.blade.php
+++ b/resources/views/admin/flights/fields.blade.php
@@ -91,7 +91,7 @@
     </div>
 
     <div class="form-group col-sm-2">
-        {!! Form::label('distance', 'Distance:') !!} <span class="small">in miles</span>
+        {!! Form::label('distance', 'Distance:') !!} <span class="small">in nautical miles</span>
         {!! Form::text('distance', null, ['class' => 'form-control']) !!}
         <p class="text-danger">{{ $errors->first('distance') }}</p>
     </div>
diff --git a/resources/views/admin/flights/flight_fields.blade.php b/resources/views/admin/flights/flight_fields.blade.php
index 44ef2e6a..8458bd09 100644
--- a/resources/views/admin/flights/flight_fields.blade.php
+++ b/resources/views/admin/flights/flight_fields.blade.php
@@ -1,11 +1,13 @@
 <div id="flight_fields_wrapper">
     <h3>custom fields</h3><br />
     <table class="table table-responsive" id="flight-fields-table">
+        @if(count($flight->fields))
         <thead>
         <th>Name</th>
-        <th>Value</th>
+        <th style="text-align: center;">Value</th>
         <th style="text-align: center;">Actions</th>
         </thead>
+        @endif
         <tbody>
         @foreach($flight->fields as $field)
             <tr>
diff --git a/resources/views/admin/flights/subfleets.blade.php b/resources/views/admin/flights/subfleets.blade.php
index 1b4b074d..cbedd1a0 100644
--- a/resources/views/admin/flights/subfleets.blade.php
+++ b/resources/views/admin/flights/subfleets.blade.php
@@ -1,14 +1,16 @@
 <div id="subfleet_flight_wrapper">
-    <h3>assigned subfleets</h3>
+    <h3>subfleets</h3>
     @component('admin.components.info')
         The subfleets that are assigned to this flight.
     @endcomponent
     <table class="table table-responsive" id="aircrafts-table">
+        @if(count($flight->subfleets))
         <thead>
         <th>Type</th>
         <th>Name</th>
         <th style="text-align: center;">Actions</th>
         </thead>
+        @endif
         <tbody>
         @foreach($flight->subfleets as $sf)
             <tr>
diff --git a/resources/views/admin/ranks/subfleets.blade.php b/resources/views/admin/ranks/subfleets.blade.php
index 9d7513f6..a2cc2194 100644
--- a/resources/views/admin/ranks/subfleets.blade.php
+++ b/resources/views/admin/ranks/subfleets.blade.php
@@ -1,5 +1,6 @@
 <div id="rank_subfleet_wrapper" class="dataTables_wrapper form-inline dt-bootstrap col-lg-12">
     <table class="table table-responsive" id="subfleets-table">
+        @if(count($rank->subfleets))
         <thead>
         <th>Airline</th>
         <th>Name</th>
@@ -7,6 +8,7 @@
         <th style="text-align: center;">Manual Pay</th>
         <th style="text-align: center;">Actions</th>
         </thead>
+        @endif
         <tbody>
         @foreach($rank->subfleets as $sf)
             <tr>
diff --git a/resources/views/admin/subfleets/fares.blade.php b/resources/views/admin/subfleets/fares.blade.php
index f5ee0426..b26b8f8f 100644
--- a/resources/views/admin/subfleets/fares.blade.php
+++ b/resources/views/admin/subfleets/fares.blade.php
@@ -9,6 +9,7 @@
     </div>
     <br />
     <table id="aircraft_fares" class="table table-hover">
+        @if(count($subfleet->fares))
         <thead>
         <tr>
             <th>Name</th>
@@ -19,6 +20,7 @@
             <th></th>
         </tr>
         </thead>
+        @endif
         <tbody>
         @foreach($subfleet->fares as $atf)
             <tr>
diff --git a/resources/views/admin/subfleets/ranks.blade.php b/resources/views/admin/subfleets/ranks.blade.php
index 80282819..147d5db3 100644
--- a/resources/views/admin/subfleets/ranks.blade.php
+++ b/resources/views/admin/subfleets/ranks.blade.php
@@ -7,7 +7,8 @@
         @endcomponent
     </div>
     <br />
-    <table id="subfleet_ranks" class="table table-hover dataTable">
+    <table id="subfleet_ranks" class="table table-hover">
+        @if(count($subfleet->ranks))
         <thead>
         <tr>
             <th>Name</th>
@@ -17,6 +18,7 @@
             <th></th>
         </tr>
         </thead>
+        @endif
         <tbody>
         @foreach($subfleet->ranks as $rank)
             <tr>