diff --git a/app/Http/Controllers/Frontend/FlightController.php b/app/Http/Controllers/Frontend/FlightController.php
index e06589f1..5e0a0a40 100644
--- a/app/Http/Controllers/Frontend/FlightController.php
+++ b/app/Http/Controllers/Frontend/FlightController.php
@@ -68,7 +68,7 @@ class FlightController extends Controller
 
         $flights = $this->flightRepo
             ->orderBy('flight_number', 'asc')
-            ->paginate();
+            ->paginate(1);
 
         $saved_flights = Bid::where('user_id', Auth::id())
             ->pluck('flight_id')->toArray();
diff --git a/public/assets/frontend/css/now-ui-kit.css b/public/assets/frontend/css/now-ui-kit.css
index 62feb2a4..f059e099 100644
--- a/public/assets/frontend/css/now-ui-kit.css
+++ b/public/assets/frontend/css/now-ui-kit.css
@@ -93,7 +93,7 @@
 .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-brown,
 .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-brown {
   color: #fff;
-  background: #f96332;
+  background: #067ec1;
 }
 
 .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-blue,
@@ -269,7 +269,7 @@
 }
 
 .bootstrap-switch.bootstrap-switch-on .bootstrap-switch-brown ~ .bootstrap-switch-default {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .bootstrap-switch.bootstrap-switch-on .bootstrap-switch-blue ~ .bootstrap-switch-default {
@@ -594,7 +594,7 @@
 }
 
 .slider.slider-primary .noUi-handle {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .slider.slider-info .noUi-connect, .slider.slider-info.noUi-connect {
@@ -900,17 +900,6 @@
   color: #f96332;
 }
 
-.table-condensed > tbody > tr > td,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > td,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > thead > tr > th {
-  padding: 2px;
-  text-align: center;
-  cursor: pointer;
-}
-
 .table-striped .datepicker table tr td,
 .table-striped .datepicker table tr th {
   background-color: transparent;
@@ -2462,12 +2451,12 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .progress-container.progress-primary .progress-bar {
-  background: #f96332;
+  background: #067ec1;
 }
 
 .progress-container.progress-primary .progress-value,
 .progress-container.progress-primary .progress-badge {
-  color: #f96332;
+  color: #067ec1;
 }
 
 .progress-container.progress-info .progress {
@@ -2616,14 +2605,14 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .pagination .page-item.active > .page-link {
-  color: #E3E3E3;
+  color: #067ec1;
   -webkit-box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);
           box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);
 }
 
 .pagination .page-item.active > .page-link, .pagination .page-item.active > .page-link:focus, .pagination .page-item.active > .page-link:hover {
-  background-color: #B8B8B8;
-  border-color: #B8B8B8;
+  background-color: #067ec1;
+  border-color: #067ec1;
   color: #FFFFFF;
 }
 
@@ -2634,18 +2623,18 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .pagination.pagination-info .page-item.active > .page-link, .pagination.pagination-info .page-item.active > .page-link:focus, .pagination.pagination-info .page-item.active > .page-link:hover {
-  background-color: #2CA8FF;
-  border-color: #2CA8FF;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-success .page-item.active > .page-link, .pagination.pagination-success .page-item.active > .page-link:focus, .pagination.pagination-success .page-item.active > .page-link:hover {
-  background-color: #18ce0f;
-  border-color: #18ce0f;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-primary .page-item.active > .page-link, .pagination.pagination-primary .page-item.active > .page-link:focus, .pagination.pagination-primary .page-item.active > .page-link:hover {
-  background-color: #f96332;
-  border-color: #f96332;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-warning .page-item.active > .page-link, .pagination.pagination-warning .page-item.active > .page-link:focus, .pagination.pagination-warning .page-item.active > .page-link:hover {
@@ -2670,7 +2659,18 @@ textarea.form-control:focus, textarea.form-control:active {
 .pagination.pagination-neutral .page-item.active > .page-link, .pagination.pagination-neutral .page-item.active > .page-link:focus, .pagination.pagination-neutral .page-item.active > .page-link:hover {
   background-color: #FFFFFF;
   border-color: #FFFFFF;
-  color: #f96332;
+  color: #067ec1;
+}
+
+.table-condensed > tbody > tr > td,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > td,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > thead > tr > th {
+  padding: 5px;
+  /*text-align: center;*/
+  cursor: pointer;
 }
 
 button,
@@ -2779,7 +2779,7 @@ p.description {
 }
 
 .text-primary {
-  color: #f96332 !important;
+  color: #067ec1 !important;
 }
 
 .text-info {
@@ -2952,7 +2952,7 @@ body {
 }
 
 .nav-pills.nav-pills-primary .nav-item .nav-link.active, .nav-pills.nav-pills-primary .nav-item .nav-link.active:focus, .nav-pills.nav-pills-primary .nav-item .nav-link.active:hover {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .nav-pills.nav-pills-info .nav-item .nav-link.active, .nav-pills.nav-pills-info .nav-item .nav-link.active:focus, .nav-pills.nav-pills-info .nav-item .nav-link.active:hover {
@@ -5885,13 +5885,13 @@ Created using IcoMoon - icomoon.io
     transform: translate3d(0px, 0, 0);
   }
   .navbar-collapse:before {
-    background: #f96332;
+    background: #067ec1;
     /* For browsers that do not support gradients */
     /* For Safari 5.1 to 6.0 */
     /* For Opera 11.1 to 12.0 */
     /* For Firefox 3.6 to 15 */
-    background: -webkit-gradient(linear, left top, left bottom, from(#f96332), color-stop(80%, #000));
-    background: linear-gradient(#f96332 0%, #000 80%);
+    background: -webkit-gradient(linear, left top, left bottom, from(#067ec1), color-stop(80%, #000));
+    background: linear-gradient(#067ec1 0%, #000 80%);
     /* Standard syntax (must be last) */
     opacity: 0.76;
     filter: alpha(opacity=76);
diff --git a/public/assets/installer/css/vendor.css b/public/assets/installer/css/vendor.css
index 0c037ad3..c1580b42 100644
--- a/public/assets/installer/css/vendor.css
+++ b/public/assets/installer/css/vendor.css
@@ -6894,7 +6894,7 @@ button.close {
 .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-brown,
 .bootstrap-switch .bootstrap-switch-handle-off.bootstrap-switch-brown {
   color: #fff;
-  background: #f96332;
+  background: #067ec1;
 }
 
 .bootstrap-switch .bootstrap-switch-handle-on.bootstrap-switch-blue,
@@ -7070,7 +7070,7 @@ button.close {
 }
 
 .bootstrap-switch.bootstrap-switch-on .bootstrap-switch-brown ~ .bootstrap-switch-default {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .bootstrap-switch.bootstrap-switch-on .bootstrap-switch-blue ~ .bootstrap-switch-default {
@@ -7395,7 +7395,7 @@ button.close {
 }
 
 .slider.slider-primary .noUi-handle {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .slider.slider-info .noUi-connect, .slider.slider-info.noUi-connect {
@@ -7701,17 +7701,6 @@ button.close {
   color: #f96332;
 }
 
-.table-condensed > tbody > tr > td,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > td,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > thead > tr > th {
-  padding: 2px;
-  text-align: center;
-  cursor: pointer;
-}
-
 .table-striped .datepicker table tr td,
 .table-striped .datepicker table tr th {
   background-color: transparent;
@@ -9263,12 +9252,12 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .progress-container.progress-primary .progress-bar {
-  background: #f96332;
+  background: #067ec1;
 }
 
 .progress-container.progress-primary .progress-value,
 .progress-container.progress-primary .progress-badge {
-  color: #f96332;
+  color: #067ec1;
 }
 
 .progress-container.progress-info .progress {
@@ -9417,14 +9406,14 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .pagination .page-item.active > .page-link {
-  color: #E3E3E3;
+  color: #067ec1;
   -webkit-box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);
           box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);
 }
 
 .pagination .page-item.active > .page-link, .pagination .page-item.active > .page-link:focus, .pagination .page-item.active > .page-link:hover {
-  background-color: #B8B8B8;
-  border-color: #B8B8B8;
+  background-color: #067ec1;
+  border-color: #067ec1;
   color: #FFFFFF;
 }
 
@@ -9435,18 +9424,18 @@ textarea.form-control:focus, textarea.form-control:active {
 }
 
 .pagination.pagination-info .page-item.active > .page-link, .pagination.pagination-info .page-item.active > .page-link:focus, .pagination.pagination-info .page-item.active > .page-link:hover {
-  background-color: #2CA8FF;
-  border-color: #2CA8FF;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-success .page-item.active > .page-link, .pagination.pagination-success .page-item.active > .page-link:focus, .pagination.pagination-success .page-item.active > .page-link:hover {
-  background-color: #18ce0f;
-  border-color: #18ce0f;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-primary .page-item.active > .page-link, .pagination.pagination-primary .page-item.active > .page-link:focus, .pagination.pagination-primary .page-item.active > .page-link:hover {
-  background-color: #f96332;
-  border-color: #f96332;
+  background-color: #067ec1;
+  border-color: #067ec1;
 }
 
 .pagination.pagination-warning .page-item.active > .page-link, .pagination.pagination-warning .page-item.active > .page-link:focus, .pagination.pagination-warning .page-item.active > .page-link:hover {
@@ -9471,7 +9460,18 @@ textarea.form-control:focus, textarea.form-control:active {
 .pagination.pagination-neutral .page-item.active > .page-link, .pagination.pagination-neutral .page-item.active > .page-link:focus, .pagination.pagination-neutral .page-item.active > .page-link:hover {
   background-color: #FFFFFF;
   border-color: #FFFFFF;
-  color: #f96332;
+  color: #067ec1;
+}
+
+.table-condensed > tbody > tr > td,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > td,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > thead > tr > th {
+  padding: 5px;
+  /*text-align: center;*/
+  cursor: pointer;
 }
 
 button,
@@ -9580,7 +9580,7 @@ p.description {
 }
 
 .text-primary {
-  color: #f96332 !important;
+  color: #067ec1 !important;
 }
 
 .text-info {
@@ -9753,7 +9753,7 @@ body {
 }
 
 .nav-pills.nav-pills-primary .nav-item .nav-link.active, .nav-pills.nav-pills-primary .nav-item .nav-link.active:focus, .nav-pills.nav-pills-primary .nav-item .nav-link.active:hover {
-  background-color: #f96332;
+  background-color: #067ec1;
 }
 
 .nav-pills.nav-pills-info .nav-item .nav-link.active, .nav-pills.nav-pills-info .nav-item .nav-link.active:focus, .nav-pills.nav-pills-info .nav-item .nav-link.active:hover {
@@ -12686,13 +12686,13 @@ Created using IcoMoon - icomoon.io
     transform: translate3d(0px, 0, 0);
   }
   .navbar-collapse:before {
-    background: #f96332;
+    background: #067ec1;
     /* For browsers that do not support gradients */
     /* For Safari 5.1 to 6.0 */
     /* For Opera 11.1 to 12.0 */
     /* For Firefox 3.6 to 15 */
-    background: -webkit-gradient(linear, left top, left bottom, from(#f96332), color-stop(80%, #000));
-    background: linear-gradient(#f96332 0%, #000 80%);
+    background: -webkit-gradient(linear, left top, left bottom, from(#067ec1), color-stop(80%, #000));
+    background: linear-gradient(#067ec1 0%, #000 80%);
     /* Standard syntax (must be last) */
     opacity: 0.76;
     filter: alpha(opacity=76);
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index fe89ebff..b1909f76 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
     "/assets/frontend/js/app.js": "/assets/frontend/js/app.js?id=9fc76ac10f8d1c1906a0",
-    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=dae9f7e5d10b71e28486",
+    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=076d3d4d435dd893a459",
     "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=a11d81c6bf8d7a548c86",
     "/assets/admin/js/app.js": "/assets/admin/js/app.js?id=aa2a19e307306470a073",
     "/assets/installer/js/app.js": "/assets/installer/js/app.js?id=c65781eda730445d666e",
@@ -15,6 +15,6 @@
     "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef",
     "/assets/global/js/vendor.js": "/assets/global/js/vendor.js?id=6436d215691e8f38eb12",
     "/assets/global/css/vendor.css": "/assets/global/css/vendor.css?id=115d5c4f2370ae94a962",
-    "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=affe665b10baf5ba6905",
+    "/assets/installer/css/vendor.css": "/assets/installer/css/vendor.css?id=3cf3cc710ecd7033c3e3",
     "/assets/installer/js/vendor.js": "/assets/installer/js/vendor.js?id=01249af00bd2c1267e15"
 }
\ No newline at end of file
diff --git a/resources/sass/now-ui/now-ui-kit.scss b/resources/sass/now-ui/now-ui-kit.scss
index 6e913655..1e216002 100644
--- a/resources/sass/now-ui/now-ui-kit.scss
+++ b/resources/sass/now-ui/now-ui-kit.scss
@@ -31,6 +31,7 @@
 @import "now-ui-kit/progress";
 @import "now-ui-kit/badges";
 @import "now-ui-kit/pagination";
+@import "now-ui-kit/tables";
 @import "now-ui-kit/typography";
 @import "now-ui-kit/misc";
 @import "now-ui-kit/pills";
diff --git a/resources/sass/now-ui/now-ui-kit/_pagination.scss b/resources/sass/now-ui/now-ui-kit/_pagination.scss
index f076d9ca..aeb1e087 100644
--- a/resources/sass/now-ui/now-ui-kit/_pagination.scss
+++ b/resources/sass/now-ui/now-ui-kit/_pagination.scss
@@ -37,14 +37,14 @@
     }
 
     .page-item.active > .page-link{
-        color: $light-gray;
+        color: $brand-primary;
         box-shadow: 0px 5px 25px 0px rgba(0, 0, 0, 0.2);
 
         &,
         &:focus,
         &:hover{
-            background-color: $default-color;
-            border-color: $default-color;
+            background-color: $brand-primary;
+            border-color: $brand-primary;
             color: $white-color;
         }
     }
@@ -61,8 +61,8 @@
             &,
             &:focus,
             &:hover{
-                background-color: $brand-info;
-                border-color: $brand-info;
+                background-color: $brand-primary;
+                border-color: $brand-primary;
             }
         }
     }
@@ -72,8 +72,8 @@
             &,
             &:focus,
             &:hover{
-                background-color: $brand-success;
-                border-color: $brand-success;
+                background-color: $brand-primary;
+                border-color: $brand-primary;
             }
         }
     }
diff --git a/resources/sass/now-ui/now-ui-kit/_tables.scss b/resources/sass/now-ui/now-ui-kit/_tables.scss
new file mode 100644
index 00000000..7b627d64
--- /dev/null
+++ b/resources/sass/now-ui/now-ui-kit/_tables.scss
@@ -0,0 +1,11 @@
+
+.table-condensed > tbody > tr > td,
+.table-condensed > tbody > tr > th,
+.table-condensed > tfoot > tr > td,
+.table-condensed > tfoot > tr > th,
+.table-condensed > thead > tr > td,
+.table-condensed > thead > tr > th {
+  padding: 5px;
+  /*text-align: center;*/
+  cursor: pointer;
+}
diff --git a/resources/sass/now-ui/now-ui-kit/_variables.scss b/resources/sass/now-ui/now-ui-kit/_variables.scss
index be4c442b..3c371d84 100755
--- a/resources/sass/now-ui/now-ui-kit/_variables.scss
+++ b/resources/sass/now-ui/now-ui-kit/_variables.scss
@@ -69,7 +69,7 @@ $danger-color-opacity:       rgba(255, 54, 54, .3) !default;
 $danger-color-alert:         rgba(255, 54, 54, .8) !default;
 
 /*     brand Colors              */
-$brand-primary:              $primary-color !default;
+$brand-primary:              #067ec1 !default;
 $brand-info:                 $info-color !default;
 $brand-success:              $success-color !default;
 $brand-warning:              $warning-color !default;
diff --git a/resources/sass/now-ui/now-ui-kit/plugins/_plugin-datepicker.scss b/resources/sass/now-ui/now-ui-kit/plugins/_plugin-datepicker.scss
index 0efb2db8..73021a2a 100644
--- a/resources/sass/now-ui/now-ui-kit/plugins/_plugin-datepicker.scss
+++ b/resources/sass/now-ui/now-ui-kit/plugins/_plugin-datepicker.scss
@@ -123,17 +123,6 @@
     color: $primary-color;
 }
 
-.table-condensed > tbody > tr > td,
-.table-condensed > tbody > tr > th,
-.table-condensed > tfoot > tr > td,
-.table-condensed > tfoot > tr > th,
-.table-condensed > thead > tr > td,
-.table-condensed > thead > tr > th{
-    padding: 2px;
-    text-align: center;
-    cursor: pointer;
-}
-
 .table-striped .datepicker table tr td,
 .table-striped .datepicker table tr th {
   background-color: transparent;
diff --git a/resources/views/layouts/default/airports/show.blade.php b/resources/views/layouts/default/airports/show.blade.php
index e494ec73..01dff637 100644
--- a/resources/views/layouts/default/airports/show.blade.php
+++ b/resources/views/layouts/default/airports/show.blade.php
@@ -4,7 +4,7 @@
 @section('content')
 <div class="row" style="margin-bottom: 30px;">
     <div class="col-12">
-        <h2 class="description">{{ $airport->full_name }}</h2>
+        <h2>{{ $airport->full_name }}</h2>
     </div>
 
     {{-- Show the weather widget in one column --}}
@@ -24,32 +24,84 @@
           ]) }}
     </div>
 </div>
-<div class="row" style="margin-bottom: 30px;">
+<div class="row">
     {{-- There are files uploaded and a user is logged in--}}
-    @if($airport->files && Auth::check())
+    @if(count($airport->files) > 0 && Auth::check())
         <div class="col-12">
-            <h3 class="description">Downloads</h3>
+            <h3>Downloads</h3>
             @include('downloads.table', ['files' => $airport->files])
         </div>
     @endif
 </div>
+
 <div class="row">
-    <div class="col-md-12">
-        <h3 class="description">Inbound Flights</h3>
+    <div class="col-6">
+        <h5>Inbound Flights</h5>
         @if(!$inbound_flights)
             <div class="jumbotron text-center">
                 no flights found
             </div>
         @else
-            @each('airports.table', $inbound_flights, 'flight')
+            <table class="table table-striped table-condensed">
+                <thead>
+                <tr>
+                    <th class="text-left">Ident</th>
+                    <th class="text-left">From</th>
+                    <th>Departure</th>
+                    <th>Arrival</th>
+                </tr>
+                </thead>
+                @foreach($inbound_flights as $flight)
+                <tr>
+                    <td class="text-left">
+                        <a href="{{ route('frontend.flights.show', [$flight->id]) }}">
+                            {{ $flight->ident }}
+                        </a>
+                    </td>
+                    <td class="text-left">{{ $flight->dpt_airport->name }}
+                        (<a href="{{route('frontend.airports.show',
+                         ['id'=>$flight->dpt_airport->icao])}}">{{$flight->dpt_airport->icao}}</a>)
+                    </td>
+                    <td>{{ $flight->dpt_time }}</td>
+                    <td>{{ $flight->arr_time }}</td>
+                </tr>
+                @endforeach
+            </table>
         @endif
-        <h3 class="description">Outbound Flights</h3>
+    </div>
+
+    <div class="col-6">
+        <h5>Outbound Flights</h5>
         @if(!$outbound_flights)
             <div class="jumbotron text-center">
                 no flights found
             </div>
         @else
-            @each('airports.table', $outbound_flights, 'flight')
+            <table class="table table-striped table-condensed">
+                <thead>
+                <tr>
+                    <th class="text-left">Ident</th>
+                    <th class="text-left">To</th>
+                    <th>Departure</th>
+                    <th>Arrival</th>
+                </tr>
+                </thead>
+                @foreach($outbound_flights as $flight)
+                    <tr>
+                        <td class="text-left">
+                            <a href="{{ route('frontend.flights.show', [$flight->id]) }}">
+                                {{ $flight->ident }}
+                            </a>
+                        </td>
+                        <td class="text-left">{{ $flight->arr_airport->name }}
+                            (<a href="{{route('frontend.airports.show',
+                         ['id'=>$flight->arr_airport->icao])}}">{{$flight->arr_airport->icao}}</a>)
+                        </td>
+                        <td>{{ $flight->dpt_time }}</td>
+                        <td>{{ $flight->arr_time }}</td>
+                    </tr>
+                @endforeach
+            </table>
         @endif
     </div>
 </div>
diff --git a/resources/views/layouts/default/airports/table.blade.php b/resources/views/layouts/default/airports/table.blade.php
deleted file mode 100644
index 58a09f34..00000000
--- a/resources/views/layouts/default/airports/table.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<table class="table">
-    <tr>
-        <td>
-            <a href="{{ route('frontend.flights.show', [$flight->id]) }}">
-                {{ $flight->ident }}
-            </a>
-        </td>
-        <td>{{ $flight->dpt_airport->icao }}</td>
-        <td>
-            {{ $flight->arr_airport->icao }}
-            @if($flight->alt_airport)
-                (Alt: {{ $flight->alt_airport->icao }})
-            @endif
-        </td>
-        {{--<td>{{ $flight->route }}</td>--}}
-        <td>{{ $flight->dpt_time }}</td>
-        <td>{{ $flight->arr_time }}</td>
-        <td>{{ $flight->notes }}</td>
-</table>
diff --git a/resources/views/layouts/default/flights/table.blade.php b/resources/views/layouts/default/flights/table.blade.php
index 57206fba..2020203d 100644
--- a/resources/views/layouts/default/flights/table.blade.php
+++ b/resources/views/layouts/default/flights/table.blade.php
@@ -31,13 +31,20 @@
         </div>
         <div class="row">
             <div class="col-sm-5">
+                {{--<table class="table-condensed"></table>--}}
                 <span class="title">DEP&nbsp;</span>
-                <a href="{{route('frontend.airports.show', ['id'=>$flight->dpt_airport_id])}}">
-                    {{ $flight->dpt_airport->icao }}</a>@if($flight->dpt_time), {{ $flight->dpt_time }}@endif
+                {{ $flight->dpt_airport->name }}
+                (<a href="{{route('frontend.airports.show', [
+                            'id' => $flight->dpt_airport->icao
+                            ])}}">{{$flight->dpt_airport->icao}}</a>)
+                @if($flight->dpt_time), {{ $flight->dpt_time }}@endif
                 <br />
                 <span class="title">ARR&nbsp;</span>
-                <a href="{{route('frontend.airports.show', ['id'=>$flight->arr_airport_id])}}">
-                    {{ $flight->arr_airport->icao }}</a>@if($flight->arr_time), {{ $flight->arr_time }}@endif
+                {{ $flight->arr_airport->name }}
+                (<a href="{{route('frontend.airports.show', [
+                            'id' => $flight->arr_airport->icao
+                            ])}}">{{$flight->arr_airport->icao}}</a>)
+                @if($flight->arr_time), {{ $flight->arr_time }}@endif
                 <br />
                 @if($flight->distance)
                     <span class="title">DISTANCE&nbsp;</span>
diff --git a/resources/views/layouts/default/pagination/default.blade.php b/resources/views/layouts/default/pagination/default.blade.php
index 1552cbca..ade56f73 100644
--- a/resources/views/layouts/default/pagination/default.blade.php
+++ b/resources/views/layouts/default/pagination/default.blade.php
@@ -1,34 +1,46 @@
-<ul class="pagination">
-    <!-- Previous Page Link -->
-    @if ($paginator->onFirstPage())
-        <li class="disabled"><span>&laquo;</span></li>
-    @else
-        <li><a href="{{ $paginator->previousPageUrl() }}" rel="prev">&laquo;</a></li>
-    @endif
+<div class="row">
+    <div class="col-12 text-center">
+        <ul class="pagination text-center" style="justify-content: center; display:flex;">
+            <!-- Previous Page Link -->
+            @if ($paginator->onFirstPage())
+                <li class="page-item disabled"><span class="page-link">&laquo;</span></li>
+            @else
+                <li class="page-item"><a class="page-link"
+                                         href="{{ $paginator->previousPageUrl() }}"
+                                         rel="prev">&laquo;</a></li>
+            @endif
 
-    <!-- Pagination Elements -->
-    @foreach ($elements as $element)
-        <!-- "Three Dots" Separator -->
-        @if (is_string($element))
-            <li class="disabled"><span>{{ $element }}</span></li>
-        @endif
+        <!-- Pagination Elements -->
+            @foreach ($elements as $element)
+            <!-- "Three Dots" Separator -->
+                @if (is_string($element))
+                    <li class="page-item disabled"><span class="page-link">{{ $element }}</span>
+                    </li>
+                @endif
 
-        <!-- Array Of Links -->
-        @if (is_array($element))
-            @foreach ($element as $page => $url)
-                @if ($page == $paginator->currentPage())
-                    <li class="active"><span>{{ $page }}</span></li>
-                @else
-                    <li><a href="{{ $url }}">{{ $page }}</a></li>
+            <!-- Array Of Links -->
+                @if (is_array($element))
+                    @foreach ($element as $page => $url)
+                        @if ($page == $paginator->currentPage())
+                            <li class="page-item active"><span
+                                        class="page-link">{{ $page }}</span></li>
+                        @else
+                            <li class="page-item"><a class="page-link"
+                                                     href="{{ $url }}">{{ $page }}</a>
+                            </li>
+                        @endif
+                    @endforeach
                 @endif
             @endforeach
-        @endif
-    @endforeach
 
-    <!-- Next Page Link -->
-    @if ($paginator->hasMorePages())
-        <li><a href="{{ $paginator->nextPageUrl() }}" rel="next">&raquo;</a></li>
-    @else
-        <li class="disabled"><span>&raquo;</span></li>
-    @endif
-</ul>
+        <!-- Next Page Link -->
+            @if ($paginator->hasMorePages())
+                <li class="page-item"><a class="page-link"
+                                         href="{{ $paginator->nextPageUrl() }}"
+                                         rel="next">&raquo;</a></li>
+            @else
+                <li class="page-item disabled"><span class="page-link">&raquo;</span></li>
+            @endif
+        </ul>
+    </div>
+</div>
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php
index 16496f03..0c17222b 100644
--- a/resources/views/layouts/default/pireps/index.blade.php
+++ b/resources/views/layouts/default/pireps/index.blade.php
@@ -11,12 +11,12 @@
         </div>
         <h2 class="description">pilot reports</h2>
         @include('flash::message')
-        @include("pireps.table")
+        @include('pireps.table')
     </div>
 </div>
 <div class="row">
     <div class="col-12 text-center">
-        {{ $pireps->links("pagination.default") }}
+        {{ $pireps->links('pagination.default') }}
     </div>
 </div>
 @endsection
diff --git a/resources/views/layouts/default/pireps/map.blade.php b/resources/views/layouts/default/pireps/map.blade.php
index c7fae8fa..47940945 100644
--- a/resources/views/layouts/default/pireps/map.blade.php
+++ b/resources/views/layouts/default/pireps/map.blade.php
@@ -1,6 +1,6 @@
 <div class="row">
     <div class="col-md-12">
-        <h4 class="description">flight map</h4>
+        <h5>flight map</h5>
     </div>
     <div class="col-12">
         <div class="box-body">
diff --git a/resources/views/layouts/default/pireps/pirep_card.blade.php b/resources/views/layouts/default/pireps/pirep_card.blade.php
index 6daf259a..96c78f42 100644
--- a/resources/views/layouts/default/pireps/pirep_card.blade.php
+++ b/resources/views/layouts/default/pireps/pirep_card.blade.php
@@ -7,13 +7,15 @@
                         {{ $pirep->ident }}
                     </a>
                     -
-                    <a href="{{route('frontend.airports.show', ['id' => $pirep->dpt_airport_id])}}">
-                        {{ $pirep->dpt_airport_id }}</a>
-
-                    <span class="description"> to </span>
-
-                    <a href="{{route('frontend.airports.show', ['id' => $pirep->arr_airport_id])}}">
-                        {{ $pirep->arr_airport_id }}</a>
+                    {{ $pirep->dpt_airport->name }}
+                    (<a href="{{route('frontend.airports.show', [
+                            'id' => $pirep->dpt_airport->icao
+                            ])}}">{{$pirep->dpt_airport->icao}}</a>)
+                    <span class="description">to</span>
+                    {{ $pirep->arr_airport->name }}
+                    (<a href="{{route('frontend.airports.show', [
+                            'id' => $pirep->arr_airport->icao
+                            ])}}">{{$pirep->arr_airport->icao}}</a>)
                 </h5>
             </div>
             <div class="col-sm-2 text-center">
@@ -33,7 +35,7 @@
             <div class="col-sm-10">
                 <div class="row">
                     <div class="col-sm-6">
-                        <table width="100%">
+                        <table class="table-condensed" width="100%">
                             <tr>
                                 <td nowrap><span class="title">Flight Time&nbsp;</span></td>
                                 <td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php
index d4b8783f..5ebec3e7 100644
--- a/resources/views/layouts/default/pireps/show.blade.php
+++ b/resources/views/layouts/default/pireps/show.blade.php
@@ -4,14 +4,14 @@
 @section('content')
     <div class="row">
         <div class="col-12">
-            <h2 class="description">{{ $pirep->ident }}</h2>
+            <h2>{{ $pirep->ident }}</h2>
         </div>
     </div>
 
     <div class="row">
         <div class="col-8">
-            <h4 class="description">flight info</h4>
-            <table class="table table-hover">
+            <h5>flight info</h5>
+            <table class="table table-hover table-condensed">
                 <tr>
                     <td>Status</td>
                     <td>
@@ -35,11 +35,15 @@
                 <tr>
                     <td>Departure/Arrival</td>
                     <td>
-                        <a href="{{route('frontend.airports.show', ['id' => $pirep->dpt_airport_id])}}">
-                            {{ $pirep->dpt_airport->full_name }}</a>
+                        {{ $pirep->dpt_airport->name }}
+                        (<a href="{{route('frontend.airports.show', [
+                            'id' => $pirep->dpt_airport->icao
+                            ])}}">{{$pirep->dpt_airport->icao}}</a>)
                         <span class="description">to</span>
