diff --git a/resources/views/admin/components/info.blade.php b/resources/views/admin/components/info.blade.php
new file mode 100644
index 00000000..b5fed94d
--- /dev/null
+++ b/resources/views/admin/components/info.blade.php
@@ -0,0 +1,10 @@
+<div>
+    <p style="float:left; margin-right: 10px; margin-left: 2px;">
+        <span style="font-size: 1.0em;">
+            <i class="fas fa-info-circle" style="color: #067ec1"></i>
+        </span>
+    </p>
+    <p class="category">
+        {{ $slot }}
+    </p>
+</div>
diff --git a/resources/views/admin/fares/fields.blade.php b/resources/views/admin/fares/fields.blade.php
index fc35349b..9ae26663 100644
--- a/resources/views/admin/fares/fields.blade.php
+++ b/resources/views/admin/fares/fields.blade.php
@@ -11,59 +11,51 @@
 <div class="row">
 <div class="form-group col-sm-6">
     {!! Form::label('code', 'Code:') !!}&nbsp;<span class="required">*</span>
-    <div class="callout callout-info">
-        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+    @component('admin.components.info')
         How this fare class will show up on a ticket
-    </div>
+    @endcomponent
     {!! Form::text('code', null, ['class' => 'form-control']) !!}
     <p class="text-danger">{{ $errors->first('code') }}</p>
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('name', 'Name:') !!}&nbsp;<span class="required">*</span>
-    <div class="callout callout-info">
-        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+    @component('admin.components.info')
         The fare class name, E.g, "Economy" or "First"
-    </div>
+    @endcomponent
     {!! Form::text('name', null, ['class' => 'form-control']) !!}
     <p class="text-danger">{{ $errors->first('name') }}</p>
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('price', 'Price:') !!}
-    <div class="callout callout-info">
-        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+    @component('admin.components.info')
         This is the price of a ticket for a passenger
-    </div>
+    @endcomponent
     {!! Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
     <p class="text-danger">{{ $errors->first('price') }}</p>
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('cost', 'Cost:') !!}
-    <div class="callout callout-info">
-        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+    @component('admin.components.info')
         The operating cost
