diff --git a/resources/views/admin/aircraft/show.blade.php b/resources/views/admin/aircraft/show.blade.php
index 44f14327..75f8df21 100644
--- a/resources/views/admin/aircraft/show.blade.php
+++ b/resources/views/admin/aircraft/show.blade.php
@@ -12,23 +12,6 @@
     <div class="row">
         @include('admin.aircraft.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 aircraft. 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>
 </section>
 @endsection
 @section('scripts')
diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php
index 03fcf1ed..9f92bc95 100644
--- a/resources/views/admin/aircraft/table.blade.php
+++ b/resources/views/admin/aircraft/table.blade.php
@@ -4,7 +4,7 @@
         <th>Name</th>
         <th>Registration</th>
         <th style="text-align: center;">Active</th>
-        <th style="text-align: center;">Actions</th>
+        <th style="text-align: right;">Actions</th>
     </thead>
     <tbody>
     @foreach($aircraft as $ac)
@@ -24,10 +24,10 @@
                 <i class="fa fa-{{$ac->active == 1?"check":""}}-square-o" aria-hidden="true"
                    style="color: {{$ac->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
             </td>
-            <td style="width: 10%; text-align: center;" class="form-inline">
+            <td style="width: 10%; text-align: right;" class="form-inline">
                 {!! Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) !!}
                 <div class='btn-group'>
-                    <a href="{!! route('admin.aircraft.show', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
+                    {{--<a href="{!! route('admin.aircraft.show', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>--}}
                     <a href="{!! route('admin.aircraft.edit', [$ac->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
                     {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
                 </div>
diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php
index 60ad4052..76db1956 100644
--- a/resources/views/admin/airlines/table.blade.php
+++ b/resources/views/admin/airlines/table.blade.php
@@ -2,16 +2,19 @@
     <thead>
         <th>Code</th>
         <th>Name</th>
-        <th>Active?</th>
-        <th colspan="3">Action</th>
+        <th style="text-align: center;">Active</th>
+        <th colspan="3" style="text-align: right;">Action</th>
     </thead>
     <tbody>
     @foreach($airlines as $al)
         <tr>
             <td>{!! $al->code !!}</td>
             <td>{!! $al->name !!}</td>
-            <td>{!! $al->active !!}</td>
-            <td>
+            <td style="text-align: center;">
+                <i class="fa fa-{{$al->active == 1?"check":""}}-square-o" aria-hidden="true"
+                   style="color: {{$al->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
+            </td>
+            <td style="text-align: right;">
                 {!! Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) !!}
                 <div class='btn-group'>
                     <a href="{!! route('admin.airlines.show', [$al->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
diff --git a/resources/views/admin/airports/table.blade.php b/resources/views/admin/airports/table.blade.php
index 689fd2c9..84f91975 100644
--- a/resources/views/admin/airports/table.blade.php
+++ b/resources/views/admin/airports/table.blade.php
@@ -7,7 +7,7 @@
             <th style="text-align: center;">100LL</th>
             <th style="text-align: center;">JetA</th>
             <th style="text-align: center;">MOGAS</th>
-            <th colspan="3">Action</th>
+            <th colspan="3" style="text-align: right">Action</th>
         </thead>
         <tbody>
         @foreach($airports as $airport)
@@ -24,7 +24,7 @@
                 <td style="text-align: center;">
                     <a class="inline" href="#" data-pk="{!! $airport->id !!}" data-name="fuel_mogas_cost">{!! $airport->fuel_mogas_cost !!}</a>
                 </td>
-                <td>
+                <td style="text-align: right;">
                     {!! Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) !!}
                     <div class='btn-group'>
                         <a href="{!! route('admin.airports.show', [$airport->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
diff --git a/resources/views/admin/flights/table.blade.php b/resources/views/admin/flights/table.blade.php
index 1b778c13..3435c7ed 100644
--- a/resources/views/admin/flights/table.blade.php
+++ b/resources/views/admin/flights/table.blade.php
@@ -7,14 +7,14 @@
         <th>Dpt Time</th>
         <th>Arr Time</th>
         <th>Notes</th>
-        <th>Active</th>
-        <th colspan="3">Action</th>
+        <th style="text-align: center;">Active</th>
+        <th colspan="3" style="text-align: right;">Action</th>
     </thead>
     <tbody>
     @foreach($flights as $flight)
         <tr>
             <td>
-                <a href="{!! route('admin.flights.show', [$flight->id]) !!}">
+                <a href="{!! route('admin.flights.edit', [$flight->id]) !!}">
                 {!! $flight->airline->code !!}{!! $flight->flight_number !!}
                 @if($flight->route_code)
                     (C: {!! $flight->route_code !!} L: {!! $flight->route_leg !!})
@@ -32,11 +32,14 @@
             <td>{!! $flight->dpt_time !!}</td>
             <td>{!! $flight->arr_time !!}</td>
             <td>{!! $flight->notes !!}</td>
-            <td>{!! $flight->active !!}</td>
-            <td>
+            <td style="text-align: center;">
+                <i class="fa fa-{{$flight->active == 1?"check":""}}-square-o" aria-hidden="true"
+                   style="color: {{$flight->active==1?"darkgreen":"darkred"}};font-size:20px;"></i>
+            </td>
+            <td style="text-align: right;">
                 {!! Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) !!}
                 <div class='btn-group'>