-                        <a href="{{route('frontend.airports.show', ['id' => $pirep->arr_airport_id])}}">
-                            {{ $pirep->arr_airport->full_name }}</a>
+                        {{ $pirep->arr_airport->name }}
+                        (<a href="{{route('frontend.airports.show', [
+                            'id' => $pirep->arr_airport->icao
+                            ])}}">{{$pirep->arr_airport->icao}}</a>)
                     </td>
                 </tr>
 
@@ -85,8 +89,8 @@
             --}}
 
             @if(count($pirep->fields) > 0)
-                <h4 class="description">fields</h4>
-                <table class="table table-hover">
+                <h5>fields</h5>
+                <table class="table table-hover table-condensed">
                     <thead>
                     <th>Name</th>
                     <th>Value</th>
@@ -101,45 +105,45 @@
                     </tbody>
                 </table>
             @endif
+
+            {{--
+                Show the fares that have been entered
+            --}}
+            @if(count($pirep->fares) > 0)
+                <div class="separator"></div>
+                <div class="row">
+                    <div class="col-12">
+                        <h5>fares</h5>
+                        <table class="table table-hover table-condensed">
+                            <thead>
+                            <th>Class</th>
+                            <th>Count</th>
+                            </thead>
+                            <tbody>
+                            @foreach($pirep->fares as $fare)
+                                <tr>
+                                    <td>{{ $fare->fare->name }} ({{ $fare->fare->code }})</td>
+                                    <td>{{ $fare->count }}</td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            @endif
         </div>
     </div>
 
