diff --git a/resources/views/admin/aircraft/expenses.blade.php b/resources/views/admin/aircraft/expenses.blade.php
index e6770734..10c3688d 100644
--- a/resources/views/admin/aircraft/expenses.blade.php
+++ b/resources/views/admin/aircraft/expenses.blade.php
@@ -2,18 +2,21 @@
     <div class="header">
         <h3>expenses</h3>
         @component('admin.components.info')
-        These expenses are only applied to this aircraft.
+            These expenses are only applied to this aircraft.
         @endcomponent
     </div>
-    <br/>
-    <table class="table table-responsive" id="expenses">
 
-        @if(count($aircraft->expenses))
-        <thead>
-        <th>Name</th>
-        <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
-        <th>Type</th>
-        <th></th>
+    @if(count($aircraft->expenses) === 0)
+        @include('admin.common.none_added', ['type' => 'expenses'])
+    @endif
+
+    <table class="table table-responsive" id="expenses">
+        @if(count($aircraft->expenses) > 0)
+            <thead>
+            <th>Name</th>
+            <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
+            <th>Type</th>
+            <th></th>
         </thead>
         @endif
 
diff --git a/resources/views/admin/aircraft/fields.blade.php b/resources/views/admin/aircraft/fields.blade.php
index 41f48ebb..0b9fde4a 100644
--- a/resources/views/admin/aircraft/fields.blade.php
+++ b/resources/views/admin/aircraft/fields.blade.php
@@ -1,65 +1,78 @@
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('subfleet_id', 'Subfleet:') }}
-        {{ Form::select('subfleet_id', $subfleets, $subfleet_id ?? null, [
-            'class' => 'form-control select2',
-            'placeholder' => 'Select Subfleet'
-            ])
-        }}
-        <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
-    </div>
+    <div class="col-sm-12">
+        <div class="form-container">
+            <h6><i class="fas fa-clock"></i>
+                &nbsp;Subfleet and Status
+            </h6>
+            <div class="form-container-body row">
+                <div class="form-group col-sm-6">
+                    {{ Form::label('subfleet_id', 'Subfleet:') }}
+                    {{ Form::select('subfleet_id', $subfleets, $subfleet_id ?? null, [
+                        'class' => 'form-control select2',
+                        'placeholder' => 'Select Subfleet'
+                        ])
+                    }}
+                    <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
+                </div>
+
+                <div class="form-group col-sm-6">
+                    {{ Form::label('status', 'Status:') }}
+                    {{ Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) }}
+                    <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
+                </div>
+            </div>
+        </div>
 