-                    {{--<a href="{!! route('admin.flights.show', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>--}}
+                    <a href="{!! route('admin.flights.show', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-eye-open"></i></a>
                     <a href="{!! route('admin.flights.edit', [$flight->id]) !!}" class='btn btn-default btn-xs'><i class="glyphicon glyphicon-edit"></i></a>
                     {!! Form::button('<i class="glyphicon glyphicon-trash"></i>', ['type' => 'submit', 'class' => 'btn btn-danger btn-xs', 'onclick' => "return confirm('Are you sure?')"]) !!}
                 </div>
diff --git a/resources/views/admin/menu.blade.php b/resources/views/admin/menu.blade.php
index e32e9565..f4a8aa84 100644
--- a/resources/views/admin/menu.blade.php
+++ b/resources/views/admin/menu.blade.php
@@ -15,5 +15,5 @@
 <li><a href="{!! url('/admin/airlines') !!}"><i class="fa fa-navicon"></i>&nbsp;airlines</a></li>
 <li><a href="{!! url('/admin/airports') !!}"><i class="fa fa-globe"></i>&nbsp;airports</a></li>
 {{--<li><a href="{!! url('/admin/aircraftclasses') !!}"><i class="fa fa-tag"></i>&nbsp;aircraft classes</a></li>--}}
-<li><a href="#"><i class="fa fa-user-circle-o" aria-hidden="true"></i>&nbsp;users</a></li>
+<li><a href="{!! url('/admin/users') !!}"><i class="fa fa-user-circle-o" aria-hidden="true"></i>&nbsp;users</a></li>
 <li><a href="{!! url('/admin/ranks') !!}"><i class="fa fa-id-card-o" aria-hidden="true"></i>&nbsp;ranks</a></li>
diff --git a/resources/views/admin/ranks/table.blade.php b/resources/views/admin/ranks/table.blade.php
index 29053ddd..8315c128 100644
--- a/resources/views/admin/ranks/table.blade.php
+++ b/resources/views/admin/ranks/table.blade.php
@@ -3,20 +3,29 @@
         <thead>
         <th>Name</th>
         <th>Hours</th>
-        <th>Auto Approve Acars</th>
-        <th>Auto Approve Manual</th>
-        <th>Auto Promote</th>
-        <th colspan="3">Action</th>
+        <th style="text-align: center;">Auto Approve Acars</th>
+        <th style="text-align: center">Auto Approve Manual</th>
+        <th style="text-align: center">Auto Promote</th>
+        <th colspan="3" style="text-align: right;">Action</th>
         </thead>
         <tbody>
         @foreach($ranks as $rank)
             <tr>
                 <td>{!! $rank->name !!}</td>
                 <td>{!! $rank->hours !!}</td>
-                <td>{!! $rank->auto_approve_acars !!}</td>
-                <td>{!! $rank->auto_approve_manual !!}</td>
-                <td>{!! $rank->auto_promote !!}</td>
-                <td>
+                <td style="text-align: center;">
+                    <i class="fa fa-{{$rank->auto_approve_acars == 1?"check":""}}-square-o" aria-hidden="true"
+                       style="color: {{$rank->auto_approve_acars==1?"darkgreen":"darkred"}};font-size:20px;"></i>
+                </td>
+                <td style="text-align: center;">
+                    <i class="fa fa-{{$rank->auto_approve_manual == 1?"check":""}}-square-o" aria-hidden="true"
+                       style="color: {{$rank->auto_approve_manual==1?"darkgreen":"darkred"}};font-size:20px;"></i>
+                </td>
+                <td style="text-align: center;">
+                    <i class="fa fa-{{$rank->auto_promote == 1?"check":""}}-square-o" aria-hidden="true"
+                       style="color: {{$rank->auto_promote==1?"darkgreen":"darkred"}};font-size:20px;"></i>
+                </td>
+                <td style="text-align: right;">
                     {!! Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) !!}
                     <div class='btn-group'>
                         {{--<a href="{!! route('admin.ranks.show', [$rank->id]) !!}"