-    {{--
-        Show the fares that have been entered
-    --}}
-
-    @if(count($pirep->fares) > 0)
-        <div class="row">
-            <div class="col-12">
-                <h4 class="description">fares</h4>
-                <table class="table table-hover">
-                    <thead>
-                    <th>Class</th>
-                    <th>Count</th>
-                    </thead>
-                    <tbody>
-                    @foreach($pirep->fares as $fare)
-                        <tr>
-                            <td>{{ $fare->fare->name }} ({{ $fare->fare->code }})</td>
-                            <td>{{ $fare->count }}</td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
-        </div>
-    @endif
-
     @include('pireps.map')
 
     @if(count($pirep->acars_logs) > 0)
-        <br /><br />
-        <div class="row clear">
+        <div class="separator"></div>
+        <div class="row">
             <div class="col-12">
-                <h3 class="description">flight log</h3>
+                <h5>flight log</h5>
             </div>
             <div class="col-12">
-                <table class="table table-hover" id="users-table">
+                <table class="table table-hover table-condensed" id="users-table">
                     <tbody>
                     @foreach($pirep->acars_logs as $log)
                         <tr>
diff --git a/resources/views/layouts/default/widgets/weather.blade.php b/resources/views/layouts/default/widgets/weather.blade.php
index 2ee0441a..20b9a55f 100644
--- a/resources/views/layouts/default/widgets/weather.blade.php
+++ b/resources/views/layouts/default/widgets/weather.blade.php
@@ -7,7 +7,7 @@ https://api.checkwx.com/#metar-decoded
 @if(!$metar)
     <p>METAR/TAF data could not be retrieved</p>
 @else