-    </div>
+    @endcomponent
     {!! Form::text('cost', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
     <p class="text-danger">{{ $errors->first('cost') }}</p>
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('capacity', 'Capacity:') !!}
-    <div class="callout callout-info">
-        <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+    @component('admin.components.info')
         The number of seats available in this class.
-    </div>
+    @endcomponent
     {!! Form::text('capacity', null, ['class' => 'form-control', 'placeholder' => 0]) !!}
     <p class="text-danger">{{ $errors->first('capacity') }}</p>
 </div>
 
 <div class="form-group col-sm-6">
     {!! Form::label('notes', 'Notes:') !!}
-    <div class="callout callout-info">
-        &nbsp;
-    </div>
     {!! Form::text('notes', null, ['class' => 'form-control']) !!}
     <p class="text-danger">{{ $errors->first('notes') }}</p>
 </div>
diff --git a/resources/views/admin/fares/table.blade.php b/resources/views/admin/fares/table.blade.php
index 7ec9a733..ba24ec45 100644
--- a/resources/views/admin/fares/table.blade.php
+++ b/resources/views/admin/fares/table.blade.php
@@ -11,7 +11,7 @@
     <tbody>
     @foreach($fares as $fare)
         <tr>
-            <td>{!! $fare->code !!}</td>
+            <td><a href="{!! route('admin.fares.edit', [$fare->id]) !!}">{!! $fare->code !!}</a></td>
             <td>{!! $fare->name !!}</td>
             <td>{!! $fare->price !!}</td>
             <td>{!! $fare->cost !!}</td>
diff --git a/resources/views/admin/flights/fares.blade.php b/resources/views/admin/flights/fares.blade.php
index b80cf57f..060d262d 100644
--- a/resources/views/admin/flights/fares.blade.php
+++ b/resources/views/admin/flights/fares.blade.php
@@ -1,15 +1,14 @@
 <div id="flight_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
     <div class="header">
         <h3>fares</h3>
-        <p class="category">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        @component('admin.components.info')
             Fares assigned to the current flight. These can be overridden, otherwise,
             the values used come from the subfleet of the aircraft that the flight is
             filed with. Only assign the fares you want to override. They can be set as
             a monetary amount, or a percentage.
             <a href="http://docs.phpvms.net/concepts/finances"
             target="_blank">Read documentation about finances</a>.
-        </p>
+        @endcomponent
     </div>
 
     <table id="flight_fares"
diff --git a/resources/views/admin/flights/subfleets.blade.php b/resources/views/admin/flights/subfleets.blade.php
index f68ec9fe..1b4b074d 100644
--- a/resources/views/admin/flights/subfleets.blade.php
+++ b/resources/views/admin/flights/subfleets.blade.php
@@ -1,7 +1,8 @@
 <div id="subfleet_flight_wrapper">
     <h3>assigned subfleets</h3>
-    <br />
-
+    @component('admin.components.info')
+        The subfleets that are assigned to this flight.
+    @endcomponent
     <table class="table table-responsive" id="aircrafts-table">
         <thead>
         <th>Type</th>
diff --git a/resources/views/admin/pirepfields/table.blade.php b/resources/views/admin/pirepfields/table.blade.php
index a4009108..1ddb32e6 100644
--- a/resources/views/admin/pirepfields/table.blade.php
+++ b/resources/views/admin/pirepfields/table.blade.php
@@ -1,10 +1,9 @@
 <div class="content table-responsive table-full-width">
 
     <div class="header">
-        <p class="category">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        @component('admin.components.info')
             PIREP fields are only shown for manual PIREPs.
-        </p>
+        @endcomponent
     </div>
 
     <table class="table table-hover table-responsive" id="pirepFields-table">
diff --git a/resources/views/admin/ranks/edit.blade.php b/resources/views/admin/ranks/edit.blade.php
index b3154cd9..3052cf0b 100644
--- a/resources/views/admin/ranks/edit.blade.php
+++ b/resources/views/admin/ranks/edit.blade.php
@@ -13,6 +13,9 @@
     <div class="content">
         <div class="header">
            <h3>subfleets</h3>
+            @component('admin.components.info')
+                These are the subfleets this rank is allowed to use
+            @endcomponent
         </div>
        <div class="row">
            @include('admin.ranks.subfleets')
diff --git a/resources/views/admin/subfleets/fares.blade.php b/resources/views/admin/subfleets/fares.blade.php
index 5a8e7b05..28bfac8b 100644
--- a/resources/views/admin/subfleets/fares.blade.php
+++ b/resources/views/admin/subfleets/fares.blade.php
@@ -1,16 +1,13 @@
-{{--<div class="row"> <div class="col-12">--}}
 <div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
     <div class="header">
         <h3>fares</h3>
-        <p class="category">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        @component('admin.components.info')
             Fares assigned to the current subfleet. These can be overridden,
             otherwise, the value used is the default, which comes from the fare.
-        </p>
+        @endcomponent
     </div>
     <br />
-    <table id="aircraft_fares"
-           class="table table-hover dataTable">
+    <table id="aircraft_fares" class="table table-hover">
         <thead>
         <tr>
             <th>name</th>
@@ -64,7 +61,6 @@
             {!! Form::select('fare_id', $avail_fares, null, [
                     'placeholder' => 'Select Fare',
                     'class' => 'ac-fare-dropdown form-control input-lg select2',
-
                 ])
             !!}
             {!! Form::button('<i class="glyphicon glyphicon-plus"></i> add',
@@ -75,4 +71,3 @@
         </div>
     </div>
 </div>
-{{--</div></div>--}}
diff --git a/resources/views/admin/subfleets/ranks.blade.php b/resources/views/admin/subfleets/ranks.blade.php
index 532b7549..ad6d880f 100644
--- a/resources/views/admin/subfleets/ranks.blade.php
+++ b/resources/views/admin/subfleets/ranks.blade.php
@@ -1,10 +1,9 @@
 <div id="subfleet_ranks_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
     <div class="header">
         <h3>ranks</h3>
-        <p class="category">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+        @component('admin.components.info')
             These ranks are allowed to fly aircraft in this subfleet
-        </p>
+        @endcomponent
     </div>
     <br />
     <table id="subfleet_ranks" class="table table-hover dataTable">
diff --git a/resources/views/admin/subfleets/show.blade.php b/resources/views/admin/subfleets/show.blade.php
index efd6e828..391a3e99 100644
--- a/resources/views/admin/subfleets/show.blade.php
+++ b/resources/views/admin/subfleets/show.blade.php
@@ -1,33 +1,22 @@
 @extends('admin.app')
 
+@section('title', "$subfleet->name")
 @section('content')
-    <section class="content-header">
-        <h1>{!! $subfleet->name !!}</h1>
-    </section>
-    <div class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row" style="padding-left: 20px">
-                    @include('admin.subfleets.show_fields')
-                </div>
-            </div>
+    <div class="card border-blue-bottom">
+        <div class="content">
+            @include('admin.subfleets.show_fields')
         </div>
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row">
-                    <div class="col-xs-12">
-                        <h3>fares</h3>
-                        <div class="box-body">
-                            <div class="callout callout-info">
-                                <i class="icon fa fa-info">&nbsp;&nbsp;</i>
-                                Fares assigned to the current subfleet. These can be overridden,
-                                otherwise, the value used is the default, which comes from the fare.
-                            </div>
-                            @include('admin.subfleets.fares')
-                        </div>
-                    </div>
-                </div>
-            </div>
+    </div>
+
+    <div class="card border-blue-bottom">
+        <div class="content">
+            <h3>fares</h3>
+            @component('admin.components.info')
+                Fares assigned to the current subfleet. These can be overridden,
+                otherwise, the value used is the default, which comes from the fare.
+            @endcomponent
+
+            @include('admin.subfleets.fares')
         </div>
     </div>
 @endsection