-    <div class="form-group col-sm-6">
-        {{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
-        {{ Form::text('name', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
     </div>
 </div>
 
 <div class="row">
     <div class="col-12">
-        @component('admin.components.info')
-            View list of
-            <a href="https://en.wikipedia.org/wiki/List_of_ICAO_aircraft_type_designators"
-               target="_blank">
-                IATA and ICAO Type Designators
-            </a>
-        @endcomponent
-    </div>
-</div>
-<div class="row">
-    <div class="form-group col-sm-4">
-        {{ Form::label('iata', 'IATA:') }}
-        {{ Form::text('iata', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('iata') }}</p>
-    </div>
+        <div class="form-container">
+            <h6>
+                <span style="float:right">
+                    View list of
+                    <a href="https://en.wikipedia.org/wiki/List_of_ICAO_aircraft_type_designators"
+                       target="_blank">
+                    IATA and ICAO Type Designators
+                </a>
+                </span>
+                <i class="fas fa-plane"></i>
+                &nbsp;Aircraft Information
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('icao', 'ICAO:') }}
-        {{ Form::text('icao', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('icao') }}</p>
-    </div>
+            </h6>
+            <div class="form-container-body">
+                <div class="row">
+                    <div class="form-group col-sm-12">
+                        {{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
+                        {{ Form::text('name', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('name') }}</p>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="form-group col-sm-4">
+                        {{ Form::label('iata', 'IATA:') }}
+                        {{ Form::text('iata', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('iata') }}</p>
+                    </div>
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('zfw', 'Zero Fuel Weight:') }}
-        {{ Form::text('zfw', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('zfw') }}</p>
-    </div>
-</div>
-<div class="row">
-    <!-- Registration Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('registration', 'Registration:') }}
-        {{--<p class="text-success small">Enter the registration with the country prefix</p>--}}
-        {{ Form::text('registration', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('registration') }}</p>
-    </div>
+                    <div class="form-group col-sm-4">
+                        {{ Form::label('icao', 'ICAO:') }}
+                        {{ Form::text('icao', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('icao') }}</p>
+                    </div>
 
-    <!-- Active Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('status', 'Status:') }}
-        {{ Form::select('status', $statuses, null, ['class' => 'form-control select2', 'placeholder' => 'Select Status']) }}
-        <p class="text-danger">{{ $errors->first('subfleet_id') }}</p>
+                    <div class="form-group col-sm-4">
+                        {{ Form::label('registration', 'Registration:') }}
+                        {{ Form::text('registration', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('registration') }}</p>
+                        {{--{{ Form::label('zfw', 'Zero Fuel Weight:') }}
+                        {{ Form::text('zfw', null, ['class' => 'form-control']) }}
+                        <p class="text-danger">{{ $errors->first('zfw') }}</p>--}}
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
 <div class="row">
diff --git a/resources/views/admin/common/file_upload.blade.php b/resources/views/admin/common/file_upload.blade.php
index bfae7910..4f3cdc4c 100644
--- a/resources/views/admin/common/file_upload.blade.php
+++ b/resources/views/admin/common/file_upload.blade.php
@@ -10,6 +10,10 @@ Pass in:
         <h3>files</h3>
     </div>
 
+    @if(count($model->files) === 0)
+        @include('admin.common.none_added', ['type' => 'files'])
+    @endif
+
     {{-- Show all the files here --}}
     <table class="table table-hover table-responsive">
         @if(count($model->files))
diff --git a/resources/views/admin/common/none_added.blade.php b/resources/views/admin/common/none_added.blade.php
new file mode 100644
index 00000000..1833f9d3
--- /dev/null
+++ b/resources/views/admin/common/none_added.blade.php
@@ -0,0 +1,5 @@
+<div class="jumbotron">
+    <p class="text-center">
+        No {{ $type }} have been added
+    </p>
+</div>
diff --git a/resources/views/admin/components/info.blade.php b/resources/views/admin/components/info.blade.php
index b5fed94d..a7f192c7 100644
--- a/resources/views/admin/components/info.blade.php
+++ b/resources/views/admin/components/info.blade.php
@@ -4,7 +4,7 @@
             <i class="fas fa-info-circle" style="color: #067ec1"></i>
         </span>
     </p>
-    <p class="category">
+    <p class="category" style="text-transform:none;">
         {{ $slot }}
     </p>
 </div>
diff --git a/resources/views/admin/flights/fares.blade.php b/resources/views/admin/flights/fares.blade.php
index 059b5cc8..0be18e68 100644
--- a/resources/views/admin/flights/fares.blade.php
+++ b/resources/views/admin/flights/fares.blade.php
@@ -13,6 +13,10 @@
         <p class="text-danger">{{ $errors->first('value') }}</p>
     </div>
 
+    @if(count($flight->fares) === 0)
+        @include('admin.common.none_added', ['type' => 'fares'])
+    @endif
+
     <table id="flight_fares"
            class="table table-hover"
            role="grid" aria-describedby="aircraft_fares_info">
diff --git a/resources/views/admin/flights/subfleets.blade.php b/resources/views/admin/flights/subfleets.blade.php
index 5c1ce5f4..7b2c4041 100644
--- a/resources/views/admin/flights/subfleets.blade.php
+++ b/resources/views/admin/flights/subfleets.blade.php
@@ -1,8 +1,15 @@
 <div id="subfleet_flight_wrapper">
-    <h3>subfleets</h3>
-    @component('admin.components.info')
-        The subfleets that are assigned to this flight.
-    @endcomponent
+    <div class="header">
+        <h3>subfleets</h3>
+        @component('admin.components.info')
+            The subfleets that are assigned to this flight.
+        @endcomponent
+    </div>
+
+    @if(count($flight->subfleets) === 0)
+        @include('admin.common.none_added', ['type' => 'expenses'])
+    @endif
+
     <table class="table table-responsive" id="aircrafts-table">
         @if(count($flight->subfleets))
         <thead>
diff --git a/resources/views/admin/ranks/fields.blade.php b/resources/views/admin/ranks/fields.blade.php
index ca9ce068..f18ef6d4 100644
--- a/resources/views/admin/ranks/fields.blade.php
+++ b/resources/views/admin/ranks/fields.blade.php
@@ -42,36 +42,47 @@
 
 </div>
 <div class="row">
-    <!-- Auto Approve Acars Field -->
-    <div class="form-group col-sm-4 text-center">
-        <div class="checkbox">
-            <label class="checkbox-inline">
-                {{ Form::hidden('auto_approve_acars', false) }}
-                {{ Form::checkbox('auto_approve_acars') }}
-                {{ Form::label('auto_approve_acars', 'Auto Approve ACARS PIREPs') }}
-            </label>
-        </div>
-    </div>
+    <div class="col-12">
+        <div class="form-container">
+            <h6><i class="fas fa-check-square"></i>
+                &nbsp;Options
+            </h6>
+            <div class="form-container-body">
+                <div class="row">
+                    <!-- Auto Approve Acars Field -->
+                    <div class="form-group col-sm-4 text-center">
+                        <div class="checkbox">
+                            <label class="checkbox-inline">
+                                {{ Form::hidden('auto_approve_acars', false) }}
+                                {{ Form::checkbox('auto_approve_acars') }}
+                                {{ Form::label('auto_approve_acars', 'Auto Approve ACARS PIREPs') }}
+                            </label>
+                        </div>
+                    </div>
 
-    <!-- Auto Approve Manual Field -->
-    <div class="form-group col-sm-4 text-center">
-        <div class="checkbox">
-            <label class="checkbox-inline">
-                {{ Form::hidden('auto_approve_manual', false) }}
-                {{ Form::checkbox('auto_approve_manual') }}
-                {{ Form::label('auto_approve_manual', 'Auto Approve Manual PIREPs') }}
-            </label>
-        </div>
-    </div>
+                    <!-- Auto Approve Manual Field -->
+                    <div class="form-group col-sm-4 text-center">
+                        <div class="checkbox">
+                            <label class="checkbox-inline">
+                                {{ Form::hidden('auto_approve_manual', false) }}
+                                {{ Form::checkbox('auto_approve_manual') }}
+                                {{ Form::label('auto_approve_manual', 'Auto Approve Manual PIREPs') }}
+                            </label>
+                        </div>
+                    </div>
 
-    <!-- Auto Promote Field -->
-    <div class="form-group col-sm-4 text-center">
-        <div class="checkbox">
-            <label class="checkbox-inline">
-                {{ Form::hidden('auto_promote', false) }}
-                {{ Form::checkbox('auto_promote') }}
-                {{ Form::label('auto_promote', 'Auto Promote') }}
-            </label>
+                    <!-- Auto Promote Field -->
+                    <div class="form-group col-sm-4 text-center">
+                        <div class="checkbox">
+                            <label class="checkbox-inline">
+                                {{ Form::hidden('auto_promote', false) }}
+                                {{ Form::checkbox('auto_promote') }}
+                                {{ Form::label('auto_promote', 'Auto Promote') }}
+                            </label>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/admin/ranks/subfleets.blade.php b/resources/views/admin/ranks/subfleets.blade.php
index 0c9121c8..c97b409f 100644
--- a/resources/views/admin/ranks/subfleets.blade.php
+++ b/resources/views/admin/ranks/subfleets.blade.php
@@ -1,4 +1,8 @@
 <div id="rank_subfleet_wrapper" class="dataTables_wrapper form-inline dt-bootstrap col-lg-12">
+    @if(count($rank->subfleets) === 0)
+        @include('admin.common.none_added', ['type' => 'subfleets'])
+    @endif
+
     <table class="table table-responsive" id="subfleets-table">
         @if(count($rank->subfleets))
         <thead>