-    <table class="table">
+    <table class="table table-striped">
         <tr>
             <td>Conditions</td>
             <td>
diff --git a/webpack.config.js b/webpack.config.js
deleted file mode 100644
index d19a5fde..00000000
--- a/webpack.config.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Conversion of assets to front-end formats
- */
-
-const path = require('path');
-const webpack = require('webpack');
-const ExtractTextPlugin = require("extract-text-webpack-plugin");
-
-const extractSass = new ExtractTextPlugin({
-    filename: __dirname + "/public/assets/js/[name].css"
-});
-
-
-module.exports = {
-    /**
-     * Main application files - for the admin, frontend, and the installer
-     * They are written out to the /assets/js using the key as the filename
-     */
-    entry: {
-        admin: __dirname + "/resources/js/admin/app.js",
-        app: __dirname + "/resources/js/frontend/app.js",
-        installer: __dirname + '/resources/js/installer/app.js',
-    },
-    output: {
-        filename: "[name].js",
-        path: __dirname + "/public/assets/js/",
-    },
-    module: {
-        rules: [
-            /**
-             * Admin SASS conversions
-             */
-            {
-                test: /\.scss$/,
-                include: [
-                    path.resolve(__dirname, 'resources/sass/admin')
-                ],
-                use: extractSass.extract({
-                    use: [{
-                        loader: "css-loader"
-                    }, {
-                        loader: "sass-loader"
-                    }]
-                })
-            }
-        ]
-    }
-};
diff --git a/webpack.mix.js b/webpack.mix.js
index 414f8560..8e9678eb 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -23,7 +23,7 @@ mix.sass('resources/sass/now-ui/now-ui-kit.scss',
     .options({
         processCssUrls: false,
         compressed: true
-    });
+    }).sourceMaps();
 
 /**
  * ADMIN REQUIRED FILES