From 59d09c0cec1bc06fbab74633cab53839ca5c49c6 Mon Sep 17 00:00:00 2001
From: Nabeel S <nabeelio@users.noreply.github.com>
Date: Sat, 1 Feb 2020 13:05:56 -0500
Subject: [PATCH] Format all blade templates to 2 spaces #530 (#531)

---
 .../Importer/Resources/views/app.blade.php    | 100 ++--
 .../Importer/Resources/views/dbtest.blade.php |  10 +-
 .../views/flash/check_error.blade.php         |   8 +-
 .../Resources/views/flash/message.blade.php   |  12 +-
 .../Resources/views/step1-configure.blade.php |   6 +-
 .../Installer/Resources/views/app.blade.php   | 100 ++--
 .../views/errors/already-installed.blade.php  |  14 +-
 .../views/flash/check_error.blade.php         |   8 +-
 .../Resources/views/flash/message.blade.php   |  12 +-
 .../Resources/views/install/dbtest.blade.php  |  10 +-
 .../views/install/index-start.blade.php       |  14 +-
 .../steps/step1-requirements.blade.php        |  96 ++--
 .../views/install/steps/step2-db.blade.php    | 226 ++++-----
 .../install/steps/step2a-db_output.blade.php  |   8 +-
 .../views/install/steps/step3-user.blade.php  | 147 +++---
 .../install/steps/step3a-completed.blade.php  |  24 +-
 .../views/update/index-start.blade.php        |  14 +-
 .../update/steps/step1-no-update.blade.php    |  14 +-
 .../steps/step1-update-available.blade.php    |  14 +-
 .../steps/step2-migrations-done.blade.php     |  16 +-
 .../steps/step3-update-complete.blade.php     |  14 +-
 .../Resources/views/admin/create.blade.php    |  10 +-
 .../Resources/views/admin/index.blade.php     |  20 +-
 .../Sample/Resources/views/index.blade.php    |   8 +-
 modules/Updater/Resources/views/app.blade.php | 100 ++--
 .../views/flash/check_error.blade.php         |   8 +-
 .../Resources/views/flash/message.blade.php   |  12 +-
 .../Resources/views/index-start.blade.php     |  14 +-
 .../views/steps/step1-no-update.blade.php     |  14 +-
 .../steps/step1-update-available.blade.php    |  14 +-
 .../steps/step2-migrations-done.blade.php     |  16 +-
 .../steps/step3-update-complete.blade.php     |  14 +-
 .../views/admin/aircraft/create.blade.php     |  24 +-
 resources/views/admin/aircraft/edit.blade.php |  34 +-
 .../views/admin/aircraft/expenses.blade.php   | 142 +++---
 .../views/admin/aircraft/fields.blade.php     | 140 ++---
 .../views/admin/aircraft/import.blade.php     |   2 +-
 .../views/admin/aircraft/index.blade.php      |  19 +-
 .../views/admin/aircraft/script.blade.php     |  84 +--
 resources/views/admin/aircraft/show.blade.php |  39 +-
 .../admin/aircraft/show_fields.blade.php      |  56 +-
 .../views/admin/aircraft/table.blade.php      |  90 ++--
 .../views/admin/airlines/create.blade.php     |  12 +-
 resources/views/admin/airlines/edit.blade.php |  22 +-
 .../views/admin/airlines/fields.blade.php     |  82 +--
 .../views/admin/airlines/index.blade.php      |  18 +-
 resources/views/admin/airlines/show.blade.php |  26 +-
 .../admin/airlines/show_fields.blade.php      |  28 +-
 .../views/admin/airlines/table.blade.php      |  68 +--
 .../views/admin/airports/create.blade.php     |  10 +-
 resources/views/admin/airports/edit.blade.php |  42 +-
 .../views/admin/airports/expenses.blade.php   | 144 +++---
 .../views/admin/airports/fields.blade.php     | 146 +++---
 .../views/admin/airports/import.blade.php     |   2 +-
 .../views/admin/airports/index.blade.php      |  28 +-
 .../views/admin/airports/script.blade.php     | 144 +++---
 .../views/admin/airports/search.blade.php     |  22 +-
 resources/views/admin/airports/show.blade.php |  39 +-
 .../admin/airports/show_fields.blade.php      |  29 +-
 .../views/admin/airports/table.blade.php      |  76 +--
 resources/views/admin/awards/create.blade.php |  12 +-
 resources/views/admin/awards/edit.blade.php   |  10 +-
 resources/views/admin/awards/fields.blade.php | 116 ++---
 resources/views/admin/awards/index.blade.php  |  18 +-
 .../views/admin/awards/scripts.blade.php      |  38 +-
 resources/views/admin/awards/table.blade.php  |  70 +--
 .../views/admin/common/file_upload.blade.php  | 148 +++---
 resources/views/admin/common/import.blade.php |  62 +--
 .../views/admin/common/none_added.blade.php   |   6 +-
 .../views/admin/components/info.blade.php     |  10 +-
 .../views/admin/components/infobox.blade.php  |  52 +-
 .../views/admin/dashboard/news.blade.php      | 118 ++---
 .../admin/dashboard/pirep_chart.blade.php     | 117 ++++-
 .../views/admin/expenses/create.blade.php     |  12 +-
 resources/views/admin/expenses/edit.blade.php |  14 +-
 .../views/admin/expenses/fields.blade.php     |  98 ++--
 .../views/admin/expenses/import.blade.php     |   2 +-
 .../views/admin/expenses/index.blade.php      |  24 +-
 .../views/admin/expenses/table.blade.php      |  70 +--
 resources/views/admin/fares/create.blade.php  |  12 +-
 resources/views/admin/fares/edit.blade.php    |  10 +-
 resources/views/admin/fares/fields.blade.php  |  68 +--
 resources/views/admin/fares/import.blade.php  |   2 +-
 resources/views/admin/fares/index.blade.php   |  14 +-
 resources/views/admin/fares/show.blade.php    |   6 +-
 .../views/admin/fares/show_fields.blade.php   |  24 +-
 resources/views/admin/fares/table.blade.php   |  68 +--
 .../views/admin/finances/index.blade.php      |  26 +-
 .../views/admin/finances/scripts.blade.php    |  14 +-
 .../views/admin/finances/table.blade.php      | 107 ++--
 .../views/admin/flash/check_error.blade.php   |   8 +-
 resources/views/admin/flash/message.blade.php |  47 +-
 .../views/admin/flightfields/create.blade.php |  12 +-
 .../views/admin/flightfields/edit.blade.php   |  12 +-
 .../views/admin/flightfields/fields.blade.php |  20 +-
 .../views/admin/flightfields/index.blade.php  |  20 +-
 .../views/admin/flightfields/table.blade.php  |  46 +-
 .../views/admin/flights/create.blade.php      |  12 +-
 resources/views/admin/flights/edit.blade.php  |  36 +-
 resources/views/admin/flights/fares.blade.php | 160 +++---
 .../views/admin/flights/fields.blade.php      | 436 ++++++++--------
 .../admin/flights/flight_fields.blade.php     | 148 +++---
 .../views/admin/flights/import.blade.php      |   2 +-
 resources/views/admin/flights/index.blade.php |  38 +-
 .../views/admin/flights/scripts.blade.php     | 193 ++++---
 .../views/admin/flights/search.blade.php      |  38 +-
 resources/views/admin/flights/show.blade.php  |  46 +-
 .../views/admin/flights/show_fields.blade.php | 132 ++---
 .../views/admin/flights/subfleets.blade.php   | 122 ++---
 resources/views/admin/flights/table.blade.php |  85 ++--
 .../views/admin/maintenance/caches.blade.php  |  50 +-
 .../views/admin/maintenance/index.blade.php   |  18 +-
 resources/views/admin/menu.blade.php          | 145 +++---
 .../admin/pagination/bootstrap-4.blade.php    |  56 +-
 .../views/admin/pagination/default.blade.php  |  56 +-
 .../admin/pagination/semantic-ui.blade.php    |  60 +--
 .../pagination/simple-bootstrap-4.blade.php   |  24 +-
 .../admin/pagination/simple-default.blade.php |  24 +-
 .../views/admin/pirepfields/create.blade.php  |  12 +-
 .../views/admin/pirepfields/edit.blade.php    |  12 +-
 .../views/admin/pirepfields/fields.blade.php  |  32 +-
 .../views/admin/pirepfields/index.blade.php   |  12 +-
 .../views/admin/pirepfields/show.blade.php    |  22 +-
 .../admin/pirepfields/show_fields.blade.php   |  20 +-
 .../views/admin/pirepfields/table.blade.php   |  56 +-
 .../views/admin/pireps/actions.blade.php      |  79 +--
 .../views/admin/pireps/comments.blade.php     |  88 ++--
 resources/views/admin/pireps/create.blade.php |  12 +-
 resources/views/admin/pireps/edit.blade.php   |  93 ++--
 resources/views/admin/pireps/fares.blade.php  |  36 +-
 .../views/admin/pireps/field_values.blade.php |  58 +--
 resources/views/admin/pireps/fields.blade.php | 478 +++++++++---------
 .../views/admin/pireps/flight_log.blade.php   |  20 +-
 resources/views/admin/pireps/index.blade.php  |  16 +-
 .../views/admin/pireps/pirep_card.blade.php   |  86 ++--
 .../views/admin/pireps/scripts.blade.php      |  74 +--
 resources/views/admin/pireps/show.blade.php   |  36 +-
 .../views/admin/pireps/show_fields.blade.php  | 148 +++---
 .../views/admin/pireps/transactions.blade.php |  74 +--
 resources/views/admin/ranks/create.blade.php  |  10 +-
 resources/views/admin/ranks/edit.blade.php    |  40 +-
 resources/views/admin/ranks/fields.blade.php  | 188 +++----
 resources/views/admin/ranks/index.blade.php   |  18 +-
 resources/views/admin/ranks/scripts.blade.php |  52 +-
 resources/views/admin/ranks/show.blade.php    |  20 +-
 .../views/admin/ranks/show_fields.blade.php   |  32 +-
 .../views/admin/ranks/subfleets.blade.php     | 120 ++---
 resources/views/admin/ranks/table.blade.php   |  92 ++--
 resources/views/admin/roles/create.blade.php  |  12 +-
 resources/views/admin/roles/edit.blade.php    |  22 +-
 resources/views/admin/roles/fields.blade.php  |  83 +--
 resources/views/admin/roles/index.blade.php   |  18 +-
 resources/views/admin/roles/table.blade.php   |  36 +-
 resources/views/admin/roles/users.blade.php   |  26 +-
 .../views/admin/settings/index.blade.php      |   4 +-
 .../views/admin/settings/script.blade.php     |  34 +-
 resources/views/admin/sidebar.blade.php       |  44 +-
 .../views/admin/subfleets/create.blade.php    |  24 +-
 .../views/admin/subfleets/edit.blade.php      |  54 +-
 .../views/admin/subfleets/expenses.blade.php  | 138 ++---
 .../views/admin/subfleets/fares.blade.php     | 146 +++---
 .../views/admin/subfleets/fields.blade.php    | 108 ++--
 .../views/admin/subfleets/import.blade.php    |   2 +-
 .../views/admin/subfleets/index.blade.php     |  16 +-
 .../views/admin/subfleets/ranks.blade.php     | 140 ++---
 .../views/admin/subfleets/script.blade.php    | 138 ++---
 .../views/admin/subfleets/show.blade.php      |  26 +-
 .../admin/subfleets/show_fields.blade.php     |  20 +-
 .../views/admin/subfleets/table.blade.php     |  52 +-
 resources/views/admin/users/create.blade.php  |  12 +-
 resources/views/admin/users/edit.blade.php    |  30 +-
 resources/views/admin/users/fields.blade.php  | 222 ++++----
 resources/views/admin/users/index.blade.php   |  28 +-
 resources/views/admin/users/search.blade.php  |  42 +-
 resources/views/admin/users/show.blade.php    |   6 +-
 resources/views/admin/users/table.blade.php   |  80 +--
 .../layouts/default/airports/show.blade.php   | 164 +++---
 .../default/auth/emails/password.blade.php    |   3 +-
 .../default/auth/login_layout.blade.php       |  53 +-
 .../default/auth/passwords/email.blade.php    |  64 +--
 .../default/auth/passwords/reset.blade.php    | 103 ++--
 .../layouts/default/auth/pending.blade.php    |  12 +-
 .../layouts/default/auth/register.blade.php   | 257 +++++-----
 .../layouts/default/auth/registered.blade.php |   6 +-
 .../layouts/default/auth/rejected.blade.php   |  16 +-
 .../layouts/default/auth/suspended.blade.php  |  16 +-
 .../layouts/default/auth/verify.blade.php     |  43 +-
 .../layouts/default/components/info.blade.php |  10 +-
 .../layouts/default/dashboard/index.blade.php | 187 +++----
 .../layouts/default/downloads/index.blade.php |  38 +-
 .../layouts/default/downloads/table.blade.php |  25 +-
 .../layouts/default/errors/401.blade.php      |  12 +-
 .../layouts/default/errors/404.blade.php      |  14 +-
 .../layouts/default/errors/503.blade.php      |  64 +--
 .../layouts/default/flash/message.blade.php   |  30 +-
 .../layouts/default/flash/modal.blade.php     |  26 +-
 .../layouts/default/flights/index.blade.php   |  18 +-
 .../layouts/default/flights/map.blade.php     |  22 +-
 .../layouts/default/flights/nav.blade.php     |   8 +-
 .../layouts/default/flights/scripts.blade.php |  26 +-
 .../layouts/default/flights/show.blade.php    | 122 ++---
 .../views/layouts/default/home.blade.php      |  75 +--
 .../layouts/default/livemap/index.blade.php   |   2 +-
 .../notifications/email-plain.blade.php       |  20 +-
 .../default/notifications/email.blade.php     | 302 +++++------
 .../default/pagination/bootstrap-4.blade.php  |  56 +-
 .../default/pagination/default.blade.php      |  82 +--
 .../default/pagination/semantic-ui.blade.php  |  60 +--
 .../pagination/simple-bootstrap-4.blade.php   |  24 +-
 .../pagination/simple-default.blade.php       |  24 +-
 .../default/pireps/custom_fields.blade.php    |  38 +-
 .../layouts/default/pireps/edit.blade.php     |  22 +-
 .../layouts/default/pireps/fares.blade.php    |  30 +-
 .../layouts/default/pireps/index.blade.php    |  26 +-
 .../layouts/default/pireps/map.blade.php      |  28 +-
 .../default/pireps/pirep_card.blade.php       | 114 +++--
 .../layouts/default/pireps/scripts.blade.php  |  20 +-
 .../layouts/default/pireps/show.blade.php     | 412 +++++++--------
 .../layouts/default/pireps/table.blade.php    | 126 ++---
 .../layouts/default/profile/edit.blade.php    |  14 +-
 .../layouts/default/profile/fields.blade.php  | 230 ++++-----
 .../layouts/default/profile/index.blade.php   | 216 ++++----
 resources/views/layouts/default/theme.json    |   4 +-
 .../layouts/default/users/index.blade.php     |  16 +-
 .../layouts/default/users/table.blade.php     |  92 ++--
 .../default/widgets/airspace_map.blade.php    |  14 +-
 .../default/widgets/latest_news.blade.php     |  28 +-
 .../default/widgets/latest_pilots.blade.php   |  16 +-
 .../default/widgets/live_map.blade.php        | 186 +++----
 .../layouts/default/widgets/weather.blade.php | 138 ++---
 .../mail/admin/pirep/submitted.blade.php      |  16 +-
 .../mail/admin/user/registered.blade.php      |  10 +-
 .../notifications/mail/news/news.blade.php    |  16 +-
 .../mail/pirep/accepted.blade.php             |  16 +-
 .../mail/pirep/rejected.blade.php             |  12 +-
 .../mail/user/new_login_details.blade.php     |  24 +-
 .../notifications/mail/user/pending.blade.php |   8 +-
 .../mail/user/registered.blade.php            |  16 +-
 .../mail/user/rejected.blade.php              |  10 +-
 .../system/errors/database_error.blade.php    | 104 ++--
 .../system/errors/not_installed.blade.php     | 106 ++--
 .../views/vendor/datatables/print.blade.php   |  70 +--
 .../views/vendor/mail/html/button.blade.php   |  32 +-
 .../views/vendor/mail/html/footer.blade.php   |  18 +-
 .../views/vendor/mail/html/header.blade.php   |  10 +-
 .../views/vendor/mail/html/layout.blade.php   |  85 ++--
 .../views/vendor/mail/html/message.blade.php  |  50 +-
 .../views/vendor/mail/html/panel.blade.php    |  22 +-
 .../vendor/mail/html/promotion.blade.php      |  10 +-
 .../mail/html/promotion/button.blade.php      |  22 +-
 .../views/vendor/mail/html/subcopy.blade.php  |  10 +-
 .../views/vendor/mail/html/table.blade.php    |   2 +-
 .../vendor/mail/markdown/layout.blade.php     |   2 +-
 .../vendor/mail/markdown/message.blade.php    |  46 +-
 254 files changed, 7123 insertions(+), 7006 deletions(-)

diff --git a/modules/Importer/Resources/views/app.blade.php b/modules/Importer/Resources/views/app.blade.php
index 052d6481..ed036daf 100644
--- a/modules/Importer/Resources/views/app.blade.php
+++ b/modules/Importer/Resources/views/app.blade.php
@@ -2,66 +2,68 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="csrf-token" content="{{ csrf_token() }}">
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') - importer</title>
+  <title>@yield('title') - importer</title>
 
-    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+  <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
 
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
-    <meta name="base-url" content="{!! url('') !!}">
-    <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
-    <meta name="csrf-token" content="{!! csrf_token() !!}">
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <meta name="base-url" content="{!! url('') !!}">
+  <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+  <meta name="csrf-token" content="{!! csrf_token() !!}">
 
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
 
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
-    <link rel="stylesheet"
-          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
 
-    <style>
-        .table tr:first-child td { border-top: 0px; }
-        @yield('css')
-    </style>
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+    @yield('css')
+  </style>
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 {{--<div class="clearfix" style="height: 25px;"></div>--}}
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                @include('importer::flash.message')
-                @yield('content')
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        @include('importer::flash.message')
+        @yield('content')
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
@@ -73,17 +75,17 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 
 <script>
-    hljs.configure({languages: ['sh']});
+  hljs.configure({languages: ['sh']});
 
-    $(document).ready(function () {
+  $(document).ready(function () {
 
-        $(".select2").select2();
+    $(".select2").select2();
 
-        $('pre code').each(function (i, block) {
-            hljs.fixMarkup(block);
-            hljs.highlightBlock(block);
-        });
+    $('pre code').each(function (i, block) {
+      hljs.fixMarkup(block);
+      hljs.highlightBlock(block);
     });
+  });
 </script>
 
 @yield('scripts')
diff --git a/modules/Importer/Resources/views/dbtest.blade.php b/modules/Importer/Resources/views/dbtest.blade.php
index 70a9694b..2917b6bb 100644
--- a/modules/Importer/Resources/views/dbtest.blade.php
+++ b/modules/Importer/Resources/views/dbtest.blade.php
@@ -1,8 +1,8 @@
 <div class="alert alert-{{ $status }}" role="alert">
-    <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-1_bell-53"></i>
-        </div>
-        {{ $message }}
+  <div class="container">
+    <div class="alert-icon">
+      <i class="now-ui-icons ui-1_bell-53"></i>
     </div>
+    {{ $message }}
+  </div>
 </div>
diff --git a/modules/Importer/Resources/views/flash/check_error.blade.php b/modules/Importer/Resources/views/flash/check_error.blade.php
index cc67ffc0..334aa5fd 100644
--- a/modules/Importer/Resources/views/flash/check_error.blade.php
+++ b/modules/Importer/Resources/views/flash/check_error.blade.php
@@ -1,6 +1,6 @@
 @if($errors->has($field))
-    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
-{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
-    {{ $errors->first($field) }}
-</div>--}}
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
 @endif
diff --git a/modules/Importer/Resources/views/flash/message.blade.php b/modules/Importer/Resources/views/flash/message.blade.php
index 5633dc36..d70d3ed4 100644
--- a/modules/Importer/Resources/views/flash/message.blade.php
+++ b/modules/Importer/Resources/views/flash/message.blade.php
@@ -1,11 +1,11 @@
 @foreach (session('flash_notification', collect())->toArray() as $message)
-<div class="alert alert-danger" role="alert">
+  <div class="alert alert-danger" role="alert">
     <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-2_like"></i>
-        </div>
-        {{ $message['message'] }}
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      {{ $message['message'] }}
     </div>
-</div>
+  </div>
 @endforeach
 {{ session()->forget('flash_notification') }}
diff --git a/modules/Importer/Resources/views/step1-configure.blade.php b/modules/Importer/Resources/views/step1-configure.blade.php
index b50e41bd..138df6f8 100644
--- a/modules/Importer/Resources/views/step1-configure.blade.php
+++ b/modules/Importer/Resources/views/step1-configure.blade.php
@@ -12,9 +12,11 @@
           <ul>
             <li>If you have more than 1000 PIREPs or flights, it's best to use the command-line importer!
               <a href="http://docs.phpvms.net/setup/importing-from-v2-v5" target="_blank">Click here</a> to
-              see the documentation of how to use it.</li>
+              see the documentation of how to use it.
+            </li>
             <li><strong>THIS WILL WIPE OUT YOUR EXISTING DATA</strong> - this is required to make sure that things like
-            pilot IDs match up</li>
+              pilot IDs match up
+            </li>
           </ul>
         </td>
       </tr>
diff --git a/modules/Installer/Resources/views/app.blade.php b/modules/Installer/Resources/views/app.blade.php
index e646f37f..425c7318 100644
--- a/modules/Installer/Resources/views/app.blade.php
+++ b/modules/Installer/Resources/views/app.blade.php
@@ -2,66 +2,68 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="csrf-token" content="{{ csrf_token() }}">
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') - installer</title>
+  <title>@yield('title') - installer</title>
 
-    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+  <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
 
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
-    <meta name="base-url" content="{!! url('') !!}">
-    <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
-    <meta name="csrf-token" content="{!! csrf_token() !!}">
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <meta name="base-url" content="{!! url('') !!}">
+  <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+  <meta name="csrf-token" content="{!! csrf_token() !!}">
 
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
 
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
-    <link rel="stylesheet"
-          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
 
-    <style>
-        .table tr:first-child td { border-top: 0px; }
-        @yield('css')
-    </style>
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+    @yield('css')
+  </style>
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 {{--<div class="clearfix" style="height: 25px;"></div>--}}
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                @include('installer::flash.message')
-                @yield('content')
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        @include('installer::flash.message')
+        @yield('content')
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
@@ -73,17 +75,17 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 
 <script>
-    hljs.configure({languages: ['sh']});
+  hljs.configure({languages: ['sh']});
 
-    $(document).ready(function () {
+  $(document).ready(function () {
 
-        $(".select2").select2();
+    $(".select2").select2();
 
-        $('pre code').each(function (i, block) {
-            hljs.fixMarkup(block);
-            hljs.highlightBlock(block);
-        });
+    $('pre code').each(function (i, block) {
+      hljs.fixMarkup(block);
+      hljs.highlightBlock(block);
     });
+  });
 </script>
 
 @yield('scripts')
diff --git a/modules/Installer/Resources/views/errors/already-installed.blade.php b/modules/Installer/Resources/views/errors/already-installed.blade.php
index 0952813f..5d15fd1f 100644
--- a/modules/Installer/Resources/views/errors/already-installed.blade.php
+++ b/modules/Installer/Resources/views/errors/already-installed.blade.php
@@ -1,11 +1,11 @@
 @extends('installer::app')
 
 @section('content')
-    <h2>phpVMS already installed!</h2>
-    <p>phpVMS has already been installed! Please remove the modules/Installer folder.</p>
-    {{ Form::open(['url' => '/', 'method' => 'get']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpVMS already installed!</h2>
+  <p>phpVMS has already been installed! Please remove the modules/Installer folder.</p>
+  {{ Form::open(['url' => '/', 'method' => 'get']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Go to your site >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Installer/Resources/views/flash/check_error.blade.php b/modules/Installer/Resources/views/flash/check_error.blade.php
index cc67ffc0..334aa5fd 100644
--- a/modules/Installer/Resources/views/flash/check_error.blade.php
+++ b/modules/Installer/Resources/views/flash/check_error.blade.php
@@ -1,6 +1,6 @@
 @if($errors->has($field))
-    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
-{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
-    {{ $errors->first($field) }}
-</div>--}}
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
 @endif
diff --git a/modules/Installer/Resources/views/flash/message.blade.php b/modules/Installer/Resources/views/flash/message.blade.php
index d1e269b1..40279a70 100644
--- a/modules/Installer/Resources/views/flash/message.blade.php
+++ b/modules/Installer/Resources/views/flash/message.blade.php
@@ -1,11 +1,11 @@
 @foreach (session('flash_notification', []) as $message)
-<div class="alert alert-danger" role="alert">
+  <div class="alert alert-danger" role="alert">
     <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-2_like"></i>
-        </div>
-        {{ $message['message'] }}
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      {{ $message['message'] }}
     </div>
-</div>
+  </div>
 @endforeach
 {{ session()->forget('flash_notification') }}
diff --git a/modules/Installer/Resources/views/install/dbtest.blade.php b/modules/Installer/Resources/views/install/dbtest.blade.php
index 70a9694b..2917b6bb 100644
--- a/modules/Installer/Resources/views/install/dbtest.blade.php
+++ b/modules/Installer/Resources/views/install/dbtest.blade.php
@@ -1,8 +1,8 @@
 <div class="alert alert-{{ $status }}" role="alert">
-    <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-1_bell-53"></i>
-        </div>
-        {{ $message }}
+  <div class="container">
+    <div class="alert-icon">
+      <i class="now-ui-icons ui-1_bell-53"></i>
     </div>
+    {{ $message }}
+  </div>
 </div>
diff --git a/modules/Installer/Resources/views/install/index-start.blade.php b/modules/Installer/Resources/views/install/index-start.blade.php
index d1be531c..45cd81b2 100644
--- a/modules/Installer/Resources/views/install/index-start.blade.php
+++ b/modules/Installer/Resources/views/install/index-start.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Install phpVMS')
 
 @section('content')
-    <h2>phpvms installer</h2>
-    <p>Press continue to start</p>
-    {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms installer</h2>
+  <p>Press continue to start</p>
+  {{ Form::open(['route' => 'installer.step1', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
index 1346e386..9f1405a6 100644
--- a/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step1-requirements.blade.php
@@ -2,62 +2,66 @@
 @section('title', 'Requirements Check')
 
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.step2', 'method' => 'GET']) }}
     <table class="table" width="25%">
-        <tr><td colspan="2"><h4>php version</h4></td></tr>
-        <tr>
-            <td>PHP Version: {{ $php['version'] }}</td>
-            <td style="text-align:center;">
-                @if($php['passed'] === true)
-                    <span class="badge badge-success">OK!</span>
-                @else
-                    <span class="badge badge-danger">Failed!</span>
-                @endif
-            </td>
-        </tr>
-
-        <tr><td colspan="2"><h4>php extensions</h4></td></tr>
-        @foreach($extensions as $ext)
-            <tr>
-                <td>{{ $ext['ext'] }}</td>
-                <td style="text-align:center;">
-                    @if($ext['passed'] === true)
-                        <span class="badge badge-success">OK!</span>
-                    @else
-                        <span class="badge badge-danger">Failed!</span>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
+      <tr>
+        <td colspan="2"><h4>php version</h4></td>
+      </tr>
+      <tr>
+        <td>PHP Version: {{ $php['version'] }}</td>
+        <td style="text-align:center;">
+          @if($php['passed'] === true)
+            <span class="badge badge-success">OK!</span>
+          @else
+            <span class="badge badge-danger">Failed!</span>
+          @endif
+        </td>
+      </tr>
 
+      <tr>
+        <td colspan="2"><h4>php extensions</h4></td>
+      </tr>
+      @foreach($extensions as $ext)
         <tr>
-            <td colspan="2">
-                <h4>directory permissions</h4>
-                <p>Make sure these directories have read and write permissions</p>
-            </td>
+          <td>{{ $ext['ext'] }}</td>
+          <td style="text-align:center;">
+            @if($ext['passed'] === true)
+              <span class="badge badge-success">OK!</span>
+            @else
+              <span class="badge badge-danger">Failed!</span>
+            @endif
+          </td>
         </tr>
-        @foreach($directories as $dir)
-            <tr>
-                <td>{{ $dir['dir'] }}</td>
-                <td style="text-align:center;">
-                    @if($dir['passed'] === true)
-                        <span class="badge badge-success">OK!</span>
-                    @else
-                        <span class="badge badge-danger">Failed!</span>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
+      @endforeach
+
+      <tr>
+        <td colspan="2">
+          <h4>directory permissions</h4>
+          <p>Make sure these directories have read and write permissions</p>
+        </td>
+      </tr>
+      @foreach($directories as $dir)
+        <tr>
+          <td>{{ $dir['dir'] }}</td>
+          <td style="text-align:center;">
+            @if($dir['passed'] === true)
+              <span class="badge badge-success">OK!</span>
+            @else
+              <span class="badge badge-danger">Failed!</span>
+            @endif
+          </td>
+        </tr>
+      @endforeach
     </table>
     @if($passed === true)
-        <p style="text-align: right">
-            {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
-        </p>
+      <p style="text-align: right">
+        {{ Form::submit('Database Setup >>', ['class' => 'btn btn-success']) }}
+      </p>
     @endif
     {{--{{ $php_version }}
     {{ $extensions }}
     {{ $passed }}--}}
     {{ Form::close() }}
-</div>
+  </div>
 @endsection
diff --git a/modules/Installer/Resources/views/install/steps/step2-db.blade.php b/modules/Installer/Resources/views/install/steps/step2-db.blade.php
index 5de79fed..ac0a17de 100644
--- a/modules/Installer/Resources/views/install/steps/step2-db.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step2-db.blade.php
@@ -1,154 +1,154 @@
 @extends('installer::app')
 @section('title', 'Database Setup')
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.envsetup', 'method' => 'POST']) }}
     <table class="table" width="25%">
 
-        <tr>
-            <td colspan="2"><h4>Site Config</h4></td>
-        </tr>
+      <tr>
+        <td colspan="2"><h4>Site Config</h4></td>
+      </tr>
 
-        <tr>
-            <td>Site Name</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Site Name</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'site_name', 'phpvms', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tr>
-            <td>Site URL</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Site URL</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'site_url', Request::root(), ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tr>
-            <td colspan="2"><h4>Database Config</h4></td>
-        </tr>
+      <tr>
+        <td colspan="2"><h4>Database Config</h4></td>
+      </tr>
 
-        <tr>
-            <td><p>Select Database Type</p></td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td><p>Select Database Type</p></td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::select('db_conn', $db_types, null, ['class' => 'form-control', 'id' => 'db_conn']) }}
+          </div>
+        </td>
+      </tr>
 
-        <tbody id="mysql_settings" class="settings_panel">
-            <tr>
-                <td>Database Host</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                    {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tbody id="mysql_settings" class="settings_panel">
+      <tr>
+        <td>Database Host</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_host', '127.0.0.1', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Port</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Port</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_port', '3306', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Name</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Name</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_name', 'phpvms', ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database User</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database User</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_user', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td>Database Password</td>
-                <td style="text-align:center;">
-                    <div class="form-group">
-                        {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
-                    </div>
-                </td>
-            </tr>
+      <tr>
+        <td>Database Password</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_pass', null, ['class' => 'form-control']) }}
+          </div>
+        </td>
+      </tr>
 
-            <tr>
-                <td colspan="2" style="text-align: right;">
-                    {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
-                </td>
-            </tr>
-        </tbody>
+      <tr>
+        <td colspan="2" style="text-align: right;">
+          {{ Form::submit('Test Database Credentials', ['class' => 'btn btn-info', 'id' => 'dbtest_button']) }}
+        </td>
+      </tr>
+      </tbody>
 
-        <tbody id="sqlite_settings" class="settings_panel">
+      <tbody id="sqlite_settings" class="settings_panel">
 
-        </tbody>
+      </tbody>
 
-        <tr>
-            <td>Database Prefix</td>
-            <td style="text-align:center;">
-                <div class="form-group">
-                    {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}
-                    <p>Set this if you're sharing the database with another application.</p>
-                </div>
-            </td>
-        </tr>
+      <tr>
+        <td>Database Prefix</td>
+        <td style="text-align:center;">
+          <div class="form-group">
+            {{ Form::input('text', 'db_prefix', '', ['class' => 'form-control']) }}
+            <p>Set this if you're sharing the database with another application.</p>
+          </div>
+        </td>
+      </tr>
 
     </table>
     <div id="dbtest"></div>
     <p style="text-align: right">
-        {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
+      {{ Form::submit('Setup Database >>', ['class' => 'btn btn-success']) }}
     </p>
     {{ Form::close() }}
-</div>
+  </div>
 @endsection
 
 @section('scripts')
-<script>
-function changeForm(selected) {
-    $("tbody.settings_panel").hide();
-    $("tbody#" + selected + "_settings").show();
-}
+  <script>
+    function changeForm(selected) {
+      $("tbody.settings_panel").hide();
+      $("tbody#" + selected + "_settings").show();
+    }
 
-$(document).ready(() => {
+    $(document).ready(() => {
 
-    const selValue = $("#db_conn option:selected").text();
-    changeForm(selValue);
+      const selValue = $("#db_conn option:selected").text();
+      changeForm(selValue);
 
-    $("#db_conn").change((e) => {
+      $("#db_conn").change((e) => {
         const selValue = $("#db_conn option:selected").text();
         changeForm(selValue);
-    });
+      });
 
-    $("#dbtest_button").click((e) => {
+      $("#dbtest_button").click((e) => {
         e.preventDefault();
         const opts = {
-            _token: "{{ csrf_token() }}",
-            db_conn: $("#db_conn option:selected").text(),
-            db_host: $("input[name=db_host]").val(),
-            db_port: $("input[name=db_port]").val(),
-            db_name: $("input[name=db_name]").val(),
-            db_user: $("input[name=db_user]").val(),
-            db_pass: $("input[name=db_pass]").val(),
+          _token: "{{ csrf_token() }}",
+          db_conn: $("#db_conn option:selected").text(),
+          db_host: $("input[name=db_host]").val(),
+          db_port: $("input[name=db_port]").val(),
+          db_name: $("input[name=db_name]").val(),
+          db_user: $("input[name=db_user]").val(),
+          db_pass: $("input[name=db_pass]").val(),
         };
 
         $.post("{{ route('installer.dbtest') }}", opts, (data) => {
-            $("#dbtest").html(data);
+          $("#dbtest").html(data);
         })
-    })
-});
-</script>
+      })
+    });
+  </script>
 @endsection
diff --git a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
index 7a0d8eac..f69f1b21 100644
--- a/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step2a-db_output.blade.php
@@ -1,19 +1,19 @@
 @extends('installer::app')
 @section('title', 'Database Setup Completed')
 @section('content')
-<div style="align-content: center;">
+  <div style="align-content: center;">
     {{ Form::open(['route' => 'installer.step3', 'method' => 'GET']) }}
 
     <pre class="lang-sh">
         <code class="lang-sh">
         {{--<code class="language-bash">--}}
-        {{ $console_output }}
+          {{ $console_output }}
         </code>
     </pre>
 
     <p style="text-align: right">
-        {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
+      {{ Form::submit('Continue >>', ['class' => 'btn btn-success']) }}
     </p>
     {{ Form::close() }}
-</div>
+  </div>
 @endsection
diff --git a/modules/Installer/Resources/views/install/steps/step3-user.blade.php b/modules/Installer/Resources/views/install/steps/step3-user.blade.php
index 8b1ae320..fe26b71b 100644
--- a/modules/Installer/Resources/views/install/steps/step3-user.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step3-user.blade.php
@@ -2,117 +2,118 @@
 @section('title', 'User Setup')
 
 @section('content')
-    <div class="row"><div class="col-md-12">
-<div style="align-content: center;">
-    {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
-    <table class="table" width="25%">
+  <div class="row">
+    <div class="col-md-12">
+      <div style="align-content: center;">
+        {{ Form::open(['route' => 'installer.usersetup', 'method' => 'POST']) }}
+        <table class="table" width="25%">
 
-      <tr>
-        <td colspan="2" style="text-align: right">
-          <a href="{{ route('importer.index') }}">Importing from a legacy install?</a>
-        </td>
-      </tr>
+          <tr>
+            <td colspan="2" style="text-align: right">
+              <a href="{{ route('importer.index') }}">Importing from a legacy install?</a>
+            </td>
+          </tr>
 
-        <tr>
+          <tr>
             <td colspan="2"><h4>Airline Information</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline ICAO</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_icao'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'airline_icao', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'airline_icao'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline Name</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_name'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'airline_name', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'airline_name'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Airline Country</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
-                    @include('installer::flash/check_error', ['field' => 'airline_country'])
-                </div>
+              <div class="form-group">
+                {{ Form::select('airline_country', $countries, null, ['class' => 'form-control select2' ]) }}
+                @include('installer::flash/check_error', ['field' => 'airline_country'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td colspan="2"><h4>First User</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Name</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'name'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'name', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'name'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Email</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
-                    @include('installer::flash/check_error', ['field' => 'email'])
-                </div>
+              <div class="form-group">
+                {{ Form::input('text', 'email', null, ['class' => 'form-control']) }}
+                @include('installer::flash/check_error', ['field' => 'email'])
+              </div>
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Password</p></td>
             <td>
-                {{ Form::password('password', ['class' => 'form-control']) }}
-                @include('installer::flash/check_error', ['field' => 'password'])
+              {{ Form::password('password', ['class' => 'form-control']) }}
+              @include('installer::flash/check_error', ['field' => 'password'])
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td width="40%"><p>Password Confirm</p></td>
             <td>
-                {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
-                @include('installer::flash/check_error', ['field' => 'password_confirmation'])
+              {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+              @include('installer::flash/check_error', ['field' => 'password_confirmation'])
             </td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td colspan="2"><h4>Options</h4></td>
-        </tr>
+          </tr>
 
-        <tr>
+          <tr>
             <td><p>Analytics</p></td>
             <td>
-                <div class="form-group">
-                    {{ Form::hidden('telemetry', 0) }}
-                    {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }}
-                    <br />
-                    <p>
-                        Allows collection of analytics. They won't identify you, and helps us to track
-                        the PHP and database versions that are used, and help to figure out problems
-                        and slowdowns when vaCentral integration is enabled.
-                    </p>
-                </div>
+              <div class="form-group">
+                {{ Form::hidden('telemetry', 0) }}
+                {{ Form::checkbox('telemetry', 1, true, ['class' => 'form-control']) }}
+                <br/>
+                <p>
+                  Allows collection of analytics. They won't identify you, and helps us to track
+                  the PHP and database versions that are used, and help to figure out problems
+                  and slowdowns when vaCentral integration is enabled.
+                </p>
+              </div>
             </td>
-        </tr>
-    </table>
-    <div id="dbtest"></div>
-    <p style="text-align: right">
-        {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
-</div>
-        </div>
+          </tr>
+        </table>
+        <div id="dbtest"></div>
+        <p style="text-align: right">
+          {{ Form::submit('Complete Setup >>', ['class' => 'btn btn-success']) }}
+        </p>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 @endsection
diff --git a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
index 5a425cbd..80fa9463 100644
--- a/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
+++ b/modules/Installer/Resources/views/install/steps/step3a-completed.blade.php
@@ -2,19 +2,19 @@
 @section('title', 'Installation Completed!')
 
 @section('content')
-    <div style="align-content: center;">
-        {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'installer.complete', 'method' => 'GET']) }}
 
-        <h4>Installer Completed!</h4>
+    <h4>Installer Completed!</h4>
 
-        <p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
-        <p>Click the button to proceed to the login screen!</p>
+    <p>Edit the <span class="code">config.php</span> to fill in some additional settings. </p>
+    <p>Click the button to proceed to the login screen!</p>
 
-        <p style="text-align: right">
-            {{ Form::submit('Install Complete! Continue to Log-In >>',
-                             ['class' => 'btn btn-success'])
-            }}
-        </p>
-        {{ Form::close() }}
-    </div>
+    <p style="text-align: right">
+      {{ Form::submit('Install Complete! Continue to Log-In >>',
+                       ['class' => 'btn btn-success'])
+      }}
+    </p>
+    {{ Form::close() }}
+  </div>
 @endsection
diff --git a/modules/Installer/Resources/views/update/index-start.blade.php b/modules/Installer/Resources/views/update/index-start.blade.php
index fefb0b7d..c1e7fefe 100644
--- a/modules/Installer/Resources/views/update/index-start.blade.php
+++ b/modules/Installer/Resources/views/update/index-start.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Press continue to check if there are any updates available.</p>
-    {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Press continue to check if there are any updates available.</p>
+  {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
index fd636611..52a5383a 100644
--- a/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-no-update.blade.php
@@ -2,12 +2,12 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>It seems like you're up to date!</p>
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <h2>phpvms updater</h2>
+  <p>It seems like you're up to date!</p>
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-    <p style="text-align: right">
-        {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <p style="text-align: right">
+    {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
index 5503a60f..21d2f346 100644
--- a/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step1-update-available.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Click run to complete the update!.</p>
-    {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Click run to complete the update!.</p>
+  {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
index 540705d4..19fd4000 100644
--- a/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step2-migrations-done.blade.php
@@ -1,18 +1,18 @@
 @extends('installer::app')
 @section('title', 'Update Completed')
 @section('content')
-    <div style="align-content: center;">
-        {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-        <pre class="lang-sh">
+    <pre class="lang-sh">
         <code class="lang-sh">
             {{ $console_output }}
         </code>
     </pre>
 
-        <p style="text-align: right">
-            {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-        </p>
-        {{ Form::close() }}
-    </div>
+    <p style="text-align: right">
+      {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+  </div>
 @endsection
diff --git a/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php b/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
index bcd4cd66..c8851e96 100644
--- a/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
+++ b/modules/Installer/Resources/views/update/steps/step3-update-complete.blade.php
@@ -2,12 +2,12 @@
 @section('title', 'Update Completed')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Update completed!.</p>
+  <h2>phpvms updater</h2>
+  <p>Update completed!.</p>
 
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Sample/Resources/views/admin/create.blade.php b/modules/Sample/Resources/views/admin/create.blade.php
index 97403ae4..dd55d46a 100644
--- a/modules/Sample/Resources/views/admin/create.blade.php
+++ b/modules/Sample/Resources/views/admin/create.blade.php
@@ -5,10 +5,10 @@
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <div class="header"><h4 class="title">Create something!</h4></div>
-            <p>Add a form!</p>
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div class="header"><h4 class="title">Create something!</h4></div>
+      <p>Add a form!</p>
     </div>
+  </div>
 @endsection
diff --git a/modules/Sample/Resources/views/admin/index.blade.php b/modules/Sample/Resources/views/admin/index.blade.php
index 50b536cd..0d994bc9 100644
--- a/modules/Sample/Resources/views/admin/index.blade.php
+++ b/modules/Sample/Resources/views/admin/index.blade.php
@@ -2,17 +2,17 @@
 
 @section('title', 'Sample')
 @section('actions')
-    <li>
-        <a href="{{ url('/admin/sample/create') }}">
-            <i class="ti-plus"></i>
-            Add New</a>
-    </li>
+  <li>
+    <a href="{{ url('/admin/sample/create') }}">
+      <i class="ti-plus"></i>
+      Add New</a>
+  </li>
 @endsection
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <div class="header"><h4 class="title">Admin Scaffold!</h4></div>
-            <p>This view is loaded from module: {{ config('sample.name') }}</p>
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div class="header"><h4 class="title">Admin Scaffold!</h4></div>
+      <p>This view is loaded from module: {{ config('sample.name') }}</p>
     </div>
+  </div>
 @endsection
diff --git a/modules/Sample/Resources/views/index.blade.php b/modules/Sample/Resources/views/index.blade.php
index a6ef647a..4ecd1f5d 100644
--- a/modules/Sample/Resources/views/index.blade.php
+++ b/modules/Sample/Resources/views/index.blade.php
@@ -1,9 +1,9 @@
 @extends('sample::layouts.frontend')
 
 @section('content')
-    <h1>Hello World</h1>
+  <h1>Hello World</h1>
 
-    <p>
-        This view is loaded from module: {{ config('sample.name') }}
-    </p>
+  <p>
+    This view is loaded from module: {{ config('sample.name') }}
+  </p>
 @endsection
diff --git a/modules/Updater/Resources/views/app.blade.php b/modules/Updater/Resources/views/app.blade.php
index 0e4cc175..dfdd534e 100644
--- a/modules/Updater/Resources/views/app.blade.php
+++ b/modules/Updater/Resources/views/app.blade.php
@@ -2,66 +2,68 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <meta name="csrf-token" content="{{ csrf_token() }}">
+  <meta charset="utf-8"/>
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <meta name="csrf-token" content="{{ csrf_token() }}">
 
-    <title>@yield('title') - updater</title>
+  <title>@yield('title') - updater</title>
 
-    <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
+  <link rel="shortcut icon" type="image/png" href="{{ public_asset('/assets/img/favicon.png') }}"/>
 
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
-    <meta name="base-url" content="{!! url('') !!}">
-    <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
-    <meta name="csrf-token" content="{!! csrf_token() !!}">
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <meta name="base-url" content="{!! url('') !!}">
+  <meta name="api-key" content="{!! Auth::check() ? Auth::user()->api_key: '' !!}">
+  <meta name="csrf-token" content="{!! csrf_token() !!}">
 
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" rel="stylesheet"/>
 
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/installer/css/vendor.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
-    <link rel="stylesheet"
-          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
 
-    <style>
-        .table tr:first-child td { border-top: 0px; }
-        @yield('css')
-    </style>
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+    @yield('css')
+  </style>
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation" style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 {{--<div class="clearfix" style="height: 25px;"></div>--}}
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                @include('installer::flash.message')
-                @yield('content')
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        @include('installer::flash.message')
+        @yield('content')
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 {{--<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>--}}
@@ -73,17 +75,17 @@
 <script src="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
 
 <script>
-    hljs.configure({languages: ['sh']});
+  hljs.configure({languages: ['sh']});
 
-    $(document).ready(function () {
+  $(document).ready(function () {
 
-        $(".select2").select2();
+    $(".select2").select2();
 
-        $('pre code').each(function (i, block) {
-            hljs.fixMarkup(block);
-            hljs.highlightBlock(block);
-        });
+    $('pre code').each(function (i, block) {
+      hljs.fixMarkup(block);
+      hljs.highlightBlock(block);
     });
+  });
 </script>
 
 @yield('scripts')
diff --git a/modules/Updater/Resources/views/flash/check_error.blade.php b/modules/Updater/Resources/views/flash/check_error.blade.php
index cc67ffc0..334aa5fd 100644
--- a/modules/Updater/Resources/views/flash/check_error.blade.php
+++ b/modules/Updater/Resources/views/flash/check_error.blade.php
@@ -1,6 +1,6 @@
 @if($errors->has($field))
-    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
-{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
-    {{ $errors->first($field) }}
-</div>--}}
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
 @endif
diff --git a/modules/Updater/Resources/views/flash/message.blade.php b/modules/Updater/Resources/views/flash/message.blade.php
index 5633dc36..d70d3ed4 100644
--- a/modules/Updater/Resources/views/flash/message.blade.php
+++ b/modules/Updater/Resources/views/flash/message.blade.php
@@ -1,11 +1,11 @@
 @foreach (session('flash_notification', collect())->toArray() as $message)
-<div class="alert alert-danger" role="alert">
+  <div class="alert alert-danger" role="alert">
     <div class="container">
-        <div class="alert-icon">
-            <i class="now-ui-icons ui-2_like"></i>
-        </div>
-        {{ $message['message'] }}
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      {{ $message['message'] }}
     </div>
-</div>
+  </div>
 @endforeach
 {{ session()->forget('flash_notification') }}
diff --git a/modules/Updater/Resources/views/index-start.blade.php b/modules/Updater/Resources/views/index-start.blade.php
index fefb0b7d..c1e7fefe 100644
--- a/modules/Updater/Resources/views/index-start.blade.php
+++ b/modules/Updater/Resources/views/index-start.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Press continue to check if there are any updates available.</p>
-    {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Press continue to check if there are any updates available.</p>
+  {{ Form::open(['route' => 'update.step1', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Start >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Updater/Resources/views/steps/step1-no-update.blade.php b/modules/Updater/Resources/views/steps/step1-no-update.blade.php
index fd636611..52a5383a 100644
--- a/modules/Updater/Resources/views/steps/step1-no-update.blade.php
+++ b/modules/Updater/Resources/views/steps/step1-no-update.blade.php
@@ -2,12 +2,12 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>It seems like you're up to date!</p>
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <h2>phpvms updater</h2>
+  <p>It seems like you're up to date!</p>
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-    <p style="text-align: right">
-        {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <p style="text-align: right">
+    {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Updater/Resources/views/steps/step1-update-available.blade.php b/modules/Updater/Resources/views/steps/step1-update-available.blade.php
index 5503a60f..21d2f346 100644
--- a/modules/Updater/Resources/views/steps/step1-update-available.blade.php
+++ b/modules/Updater/Resources/views/steps/step1-update-available.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Update phpVMS')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Click run to complete the update!.</p>
-    {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  <h2>phpvms updater</h2>
+  <p>Click run to complete the update!.</p>
+  {{ Form::open(['route' => 'update.run_migrations', 'method' => 'post']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Run >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php b/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php
index 540705d4..19fd4000 100644
--- a/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php
+++ b/modules/Updater/Resources/views/steps/step2-migrations-done.blade.php
@@ -1,18 +1,18 @@
 @extends('installer::app')
 @section('title', 'Update Completed')
 @section('content')
-    <div style="align-content: center;">
-        {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <div style="align-content: center;">
+    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
 
-        <pre class="lang-sh">
+    <pre class="lang-sh">
         <code class="lang-sh">
             {{ $console_output }}
         </code>
     </pre>
 
-        <p style="text-align: right">
-            {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
-        </p>
-        {{ Form::close() }}
-    </div>
+    <p style="text-align: right">
+      {{ Form::submit('Complete >>', ['class' => 'btn btn-success']) }}
+    </p>
+    {{ Form::close() }}
+  </div>
 @endsection
diff --git a/modules/Updater/Resources/views/steps/step3-update-complete.blade.php b/modules/Updater/Resources/views/steps/step3-update-complete.blade.php
index bcd4cd66..c8851e96 100644
--- a/modules/Updater/Resources/views/steps/step3-update-complete.blade.php
+++ b/modules/Updater/Resources/views/steps/step3-update-complete.blade.php
@@ -2,12 +2,12 @@
 @section('title', 'Update Completed')
 
 @section('content')
-    <h2>phpvms updater</h2>
-    <p>Update completed!.</p>
+  <h2>phpvms updater</h2>
+  <p>Update completed!.</p>
 
-    {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
-    <p style="text-align: right">
-        {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
-    </p>
-    {{ Form::close() }}
+  {{ Form::open(['route' => 'update.complete', 'method' => 'GET']) }}
+  <p style="text-align: right">
+    {{ Form::submit('Finish >>', ['class' => 'btn btn-success']) }}
+  </p>
+  {{ Form::close() }}
 @endsection
diff --git a/resources/views/admin/aircraft/create.blade.php b/resources/views/admin/aircraft/create.blade.php
index 268ba762..49438c73 100644
--- a/resources/views/admin/aircraft/create.blade.php
+++ b/resources/views/admin/aircraft/create.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 @section('title', 'Add Aircraft')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @if(!filled($subfleets))
-                <p class="text-center">
-                    You must add a subfleet before you can add an aircraft!
-                </p>
-            @else
-                {{ Form::open(['route' => 'admin.aircraft.store']) }}
-                    @include('admin.aircraft.fields')
-                {{ Form::close() }}
-            @endif
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @if(!filled($subfleets))
+        <p class="text-center">
+          You must add a subfleet before you can add an aircraft!
+        </p>
+      @else
+        {{ Form::open(['route' => 'admin.aircraft.store']) }}
+        @include('admin.aircraft.fields')
+        {{ Form::close() }}
+      @endif
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/aircraft/edit.blade.php b/resources/views/admin/aircraft/edit.blade.php
index 5c591ef1..b2efa77e 100644
--- a/resources/views/admin/aircraft/edit.blade.php
+++ b/resources/views/admin/aircraft/edit.blade.php
@@ -1,25 +1,25 @@
 @extends('admin.app')
 @section('title', "Edit \"$aircraft->name\"")
 @section('content')
-   <div class="card border-blue-bottom">
-      <div class="content">
-          {{ Form::model($aircraft, ['route' => ['admin.aircraft.update', $aircraft->id], 'method' => 'patch']) }}
-               @include('admin.aircraft.fields')
-          {{ Form::close() }}
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($aircraft, ['route' => ['admin.aircraft.update', $aircraft->id], 'method' => 'patch']) }}
+      @include('admin.aircraft.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-      <div class="content">
-         @include('admin.aircraft.expenses')
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.aircraft.expenses')
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-      <div class="content">
-         @include('admin.common.file_upload', ['model' => $aircraft])
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.common.file_upload', ['model' => $aircraft])
+    </div>
+  </div>
 @endsection
 
 @include('admin.aircraft.script')
diff --git a/resources/views/admin/aircraft/expenses.blade.php b/resources/views/admin/aircraft/expenses.blade.php
index 871e278e..703d5e77 100644
--- a/resources/views/admin/aircraft/expenses.blade.php
+++ b/resources/views/admin/aircraft/expenses.blade.php
@@ -1,78 +1,78 @@
 <div id="expenses-wrapper" class="col-12">
-    <div class="header">
-        <h3>expenses</h3>
-        @component('admin.components.info')
-            These expenses are only applied to this aircraft.
-        @endcomponent
-    </div>
+  <div class="header">
+    <h3>expenses</h3>
+    @component('admin.components.info')
+      These expenses are only applied to this aircraft.
+    @endcomponent
+  </div>
 
-    @if(count($aircraft->expenses) === 0)
-        @include('admin.common.none_added', ['type' => 'expenses'])
+  @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
 
-    <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
+    <tbody>
+    @foreach($aircraft->expenses as $expense)
+      <tr>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="name">{{ $expense->name }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="amount">{{ $expense->amount }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a href="#"
+               class="dropdown"
+               data-pk="{{ $expense->id }}"
+               data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
+          </p>
+        </td>
+        <td align="right">
+          {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'),
+                      'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
+          {{ Form::hidden('expense_id', $expense->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
+                           'class' => 'btn btn-sm btn-danger btn-icon',
+                           'onclick' => "return confirm('Are you sure?')",
+                           ]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="text-right">
+        {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'),
+                        'method' => 'post', 'class' => 'modify_expense form-inline']) }}
+        {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
+        {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
+        {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
+                         'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
 
-        <tbody>
-        @foreach($aircraft->expenses as $expense)
-            <tr>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="name">{{ $expense->name }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="amount">{{ $expense->amount }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a href="#"
-                           class="dropdown"
-                           data-pk="{{ $expense->id }}"
-                           data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
-                    </p>
-                </td>
-                <td align="right">
-                    {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'),
-                                'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
-                    {{ Form::hidden('expense_id', $expense->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
-                                     'class' => 'btn btn-sm btn-danger btn-icon',
-                                     'onclick' => "return confirm('Are you sure?')",
-                                     ]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                {{ Form::open(['url' => url('/admin/aircraft/'.$aircraft->id.'/expenses'),
-                                'method' => 'post', 'class' => 'modify_expense form-inline']) }}
-                {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
-                {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
-                {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
-                {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
-                                 'class' => 'btn btn-success btn-small']) }}
-                {{ Form::close() }}
-
-                <p class="text-danger">{{ $errors->first('name') }}</p>
-                <p class="text-danger">{{ $errors->first('amount') }}</p>
-            </div>
-        </div>
+        <p class="text-danger">{{ $errors->first('name') }}</p>
+        <p class="text-danger">{{ $errors->first('amount') }}</p>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/aircraft/fields.blade.php b/resources/views/admin/aircraft/fields.blade.php
index 95b634e5..33256981 100644
--- a/resources/views/admin/aircraft/fields.blade.php
+++ b/resources/views/admin/aircraft/fields.blade.php
@@ -1,42 +1,42 @@
 <div class="row">
-    <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-4">
-                    {{ 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-4">
-                    {{ 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 class="form-group col-sm-4">
-                    {{ Form::label('airport_id', 'Location:') }}
-                    {{ Form::select('airport_id', $airports, null, [
-                        'class' => 'form-control select2'
-                        ]) }}
-                    <p class="text-danger">{{ $errors->first('airport_id') }}</p>
-                </div>
-            </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-4">
+          {{ 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-4">
+          {{ 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 class="form-group col-sm-4">
+          {{ Form::label('airport_id', 'Location:') }}
+          {{ Form::select('airport_id', $airports, null, [
+              'class' => 'form-control select2'
+              ]) }}
+          <p class="text-danger">{{ $errors->first('airport_id') }}</p>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="col-12">
-        <div class="form-container">
-            <h6>
+  <div class="col-12">
+    <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"
@@ -44,47 +44,47 @@
                     IATA and ICAO Type Designators
                 </a>
                 </span>
-                <i class="fas fa-plane"></i>
-                &nbsp;Aircraft Information
+        <i class="fas fa-plane"></i>
+        &nbsp;Aircraft Information
 
-            </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-3">
-                        {{ 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-3">
-                        {{ Form::label('icao', 'ICAO:') }}
-                        {{ Form::text('icao', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('icao') }}</p>
-                    </div>
-
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('registration', 'Registration:') }}
-                        {{ Form::text('registration', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('registration') }}</p>
-                    </div>
-                </div>
-            </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-3">
+            {{ 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-3">
+            {{ Form::label('icao', 'ICAO:') }}
+            {{ Form::text('icao', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('icao') }}</p>
+          </div>
+
+          <div class="form-group col-sm-3">
+            {{ Form::label('registration', 'Registration:') }}
+            {{ Form::text('registration', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('registration') }}</p>
+          </div>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
 <div class="row">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.aircraft.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.aircraft.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/aircraft/import.blade.php b/resources/views/admin/aircraft/import.blade.php
index 6a1da74f..79bac81e 100644
--- a/resources/views/admin/aircraft/import.blade.php
+++ b/resources/views/admin/aircraft/import.blade.php
@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Aircraft')
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.aircraft.import'])
+  @include('admin.common.import', ['route' => 'admin.aircraft.import'])
 @endsection
diff --git a/resources/views/admin/aircraft/index.blade.php b/resources/views/admin/aircraft/index.blade.php
index 25666c0c..913c1902 100644
--- a/resources/views/admin/aircraft/index.blade.php
+++ b/resources/views/admin/aircraft/index.blade.php
@@ -2,18 +2,19 @@
 @section('title', 'Aircraft')
 
 @section('actions')
-    <li><a href="{{ route('admin.aircraft.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <li><a href="{{ route('admin.aircraft.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    {{--<li><a href="{{ url('/admin/subfleets') }}"><i class="ti-files"></i>Subfleets</a></li>--}}
-    <li><a href="{{ route('admin.aircraft.create') }}?subfleet={{$subfleet_id}}">
-            <i class="ti-plus"></i>New Aircraft</a></li>
+  <li><a href="{{ route('admin.aircraft.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+  <li><a href="{{ route('admin.aircraft.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  {{--<li><a href="{{ url('/admin/subfleets') }}"><i class="ti-files"></i>Subfleets</a></li>--}}
+  <li><a href="{{ route('admin.aircraft.create') }}?subfleet={{$subfleet_id}}">
+      <i class="ti-plus"></i>New Aircraft</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.aircraft.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.aircraft.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/aircraft/script.blade.php b/resources/views/admin/aircraft/script.blade.php
index 61fa37dc..e690e7aa 100644
--- a/resources/views/admin/aircraft/script.blade.php
+++ b/resources/views/admin/aircraft/script.blade.php
@@ -1,70 +1,70 @@
 @section('scripts')
-<script>
-function setEditable() {
-    const token = $('meta[name="csrf-token"]').attr('content');
-    const api_key = $('meta[name="api-key"]').attr('content');
+  <script>
+    function setEditable() {
+      const token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
 
-    @if(isset($aircraft))
-    $('#expenses a.text').editable({
+      @if(isset($aircraft))
+      $('#expenses a.text').editable({
         emptytext: '0',
         url: '{{ url('/admin/aircraft/'.$aircraft->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('#expenses a.dropdown').editable({
+      $('#expenses a.dropdown').editable({
         type: 'select',
         emptytext: '0',
         source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
         url: '{{ url('/admin/aircraft/'.$aircraft->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
-    @endif
-}
+      });
+      @endif
+    }
 
-$(document).ready(function() {
+    $(document).ready(function () {
 
-    setEditable();
+      setEditable();
 
-    $(document).on('submit', 'form.modify_expense', function (event) {
+      $(document).on('submit', 'form.modify_expense', function (event) {
         event.preventDefault();
         console.log(event);
         $.pjax.submit(event, '#expenses-wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function () {
-      initPlugins();
-      setEditable();
+      $(document).on('pjax:complete', function () {
+        initPlugins();
+        setEditable();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/aircraft/show.blade.php b/resources/views/admin/aircraft/show.blade.php
index a7f0960b..1c33d28c 100644
--- a/resources/views/admin/aircraft/show.blade.php
+++ b/resources/views/admin/aircraft/show.blade.php
@@ -1,43 +1,44 @@
 @extends('admin.app')
 
 @section('content')
-<section class="content-header">
+  <section class="content-header">
     <h1 class="pull-left">{{ $aircraft->name }}</h1>
     <h1 class="pull-right">
-        <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{{ route('admin.aircraft.edit', $aircraft->id) }}">Edit</a>
+      <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
+         href="{{ route('admin.aircraft.edit', $aircraft->id) }}">Edit</a>
     </h1>
-</section>
-<section class="content">
+  </section>
+  <section class="content">
     <div class="clearfix"></div>
     <div class="row">
-        @include('admin.aircraft.show_fields')
+      @include('admin.aircraft.show_fields')
     </div>
-</section>
+  </section>
 @endsection
 @section('scripts')
-<script>
-$(document).ready(function() {
-    $(".ac-fare-dropdown").select2();
-    $('#aircraft_fares a').editable({
+  <script>
+    $(document).ready(function () {
+      $(".ac-fare-dropdown").select2();
+      $('#aircraft_fares a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'default',
         url: '/admin/aircraft/{{ $aircraft->id }}/fares',
         title: 'Enter override value',
-        ajaxOptions: { 'type': 'put'},
-        params: function(params) {
+        ajaxOptions: {'type': 'put'},
+        params: function (params) {
           return {
-              fare_id: params.pk,
-              name: params.name,
-              value: params.value
+            fare_id: params.pk,
+            name: params.name,
+            value: params.value
           }
         }
-    });
+      });
 
-    $(document).on('submit', 'form.rm_fare', function(event) {
+      $(document).on('submit', 'form.rm_fare', function (event) {
         event.preventDefault();
         $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/aircraft/show_fields.blade.php b/resources/views/admin/aircraft/show_fields.blade.php
index e8911488..12b0220f 100644
--- a/resources/views/admin/aircraft/show_fields.blade.php
+++ b/resources/views/admin/aircraft/show_fields.blade.php
@@ -1,47 +1,47 @@
 <!-- Icao Field -->
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            <h3 class="box-title">{{ Form::label('airport_id', 'Location') }}</h3>
-        </div>
-        <div class="box-body">
-            <p class="lead">
-            @if($aircraft->airport)
-                {{ $aircraft->airport->icao }}</p>
-            @endif
-        </div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      <h3 class="box-title">{{ Form::label('airport_id', 'Location') }}</h3>
     </div>
+    <div class="box-body">
+      <p class="lead">
+        @if($aircraft->airport)
+          {{ $aircraft->airport->icao }}</p>
+      @endif
+    </div>
+  </div>
 </div>
 
 <!-- Name Field -->
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{{ Form::label('name', 'Name') }}</h3>
-        </div>
-        <div class="box-body"><p class="lead">{{ $aircraft->name }}</p></div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      {{--<i class="fa fa-text-width"></i>--}}
+      <h3 class="box-title">{{ Form::label('name', 'Name') }}</h3>
     </div>
+    <div class="box-body"><p class="lead">{{ $aircraft->name }}</p></div>
+  </div>
 </div>
 
 <!-- Registration Field -->
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{{ Form::label('registration', 'Registration') }}</h3>
-        </div>
-        <div class="box-body"><p class="lead">{{ $aircraft->registration }}</p></div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      {{--<i class="fa fa-text-width"></i>--}}
+      <h3 class="box-title">{{ Form::label('registration', 'Registration') }}</h3>
     </div>
+    <div class="box-body"><p class="lead">{{ $aircraft->registration }}</p></div>
+  </div>
 </div>
 
 <!-- Active Field -->
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{{ Form::label('active', 'Active:') }}</h3>
-        </div>
-        <div class="box-body"><p class="lead">@if ($aircraft->active == '1') yes @else no @endif</p></div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      {{--<i class="fa fa-text-width"></i>--}}
+      <h3 class="box-title">{{ Form::label('active', 'Active:') }}</h3>
     </div>
+    <div class="box-body"><p class="lead">@if ($aircraft->active == '1') yes @else no @endif</p></div>
+  </div>
 </div>
diff --git a/resources/views/admin/aircraft/table.blade.php b/resources/views/admin/aircraft/table.blade.php
index 4074d2d0..9a06edc4 100644
--- a/resources/views/admin/aircraft/table.blade.php
+++ b/resources/views/admin/aircraft/table.blade.php
@@ -1,49 +1,49 @@
 <table class="table table-hover table-responsive" id="aircrafts-table">
-    <thead>
-        <th>Name</th>
-        <th style="text-align: center;">Registration</th>
-        <th>Subfleet</th>
-        <th style="text-align: center;">Location</th>
-        <th style="text-align: center;">Hours</th>
-        <th style="text-align: center;">Active</th>
-        <th style="text-align: right;"></th>
-    </thead>
-    <tbody>
-    @foreach($aircraft as $ac)
-        <tr>
-            <td><a href="{{ route('admin.aircraft.edit', [$ac->id]) }}">{{ $ac->name }}</a></td>
-            <td style="text-align: center;">{{ $ac->registration }}</td>
-            <td>
-                @if($ac->subfleet_id && $ac->subfleet)
-                    <a href="{{ route('admin.subfleets.edit', [$ac->subfleet_id]) }}">
-                    {{ $ac->subfleet->name }}
-                    </a>
-                @else
-                    -
-                @endif
-            </td>
-            <td style="text-align: center;">{{ $ac->airport_id }}</td>
-            <td style="text-align: center;">
-                {{ Utils::minutesToTimeString($ac->flight_hours) }}
-            </td>
-            <td style="text-align: center;">
-                @if($ac->status == \App\Models\Enums\AircraftStatus::ACTIVE)
-                    <span class="label label-success">{{ \App\Models\Enums\AircraftStatus::label($ac->status) }}</span>
-                @else
-                    <span class="label label-default">
+  <thead>
+  <th>Name</th>
+  <th style="text-align: center;">Registration</th>
+  <th>Subfleet</th>
+  <th style="text-align: center;">Location</th>
+  <th style="text-align: center;">Hours</th>
+  <th style="text-align: center;">Active</th>
+  <th style="text-align: right;"></th>
+  </thead>
+  <tbody>
+  @foreach($aircraft as $ac)
+    <tr>
+      <td><a href="{{ route('admin.aircraft.edit', [$ac->id]) }}">{{ $ac->name }}</a></td>
+      <td style="text-align: center;">{{ $ac->registration }}</td>
+      <td>
+        @if($ac->subfleet_id && $ac->subfleet)
+          <a href="{{ route('admin.subfleets.edit', [$ac->subfleet_id]) }}">
+            {{ $ac->subfleet->name }}
+          </a>
+        @else
+          -
+        @endif
+      </td>
+      <td style="text-align: center;">{{ $ac->airport_id }}</td>
+      <td style="text-align: center;">
+        {{ Utils::minutesToTimeString($ac->flight_hours) }}
+      </td>
+      <td style="text-align: center;">
+        @if($ac->status == \App\Models\Enums\AircraftStatus::ACTIVE)
+          <span class="label label-success">{{ \App\Models\Enums\AircraftStatus::label($ac->status) }}</span>
+        @else
+          <span class="label label-default">
                         {{ \App\Models\Enums\AircraftStatus::label($ac->status) }}
                     </span>
-                @endif
-            </td>
-            <td style="width: 10%; text-align: right;">
-                {{ Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.aircraft.edit', [$ac->id]) }}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i>
-                </a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+        @endif
+      </td>
+      <td style="width: 10%; text-align: right;">
+        {{ Form::open(['route' => ['admin.aircraft.destroy', $ac->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.aircraft.edit', [$ac->id]) }}" class='btn btn-sm btn-success btn-icon'>
+          <i class="fas fa-pencil-alt"></i>
+        </a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/airlines/create.blade.php b/resources/views/admin/airlines/create.blade.php
index 053590e4..6a3ea1b6 100644
--- a/resources/views/admin/airlines/create.blade.php
+++ b/resources/views/admin/airlines/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add Airline')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.airlines.store']) }}
-             @include('admin.airlines.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.airlines.store']) }}
+      @include('admin.airlines.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/airlines/edit.blade.php b/resources/views/admin/airlines/edit.blade.php
index fb173c6e..0434d3e6 100644
--- a/resources/views/admin/airlines/edit.blade.php
+++ b/resources/views/admin/airlines/edit.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 @section('title', "Edit \"$airline->name\"")
 @section('content')
-<div class="card border-blue-bottom">
-   <div class="content">
-       {{ Form::model($airline, ['route' => ['admin.airlines.update', $airline->id], 'method' => 'patch']) }}
-            @include('admin.airlines.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($airline, ['route' => ['admin.airlines.update', $airline->id], 'method' => 'patch']) }}
+      @include('admin.airlines.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-<div class="card border-blue-bottom">
-   <div class="content">
+  <div class="card border-blue-bottom">
+    <div class="content">
       @include('admin.common.file_upload', ['model' => $airline])
-   </div>
-</div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/airlines/fields.blade.php b/resources/views/admin/airlines/fields.blade.php
index d90de55f..fe7c5bc3 100644
--- a/resources/views/admin/airlines/fields.blade.php
+++ b/resources/views/admin/airlines/fields.blade.php
@@ -1,55 +1,55 @@
 <div class="row">
-    <!-- Code Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('icao', 'Code:') }}&nbsp;<span class="required">*</span>
-        {{ Form::text('icao', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('icao') }}</p>
-    </div>
+  <!-- Code Field -->
+  <div class="form-group col-sm-6">
+    {{ Form::label('icao', 'Code:') }}&nbsp;<span class="required">*</span>
+    {{ Form::text('icao', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('icao') }}</p>
+  </div>
 
-    <!-- Name Field -->
-    <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>
+  <!-- Name Field -->
+  <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="form-group col-sm-6">
-        {{ 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-6">
+    {{ 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-6">
-        {{ Form::label('logo', 'Logo URL:') }}
-        {{ Form::text('logo', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('logo') }}</p>
-    </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('logo', 'Logo URL:') }}
+    {{ Form::text('logo', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('logo') }}</p>
+  </div>
 
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('country', 'Country:') }} <br/>
-        {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
-        <p class="text-danger">{{ $errors->first('country') }}</p>
-    </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('country', 'Country:') }} <br/>
+    {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+    <p class="text-danger">{{ $errors->first('country') }}</p>
+  </div>
 
-    <div class="form-group col-sm-6">
-        {{ Form::label('active', 'Active:') }}
-        <br />
-        <label class="checkbox-inline">
-            {{ Form::hidden('active', 0, false) }}
-            {{ Form::checkbox('active', 1, null) }}
-        </label>
-    </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('active', 'Active:') }}
+    <br/>
+    <label class="checkbox-inline">
+      {{ Form::hidden('active', 0, false) }}
+      {{ Form::checkbox('active', 1, null) }}
+    </label>
+  </div>
 </div>
 <div class="row">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.airlines.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.airlines.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/airlines/index.blade.php b/resources/views/admin/airlines/index.blade.php
index ade28abb..5c0ad89a 100644
--- a/resources/views/admin/airlines/index.blade.php
+++ b/resources/views/admin/airlines/index.blade.php
@@ -2,18 +2,18 @@
 
 @section('title', 'Airlines')
 @section('actions')
-    <li>
-        <a href="{{ route('admin.airlines.create') }}">
-            <i class="ti-plus"></i>
-            Add New</a>
-    </li>
+  <li>
+    <a href="{{ route('admin.airlines.create') }}">
+      <i class="ti-plus"></i>
+      Add New</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-        @include('admin.airlines.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.airlines.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/airlines/show.blade.php b/resources/views/admin/airlines/show.blade.php
index 37a882cb..18b6474c 100644
--- a/resources/views/admin/airlines/show.blade.php
+++ b/resources/views/admin/airlines/show.blade.php
@@ -1,19 +1,19 @@
 @extends('admin.app')
 
 @section('content')
-    <section class="content-header">
-        <h1>
-            Airlines
-        </h1>
-    </section>
-    <div class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row" style="padding-left: 20px">
-                    @include('admin.airlines.show_fields')
-                    <a href="{{ route('admin.airlines.index') }}" class="btn btn-default">Back</a>
-                </div>
-            </div>
+  <section class="content-header">
+    <h1>
+      Airlines
+    </h1>
+  </section>
+  <div class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="row" style="padding-left: 20px">
+          @include('admin.airlines.show_fields')
+          <a href="{{ route('admin.airlines.index') }}" class="btn btn-default">Back</a>
         </div>
+      </div>
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/airlines/show_fields.blade.php b/resources/views/admin/airlines/show_fields.blade.php
index 70ec0f5c..6fac514f 100644
--- a/resources/views/admin/airlines/show_fields.blade.php
+++ b/resources/views/admin/airlines/show_fields.blade.php
@@ -1,40 +1,40 @@
 <!-- Code Field -->
 <div class="form-group">
-    {{ Form::label('icao', 'ICAO:') }}
-    <p>{{ $airlines->icao }}</p>
+  {{ Form::label('icao', 'ICAO:') }}
+  <p>{{ $airlines->icao }}</p>
 </div>
 
 <div class="form-group">
-    {{ Form::label('iata', 'IATA:') }}
-    <p>{{ $airlines->iata }}</p>
+  {{ Form::label('iata', 'IATA:') }}
+  <p>{{ $airlines->iata }}</p>
 </div>
 
 <!-- Name Field -->
 <div class="form-group">
-    {{ Form::label('name', 'Name:') }}
-    <p>{{ $airlines->name }}</p>
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $airlines->name }}</p>
 </div>
 
 <div class="form-group">
-    {{ Form::label('logo', 'Logo URL:') }}
-    <p>{{ $airlines->logo }}</p>
+  {{ Form::label('logo', 'Logo URL:') }}
+  <p>{{ $airlines->logo }}</p>
 </div>
 
 <!-- Active Field -->
 <div class="form-group">
-    {{ Form::label('active', 'Active:') }}
-    <p>{{ $airlines->active }}</p>
+  {{ Form::label('active', 'Active:') }}
+  <p>{{ $airlines->active }}</p>
 </div>
 
 <!-- Created At Field -->
 <div class="form-group">
-    {{ Form::label('created_at', 'Created At:') }}
-    <p>{{ show_datetime($airlines->created_at) }}</p>
+  {{ Form::label('created_at', 'Created At:') }}
+  <p>{{ show_datetime($airlines->created_at) }}</p>
 </div>
 
 <!-- Updated At Field -->
 <div class="form-group">
-    {{ Form::label('updated_at', 'Updated At:') }}
-    <p>{{ show_datetime($airlines->updated_at) }}</p>
+  {{ Form::label('updated_at', 'Updated At:') }}
+  <p>{{ show_datetime($airlines->updated_at) }}</p>
 </div>
 
diff --git a/resources/views/admin/airlines/table.blade.php b/resources/views/admin/airlines/table.blade.php
index 14c67839..45ecd7b4 100644
--- a/resources/views/admin/airlines/table.blade.php
+++ b/resources/views/admin/airlines/table.blade.php
@@ -1,36 +1,36 @@
 <table class="table table-hover table-responsive" id="airlines-table">
-    <thead>
-        <th>Code</th>
-        <th>Name</th>
-        <th class="text-center">Active</th>
-        <th></th>
-    </thead>
-    <tbody>
-    @foreach($airlines as $al)
-        <tr>
-            <td nowrap="true">
-                @if(filled($al->country))
-                    <span class="flag-icon flag-icon-{{ $al->country }}"></span>
-                    &nbsp;
-                @endif
-                <a href="{{ route('admin.airlines.edit', [$al->id]) }}">{{ $al->iata }}/{{ $al->icao }}</a>
-            </td>
-            <td>{{ $al->name }}</td>
-            <td class="text-center">
-                @if($al->active == 1)
-                    <span class="label label-success">Active</span>
-                @else
-                    <span class="label label-default">Inactive</span>
-                @endif
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.airlines.edit', [$al->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+  <thead>
+  <th>Code</th>
+  <th>Name</th>
+  <th class="text-center">Active</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach($airlines as $al)
+    <tr>
+      <td nowrap="true">
+        @if(filled($al->country))
+          <span class="flag-icon flag-icon-{{ $al->country }}"></span>
+          &nbsp;
+        @endif
+        <a href="{{ route('admin.airlines.edit', [$al->id]) }}">{{ $al->iata }}/{{ $al->icao }}</a>
+      </td>
+      <td>{{ $al->name }}</td>
+      <td class="text-center">
+        @if($al->active == 1)
+          <span class="label label-success">Active</span>
+        @else
+          <span class="label label-default">Inactive</span>
+        @endif
+      </td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.airlines.destroy', $al->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.airlines.edit', [$al->id]) }}"
+           class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/airports/create.blade.php b/resources/views/admin/airports/create.blade.php
index 97d656e5..82143637 100644
--- a/resources/views/admin/airports/create.blade.php
+++ b/resources/views/admin/airports/create.blade.php
@@ -2,12 +2,12 @@
 @section('title', 'Add Airport')
 
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-        {{ Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) }}
-        @include('admin.airports.fields')
-        {{ Form::close() }}
+      {{ Form::open(['route' => 'admin.airports.store', 'id' => 'airportForm']) }}
+      @include('admin.airports.fields')
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
 @endsection
 @include('admin.airports.script')
diff --git a/resources/views/admin/airports/edit.blade.php b/resources/views/admin/airports/edit.blade.php
index 43f1adfb..a9fa73e9 100644
--- a/resources/views/admin/airports/edit.blade.php
+++ b/resources/views/admin/airports/edit.blade.php
@@ -1,28 +1,28 @@
 @extends('admin.app')
 @section('title', "Edit \"$airport->name\"")
 @section('content')
-   <div class="card border-blue-bottom">
-      <div class="content">
-          {{ Form::model($airport, [
-               'route' => ['admin.airports.update', $airport->id],
-               'method' => 'patch',
-               'id' => 'airportForm'])
-          }}
-               @include('admin.airports.fields')
-          {{ Form::close() }}
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($airport, [
+           'route' => ['admin.airports.update', $airport->id],
+           'method' => 'patch',
+           'id' => 'airportForm'])
+      }}
+      @include('admin.airports.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-      <div class="content">
-         @include('admin.airports.expenses')
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.airports.expenses')
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-      <div class="content">
-         @include('admin.common.file_upload', ['model' => $airport])
-      </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.common.file_upload', ['model' => $airport])
+    </div>
+  </div>
 @endsection
 @include('admin.airports.script')
diff --git a/resources/views/admin/airports/expenses.blade.php b/resources/views/admin/airports/expenses.blade.php
index 0e8be5d2..bfa4ef5a 100644
--- a/resources/views/admin/airports/expenses.blade.php
+++ b/resources/views/admin/airports/expenses.blade.php
@@ -1,75 +1,75 @@
 <div id="airport-expenses-wrapper" class="col-12">
-    <div class="header">
-        <h3>expenses</h3>
-        @component('admin.components.info')
-        These expenses are only applied to this airport.
-        @endcomponent
-    </div>
-    <br/>
-    <table class="table table-responsive" id="airport-expenses">
-
-        @if(count($airport->expenses))
-        <thead>
-        <th>Name</th>
-        <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
-        <th>Type</th>
-        <th></th>
-        </thead>
-        @endif
-
-        <tbody>
-        @foreach($airport->expenses as $expense)
-            <tr>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="name">{{ $expense->name }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="amount">{{ $expense->amount }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a href="#"
-                           class="dropdown"
-                           data-pk="{{ $expense->id }}"
-                           data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
-                    </p>
-                </td>
-                <td align="right">
-                    {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'),
-                                'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
-                    {{ Form::hidden('expense_id', $expense->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
-                                     'class' => 'btn btn-sm btn-danger btn-icon',
-                                     'onclick' => "return confirm('Are you sure?')",
-                                     ]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'),
-                                'method' => 'post', 'class' => 'modify_expense form-inline']) }}
-                {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
-                {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
-                {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
-                {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
-                                 'class' => 'btn btn-success btn-small']) }}
-                {{ Form::close() }}
-
-                <p class="text-danger">{{ $errors->first('name') }}</p>
-                <p class="text-danger">{{ $errors->first('amount') }}</p>
-            </div>
-        </div>
+  <div class="header">
+    <h3>expenses</h3>
+    @component('admin.components.info')
+      These expenses are only applied to this airport.
+    @endcomponent
+  </div>
+  <br/>
+  <table class="table table-responsive" id="airport-expenses">
+
+    @if(count($airport->expenses))
+      <thead>
+      <th>Name</th>
+      <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
+      <th>Type</th>
+      <th></th>
+      </thead>
+    @endif
+
+    <tbody>
+    @foreach($airport->expenses as $expense)
+      <tr>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="name">{{ $expense->name }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="amount">{{ $expense->amount }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a href="#"
+               class="dropdown"
+               data-pk="{{ $expense->id }}"
+               data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
+          </p>
+        </td>
+        <td align="right">
+          {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'),
+                      'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
+          {{ Form::hidden('expense_id', $expense->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
+                           'class' => 'btn btn-sm btn-danger btn-icon',
+                           'onclick' => "return confirm('Are you sure?')",
+                           ]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="text-right">
+        {{ Form::open(['url' => url('/admin/airports/'.$airport->id.'/expenses'),
+                        'method' => 'post', 'class' => 'modify_expense form-inline']) }}
+        {{ Form::input('text', 'name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
+        {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
+        {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
+                         'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
+
+        <p class="text-danger">{{ $errors->first('name') }}</p>
+        <p class="text-danger">{{ $errors->first('amount') }}</p>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/airports/fields.blade.php b/resources/views/admin/airports/fields.blade.php
index 8134201b..a13aa181 100644
--- a/resources/views/admin/airports/fields.blade.php
+++ b/resources/views/admin/airports/fields.blade.php
@@ -1,101 +1,101 @@
 <div class="row">
-<div class="col-lg-12">
+  <div class="col-lg-12">
     <!-- Icao Field -->
     <div class="row">
-        <div class="form-group col-sm-6">
-            {{ Form::label('icao', 'ICAO:') }}&nbsp;<span class="required">*</span>
-            <a href="#" class="airport_data_lookup">Lookup</a>
-            {{ Form::text('icao', null, [
-                'id' => 'airport_icao', 'class' => 'form-control'
-                ]) }}
-            <p class="text-danger">{{ $errors->first('icao') }}</p>
-        </div>
+      <div class="form-group col-sm-6">
+        {{ Form::label('icao', 'ICAO:') }}&nbsp;<span class="required">*</span>
+        <a href="#" class="airport_data_lookup">Lookup</a>
+        {{ Form::text('icao', null, [
+            'id' => 'airport_icao', 'class' => 'form-control'
+            ]) }}
+        <p class="text-danger">{{ $errors->first('icao') }}</p>
+      </div>
 
-        <div class="form-group col-sm-6">
-            {{ 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-6">
+        {{ Form::label('iata', 'IATA:') }}
+        {{ Form::text('iata', null, ['class' => 'form-control']) }}
+        <p class="text-danger">{{ $errors->first('iata') }}</p>
+      </div>
 
     </div>
 
     <div class="row">
-        <div class="form-group col-sm-4">
-            {{ 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 class="form-group col-sm-4">
-            {{ Form::label('lat', 'Latitude:') }}&nbsp;<span class="required">*</span>
-            {{ Form::text('lat', null, ['class' => 'form-control', 'rv-value' => 'airport.lat']) }}
-            <p class="text-danger">{{ $errors->first('lat') }}</p>
-        </div>
+      <div class="form-group col-sm-4">
+        {{ 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 class="form-group col-sm-4">
+        {{ Form::label('lat', 'Latitude:') }}&nbsp;<span class="required">*</span>
+        {{ Form::text('lat', null, ['class' => 'form-control', 'rv-value' => 'airport.lat']) }}
+        <p class="text-danger">{{ $errors->first('lat') }}</p>
+      </div>
 
-        <div class="form-group col-sm-4">
-            {{ Form::label('lon', 'Longitude:') }}&nbsp;<span class="required">*</span>
-            {{ Form::text('lon', null, ['class' => 'form-control', 'rv-value' => 'airport.lon']) }}
-            <p class="text-danger">{{ $errors->first('lon') }}</p>
-        </div>
+      <div class="form-group col-sm-4">
+        {{ Form::label('lon', 'Longitude:') }}&nbsp;<span class="required">*</span>
+        {{ Form::text('lon', null, ['class' => 'form-control', 'rv-value' => 'airport.lon']) }}
+        <p class="text-danger">{{ $errors->first('lon') }}</p>
+      </div>
     </div>
 
     <div class="row">
 
-        <div class="form-group col-sm-4">
-            {{ Form::label('country', 'Country:') }}
-            {{ Form::text('country', null, ['class' => 'form-control']) }}
-            <p class="text-danger">{{ $errors->first('country') }}</p>
-        </div>
+      <div class="form-group col-sm-4">
+        {{ Form::label('country', 'Country:') }}
+        {{ Form::text('country', null, ['class' => 'form-control']) }}
+        <p class="text-danger">{{ $errors->first('country') }}</p>
+      </div>
 
-        <div class="form-group col-sm-4">
-            {{ Form::label('location', 'Location:') }}
-            {{ Form::text('location', null, ['class' => 'form-control']) }}
-            <p class="text-danger">{{ $errors->first('location') }}</p>
-        </div>
+      <div class="form-group col-sm-4">
+        {{ Form::label('location', 'Location:') }}
+        {{ Form::text('location', null, ['class' => 'form-control']) }}
+        <p class="text-danger">{{ $errors->first('location') }}</p>
+      </div>
 
-        <div class="form-group col-sm-4">
-            {{ Form::label('timezone', 'Timezone:') }}
-            {{ Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2']) }}
-            <p class="text-danger">{{ $errors->first('timezone') }}</p>
-        </div>
+      <div class="form-group col-sm-4">
+        {{ Form::label('timezone', 'Timezone:') }}
+        {{ Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2']) }}
+        <p class="text-danger">{{ $errors->first('timezone') }}</p>
+      </div>
     </div>
 
     <div class="row">
-        <div class="form-group col-sm-6">
-            {{ Form::label('ground_handling_cost', 'Ground Handling Cost:') }}
-            {{ Form::number('ground_handling_cost', null, ['class' => 'form-control', 'step' => '0.01']) }}
-            <p class="text-danger">{{ $errors->first('ground_handling_cost') }}</p>
+      <div class="form-group col-sm-6">
+        {{ Form::label('ground_handling_cost', 'Ground Handling Cost:') }}
+        {{ Form::number('ground_handling_cost', null, ['class' => 'form-control', 'step' => '0.01']) }}
+        <p class="text-danger">{{ $errors->first('ground_handling_cost') }}</p>
 
-            @component('admin.components.info')
-                This is the base rate per-flight. A multiplier for this rate can be
-                set in the subfleet, so you can modulate those costs from there.
-            @endcomponent
-        </div>
+        @component('admin.components.info')
+          This is the base rate per-flight. A multiplier for this rate can be
+          set in the subfleet, so you can modulate those costs from there.
+        @endcomponent
+      </div>
 
-        <div class="form-group col-md-6">
-            {{ Form::label('fuel_jeta_cost', 'Jet A Fuel Cost:') }}
-            {{ Form::number('fuel_jeta_cost', null, ['class' => 'form-control', 'step' => '0.01']) }}
-            <p class="text-danger">{{ $errors->first('fuel_jeta_cost') }}</p>
+      <div class="form-group col-md-6">
+        {{ Form::label('fuel_jeta_cost', 'Jet A Fuel Cost:') }}
+        {{ Form::number('fuel_jeta_cost', null, ['class' => 'form-control', 'step' => '0.01']) }}
+        <p class="text-danger">{{ $errors->first('fuel_jeta_cost') }}</p>
 
-            @component('admin.components.info')
-                This is the cost per {{ config('phpvms.internal_units.fuel') }}
-            @endcomponent
-        </div>
+        @component('admin.components.info')
+          This is the cost per {{ config('phpvms.internal_units.fuel') }}
+        @endcomponent
+      </div>
 
     </div>
 
     <div class="row">
-        <div class="form-group col-sm-4">
-            {{ Form::label('hub', 'Hub:') }}
-            {{ Form::hidden('hub', 0)  }}
-            {{ Form::checkbox('hub', null) }}
-        </div>
-        <!-- Submit Field -->
-        <div class="form-group col-sm-8">
-            <div class="text-right">
-                {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                <a href="{{ route('admin.airports.index') }}" class="btn btn-default">Cancel</a>
-            </div>
+      <div class="form-group col-sm-4">
+        {{ Form::label('hub', 'Hub:') }}
+        {{ Form::hidden('hub', 0)  }}
+        {{ Form::checkbox('hub', null) }}
+      </div>
+      <!-- Submit Field -->
+      <div class="form-group col-sm-8">
+        <div class="text-right">
+          {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+          <a href="{{ route('admin.airports.index') }}" class="btn btn-default">Cancel</a>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 </div>
diff --git a/resources/views/admin/airports/import.blade.php b/resources/views/admin/airports/import.blade.php
index c65c0737..2c6db419 100644
--- a/resources/views/admin/airports/import.blade.php
+++ b/resources/views/admin/airports/import.blade.php
@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Airports')
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.airports.import'])
+  @include('admin.common.import', ['route' => 'admin.airports.import'])
 @endsection
diff --git a/resources/views/admin/airports/index.blade.php b/resources/views/admin/airports/index.blade.php
index 23838f94..7c7f28a5 100644
--- a/resources/views/admin/airports/index.blade.php
+++ b/resources/views/admin/airports/index.blade.php
@@ -2,26 +2,26 @@
 @section('title', 'Airports')
 
 @section('actions')
-    <li><a href="{{ route('admin.airports.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <li><a href="{{ route('admin.airports.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    <li><a href="{{ route('admin.airports.create') }}"><i class="ti-plus"></i>Add New</a></li>
+  <li><a href="{{ route('admin.airports.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+  <li><a href="{{ route('admin.airports.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li><a href="{{ route('admin.airports.create') }}"><i class="ti-plus"></i>Add New</a></li>
 @endsection
 
 @section('content')
-    <div class="card">
-        @include('admin.airports.search')
-    </div>
+  <div class="card">
+    @include('admin.airports.search')
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-        @include('admin.airports.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.airports.table')
     </div>
+  </div>
 
-    <div class="row">
-        <div class="col-12 text-center">
-            {{ $airports->links('admin.pagination.default') }}
-        </div>
+  <div class="row">
+    <div class="col-12 text-center">
+      {{ $airports->links('admin.pagination.default') }}
     </div>
+  </div>
 @endsection
 @include('admin.airports.script')
diff --git a/resources/views/admin/airports/script.blade.php b/resources/views/admin/airports/script.blade.php
index 231a12a2..7a201fe6 100644
--- a/resources/views/admin/airports/script.blade.php
+++ b/resources/views/admin/airports/script.blade.php
@@ -1,126 +1,126 @@
 @section('scripts')
-<script>
-'use strict';
+  <script>
+    'use strict';
 
-function setEditable() {
-    const csrf_token = $('meta[name="csrf-token"]').attr('content');
-    const api_key = $('meta[name="api-key"]').attr('content');
+    function setEditable() {
+      const csrf_token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
 
-    @if(isset($airport))
-    $('#airport-expenses a.text').editable({
+      @if(isset($airport))
+      $('#airport-expenses a.text').editable({
         emptytext: '0',
         url: '{{ url('/admin/airports/'.$airport->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': csrf_token
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': csrf_token
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('#airport-expenses a.dropdown').editable({
+      $('#airport-expenses a.dropdown').editable({
         type: 'select',
         emptytext: '0',
         source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
         url: '{{ url('/admin/airports/'.$airport->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': csrf_token
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': csrf_token
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
-    @endif
-}
+      });
+      @endif
+    }
 
-$(document).ready(function() {
-    const api_key = $('meta[name="api-key"]').attr('content');
-    const csrf_token = $('meta[name="csrf-token"]').attr('content');
+    $(document).ready(function () {
+      const api_key = $('meta[name="api-key"]').attr('content');
+      const csrf_token = $('meta[name="csrf-token"]').attr('content');
 
-    setEditable();
+      setEditable();
 
-    $('#airports-table a.inline').editable({
+      $('#airports-table a.inline').editable({
         type: 'text',
         mode: 'inline',
         emptytext: '0',
         url: '{{ url('/admin/airports/fuel') }}',
         title: 'Enter price per unit of fuel',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': csrf_token
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': csrf_token
+          }
         },
-        params: function(params) {
-            return {
-                _method: 'put',
-                id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+        params: function (params) {
+          return {
+            _method: 'put',
+            id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('a.airport_data_lookup').click(async function(e) {
+      $('a.airport_data_lookup').click(async function (e) {
         e.preventDefault();
         const icao = $("input#airport_icao").val();
-        if(icao === '') {
-            return;
+        if (icao === '') {
+          return;
         }
 
         let response;
         try {
-            response = await phpvms.airport_lookup(icao);
+          response = await phpvms.airport_lookup(icao);
         } catch (e) {
-            console.log('Error looking up airport!', e);
-            return;
+          console.log('Error looking up airport!', e);
+          return;
         }
 
         _.forEach(response.data, function (value, key) {
-            if (key === 'city') {
-                key = 'location';
-            }
+          if (key === 'city') {
+            key = 'location';
+          }
 
-            $("#" + key).val(value);
+          $("#" + key).val(value);
 
-            if (key === 'tz') {
-                $("#timezone").val(value);
-                $("#timezone").trigger('change');
-            }
+          if (key === 'tz') {
+            $("#timezone").val(value);
+            $("#timezone").trigger('change');
+          }
         });
-    });
+      });
 
-    $(document).on('submit', 'form.modify_expense', function (event) {
+      $(document).on('submit', 'form.modify_expense', function (event) {
         event.preventDefault();
         console.log(event);
         $.pjax.submit(event, '#airport-expenses-wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function () {
+      $(document).on('pjax:complete', function () {
         initPlugins();
         setEditable();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/airports/search.blade.php b/resources/views/admin/airports/search.blade.php
index 54c0c235..1e9b73d2 100644
--- a/resources/views/admin/airports/search.blade.php
+++ b/resources/views/admin/airports/search.blade.php
@@ -1,15 +1,15 @@
 <div class="content">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="form-group">
-                {{ Form::open(['route' => 'admin.airports.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="form-group">
+        {{ Form::open(['route' => 'admin.airports.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
 
-                {{ Form::label('icao', 'ICAO:') }}
-                {{ Form::text('icao', null, ['class' => 'form-control']) }}
-                &nbsp;
-                <a href="{{ route('admin.airports.index') }}">clear</a>
-                {{ Form::close() }}
-            </div>
-        </div>
+        {{ Form::label('icao', 'ICAO:') }}
+        {{ Form::text('icao', null, ['class' => 'form-control']) }}
+        &nbsp;
+        <a href="{{ route('admin.airports.index') }}">clear</a>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/airports/show.blade.php b/resources/views/admin/airports/show.blade.php
index 9be675c5..e8fe9466 100644
--- a/resources/views/admin/airports/show.blade.php
+++ b/resources/views/admin/airports/show.blade.php
@@ -1,35 +1,36 @@
 @extends('admin.app')
 
 @section('content')
-<section class="content-header">
+  <section class="content-header">
     <h1 class="pull-left">{{ $airport->name }} - {{ $airport->location }}</h1>
     <h1 class="pull-right">
-        <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px" href="{{ route('admin.airports.edit', $airport->id) }}">Edit</a>
+      <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
+         href="{{ route('admin.airports.edit', $airport->id) }}">Edit</a>
     </h1>
-</section>
-<section class="content">
+  </section>
+  <section class="content">
     <div class="clearfix"></div>
     <div class="row">
-        @include('admin.airports.show_fields')
+      @include('admin.airports.show_fields')
     </div>
     <div class="box box-primary">
-        <div class="box-body">
-            <div class="row">
-                <div class="col-xs-12">
-                    <div class="box-body">
-                        <div id="map" style="width: 100%; height: 800px"></div>
-                    </div>
-                </div>
+      <div class="box-body">
+        <div class="row">
+          <div class="col-xs-12">
+            <div class="box-body">
+              <div id="map" style="width: 100%; height: 800px"></div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
-</section>
+  </section>
 @endsection
 @section('scripts')
-<script type="text/javascript">
-phpvms_render_airspace_map({
-    lat: {{ $airport->lat }},
-    lon: {{ $airport->lon }},
-});
-</script>
+  <script type="text/javascript">
+    phpvms_render_airspace_map({
+      lat: {{ $airport->lat }},
+      lon: {{ $airport->lon }},
+    });
+  </script>
 @endsection
diff --git a/resources/views/admin/airports/show_fields.blade.php b/resources/views/admin/airports/show_fields.blade.php
index 3a48f023..a63db40a 100644
--- a/resources/views/admin/airports/show_fields.blade.php
+++ b/resources/views/admin/airports/show_fields.blade.php
@@ -1,22 +1,21 @@
-
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            <h3 class="box-title">ICAO</h3>
-        </div>
-        <div class="box-body">
-            <p class="lead">{{ $airport->icao }}<strong></p>
-        </div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      <h3 class="box-title">ICAO</h3>
     </div>
+    <div class="box-body">
+      <p class="lead">{{ $airport->icao }}<strong></p>
+    </div>
+  </div>
 </div>
 
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            <h3 class="box-title">Coordinates</h3>
-        </div>
-        <div class="box-body">
-            <p class="lead">{{ $airport->lat}}/{{ $airport->lon }}</p>
-        </div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      <h3 class="box-title">Coordinates</h3>
     </div>
+    <div class="box-body">
+      <p class="lead">{{ $airport->lat}}/{{ $airport->lon }}</p>
+    </div>
+  </div>
 </div>
diff --git a/resources/views/admin/airports/table.blade.php b/resources/views/admin/airports/table.blade.php
index 41e19fec..76f71b9f 100644
--- a/resources/views/admin/airports/table.blade.php
+++ b/resources/views/admin/airports/table.blade.php
@@ -1,39 +1,41 @@
 <div id="airports_table_wrapper">
-    <table class="table table-hover table-responsive" id="airports-table">
-        <thead>
-            <th>ICAO</th>
-            <th>Name</th>
-            <th>Location</th>
-            <th>Hub</th>
-            <th style="text-align: center;">GH Cost</th>
-            <th style="text-align: center;">JetA</th>
-            <th></th>
-        </thead>
-        <tbody>
-        @foreach($airports as $airport)
-            <tr>
-                <td><a href="{{ route('admin.airports.edit', [$airport->id]) }}">{{ $airport->icao }}</a></td>
-                <td>{{ $airport->name }}</td>
-                <td>{{ $airport->location }}</td>
-                <td style="text-align: center;">
-                    @if($airport->hub === true)
-                        <span class="label label-success">Hub</span>
-                    @endif
-                </td>
-                <td style="text-align: center;">
-                    {{ $airport->ground_handling_cost }}
-                </td>
-                <td style="text-align: center;">
-                    <a class="inline" href="#" data-pk="{{ $airport->id }}" data-name="fuel_jeta_cost">{{ $airport->fuel_jeta_cost }}</a>
-                </td>
-                <td style="text-align: right;">
-                    {{ Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) }}
-                    <a href="{{ route('admin.airports.edit', [$airport->id]) }}" class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
+  <table class="table table-hover table-responsive" id="airports-table">
+    <thead>
+    <th>ICAO</th>
+    <th>Name</th>
+    <th>Location</th>
+    <th>Hub</th>
+    <th style="text-align: center;">GH Cost</th>
+    <th style="text-align: center;">JetA</th>
+    <th></th>
+    </thead>
+    <tbody>
+    @foreach($airports as $airport)
+      <tr>
+        <td><a href="{{ route('admin.airports.edit', [$airport->id]) }}">{{ $airport->icao }}</a></td>
+        <td>{{ $airport->name }}</td>
+        <td>{{ $airport->location }}</td>
+        <td style="text-align: center;">
+          @if($airport->hub === true)
+            <span class="label label-success">Hub</span>
+          @endif
+        </td>
+        <td style="text-align: center;">
+          {{ $airport->ground_handling_cost }}
+        </td>
+        <td style="text-align: center;">
+          <a class="inline" href="#" data-pk="{{ $airport->id }}"
+             data-name="fuel_jeta_cost">{{ $airport->fuel_jeta_cost }}</a>
+        </td>
+        <td style="text-align: right;">
+          {{ Form::open(['route' => ['admin.airports.destroy', $airport->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.airports.edit', [$airport->id]) }}" class='btn btn-sm btn-success btn-icon'><i
+              class="fas fa-pencil-alt"></i></a>
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
 </div>
diff --git a/resources/views/admin/awards/create.blade.php b/resources/views/admin/awards/create.blade.php
index 6879d717..258cd80c 100755
--- a/resources/views/admin/awards/create.blade.php
+++ b/resources/views/admin/awards/create.blade.php
@@ -1,12 +1,12 @@
 @extends('admin.app')
 @section('title', 'Add Award')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.awards.store']) }}
-            @include('admin.awards.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.awards.store']) }}
+      @include('admin.awards.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
 @include('admin.awards.scripts')
diff --git a/resources/views/admin/awards/edit.blade.php b/resources/views/admin/awards/edit.blade.php
index 733d54e6..6ecc1728 100755
--- a/resources/views/admin/awards/edit.blade.php
+++ b/resources/views/admin/awards/edit.blade.php
@@ -1,12 +1,12 @@
 @extends('admin.app')
 @section('title', "Edit \"$award->title\" Award")
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-       {{ Form::model($award, ['route' => ['admin.awards.update', $award->id], 'method' => 'patch']) }}
-            @include('admin.awards.fields')
-       {{ Form::close() }}
+      {{ Form::model($award, ['route' => ['admin.awards.update', $award->id], 'method' => 'patch']) }}
+      @include('admin.awards.fields')
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
 @endsection
 @include('admin.awards.scripts')
diff --git a/resources/views/admin/awards/fields.blade.php b/resources/views/admin/awards/fields.blade.php
index a4cda203..3a0edc99 100755
--- a/resources/views/admin/awards/fields.blade.php
+++ b/resources/views/admin/awards/fields.blade.php
@@ -1,78 +1,78 @@
 <div class="row">
-    <div class="col-sm-12">
-        @component('admin.components.info')
-            These are the awards that pilots can earn. Each award is assigned an
-            award class, which will be run whenever a pilot's stats are changed,
-            including after a PIREP is accepted.
-        @endcomponent
-    </div>
+  <div class="col-sm-12">
+    @component('admin.components.info')
+      These are the awards that pilots can earn. Each award is assigned an
+      award class, which will be run whenever a pilot's stats are changed,
+      including after a PIREP is accepted.
+    @endcomponent
+  </div>
 </div>
 <div class="row">
-    <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>
-            This will be the title of the award
-        </div>
-        {!! Form::text('name', null, ['class' => 'form-control']) !!}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
+  <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>
+      This will be the title of the award
     </div>
+    {!! 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('image', 'Image:') !!}
-        <div class="callout callout-info">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
-            This is the image of the award. Be creative!
-        </div>
-        {!! Form::text('image_url', null, [
-                'class' => 'form-control',
-                'placeholder' => 'Enter the url of the image location'
-            ]) !!}
-        <p class="text-danger">{{ $errors->first('image_url') }}</p>
+  <div class="form-group col-sm-6">
+    {!! Form::label('image', 'Image:') !!}
+    <div class="callout callout-info">
+      <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+      This is the image of the award. Be creative!
     </div>
+    {!! Form::text('image_url', null, [
+            'class' => 'form-control',
+            'placeholder' => 'Enter the url of the image location'
+        ]) !!}
+    <p class="text-danger">{{ $errors->first('image_url') }}</p>
+  </div>
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-6">
-        {!! Form::label('description', 'Description:') !!}&nbsp
-        <div class="callout callout-info">
-            <i class="icon fa fa-info">&nbsp;&nbsp;</i>
-            This is the description of the award.
-        </div>
-        {!! Form::textarea('description', null, ['class' => 'form-control']) !!}
-        <p class="text-danger">{{ $errors->first('description') }}</p>
+  <div class="form-group col-sm-6">
+    {!! Form::label('description', 'Description:') !!}&nbsp
+    <div class="callout callout-info">
+      <i class="icon fa fa-info">&nbsp;&nbsp;</i>
+      This is the description of the award.
+    </div>
+    {!! Form::textarea('description', null, ['class' => 'form-control']) !!}
+    <p class="text-danger">{{ $errors->first('description') }}</p>
+  </div>
+
+  <div class="form-group col-sm-6">
+    <div>
+      {{ Form::label('ref_model', 'Award Class:') }}
+      {{ Form::select('ref_model', $award_classes, null , [
+          'class' => 'form-control select2',
+          'id' => 'award_class_select',
+      ]) }}
+      <p class="text-danger">{{ $errors->first('ref_model') }}</p>
     </div>
 
-    <div class="form-group col-sm-6">
-        <div>
-            {{ Form::label('ref_model', 'Award Class:') }}
-            {{ Form::select('ref_model', $award_classes, null , [
-                'class' => 'form-control select2',
-                'id' => 'award_class_select',
-            ]) }}
-            <p class="text-danger">{{ $errors->first('ref_model') }}</p>
-        </div>
+    <div>
+      {{ Form::label('ref_model_params', 'Award Class parameters') }}
+      {{ Form::text('ref_model_params', null, ['class' => 'form-control']) }}
+      <p class="text-danger">{{ $errors->first('ref_model_params') }}</p>
 
-        <div>
-            {{ Form::label('ref_model_params', 'Award Class parameters') }}
-            {{ Form::text('ref_model_params', null, ['class' => 'form-control']) }}
-            <p class="text-danger">{{ $errors->first('ref_model_params') }}</p>
-
-            <p id="ref_model_param_description">
-
-            </p>
-        </div>
+      <p id="ref_model_param_description">
 
+      </p>
     </div>
+
+  </div>
 </div>
 
 <div class="row">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
-            <a href="{!! route('admin.awards.index') !!}" class="btn btn-warn">Cancel</a>
-        </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {!! Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) !!}
+      <a href="{!! route('admin.awards.index') !!}" class="btn btn-warn">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/awards/index.blade.php b/resources/views/admin/awards/index.blade.php
index 2afaa32c..1c9d9aed 100755
--- a/resources/views/admin/awards/index.blade.php
+++ b/resources/views/admin/awards/index.blade.php
@@ -2,17 +2,17 @@
 
 @section('title', 'Awards')
 @section('actions')
-    <li>
-        <a href="{!! route('admin.awards.create') !!}">
-            <i class="ti-plus"></i>
-            Add New
-        </a>
-    </li>
+  <li>
+    <a href="{!! route('admin.awards.create') !!}">
+      <i class="ti-plus"></i>
+      Add New
+    </a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card">
-        @include('admin.awards.table')
-    </div>
+  <div class="card">
+    @include('admin.awards.table')
+  </div>
 @endsection
 
diff --git a/resources/views/admin/awards/scripts.blade.php b/resources/views/admin/awards/scripts.blade.php
index 36361f42..f7198a94 100644
--- a/resources/views/admin/awards/scripts.blade.php
+++ b/resources/views/admin/awards/scripts.blade.php
@@ -1,30 +1,30 @@
 @section('scripts')
-<script>
-@if(isset($award_descriptions))
+  <script>
+      @if(isset($award_descriptions))
     const award_descriptions = {!! json_encode($award_descriptions) !!};
-@else
+      @else
     const award_descriptions = {};
-@endif
+      @endif
 
-const changeParamDescription = (award_class) => {
-    const descrip = award_descriptions[award_class];
-    console.log('Found description: ', descrip);
-    $("p#ref_model_param_description").text(descrip);
-};
+    const changeParamDescription = (award_class) => {
+        const descrip = award_descriptions[award_class];
+        console.log('Found description: ', descrip);
+        $("p#ref_model_param_description").text(descrip);
+      };
 
-$(document).ready(() => {
-    const select_id = "select#award_class_select";
-    console.log('award descriptions', award_descriptions);
-    $(select_id).change((e) => {
+    $(document).ready(() => {
+      const select_id = "select#award_class_select";
+      console.log('award descriptions', award_descriptions);
+      $(select_id).change((e) => {
         const award_class = $(select_id + " option:selected").val();
         console.log('award class selected: ', award_class);
         changeParamDescription(award_class);
-    });
+      });
 
-    // on load
-    const award_class = $(select_id + " option:selected").val();
-    changeParamDescription(award_class);
-});
-</script>
+      // on load
+      const award_class = $(select_id + " option:selected").val();
+      changeParamDescription(award_class);
+    });
+  </script>
 
 @endsection
diff --git a/resources/views/admin/awards/table.blade.php b/resources/views/admin/awards/table.blade.php
index 3bc0bcc4..fe9cf6cc 100755
--- a/resources/views/admin/awards/table.blade.php
+++ b/resources/views/admin/awards/table.blade.php
@@ -1,40 +1,40 @@
 <table class="table table-hover table-responsive" id="awards-table">
-    <thead>
-        <th>Name</th>
-        <th>Description</th>
-        <th>Image</th>
-        <th class="text-right">Action</th>
-    </thead>
-    <tbody>
-    @foreach($awards as $award)
-        <tr>
-            <td>
-                <a href="{{ route('admin.awards.edit', [$award->id]) }}">
-                    {{ $award->name }}</a>
-            </td>
-            <td>{{ $award->description }}</td>
-            <td>
+  <thead>
+  <th>Name</th>
+  <th>Description</th>
+  <th>Image</th>
+  <th class="text-right">Action</th>
+  </thead>
+  <tbody>
+  @foreach($awards as $award)
+    <tr>
+      <td>
+        <a href="{{ route('admin.awards.edit', [$award->id]) }}">
+          {{ $award->name }}</a>
+      </td>
+      <td>{{ $award->description }}</td>
+      <td>
 
-                @if($award->image)
-                    <img src="{{ $award->image }}" name="{{ $award->name }}" alt="No Image Available" />
-                @else
-                    -
-                @endif
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
+        @if($award->image)
+          <img src="{{ $award->image }}" name="{{ $award->name }}" alt="No Image Available"/>
+        @else
+          -
+        @endif
+      </td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.awards.destroy', $award->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.awards.edit', [$award->id]) }}" class='btn btn-sm btn-success btn-icon'>
+          <i class="fas fa-pencil-alt"></i></a>
 
-                {{ Form::button('<i class="fa fa-times"></i>', [
-                        'type' => 'submit',
-                        'class' => 'btn btn-sm btn-danger btn-icon',
-                        'onclick' => "return confirm('Are you sure you want to delete this award?')"
-                ]) }}
+        {{ Form::button('<i class="fa fa-times"></i>', [
+                'type' => 'submit',
+                'class' => 'btn btn-sm btn-danger btn-icon',
+                'onclick' => "return confirm('Are you sure you want to delete this award?')"
+        ]) }}
 
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/common/file_upload.blade.php b/resources/views/admin/common/file_upload.blade.php
index 2455f643..020faa93 100644
--- a/resources/views/admin/common/file_upload.blade.php
+++ b/resources/views/admin/common/file_upload.blade.php
@@ -6,87 +6,87 @@ Pass in:
 
 --}}
 <div id="airport-files-wrapper" class="col-12">
-    <div class="header">
-        <h3>files</h3>
-        @component('admin.components.info')
-            Add a download link or upload a file to make available
-        @endcomponent
-    </div>
+  <div class="header">
+    <h3>files</h3>
+    @component('admin.components.info')
+      Add a download link or upload a file to make available
+    @endcomponent
+  </div>
 
-    @if(count($model->files) === 0)
-        @include('admin.common.none_added', ['type' => 'files'])
+  @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))
+      <thead>
+      <tr>
+        <td>Name</td>
+        <td>Direct Link</td>
+        <td>Downloads</td>
+        <td class="text-right"></td>
+      </tr>
+      </thead>
     @endif
+    <tbody>
+    @foreach($model->files as $file)
+      <tr>
+        <td>{{ $file->name }}</td>
+        <td><a href="{{ $file->url }}" target="_blank">Link to file</a></td>
+        <td>{{$file->download_count}}</td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.files.delete', $file->id], 'method' => 'delete']) }}
+          {{ Form::hidden('id', $file->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>', [
+                'type' => 'submit',
+                'class' => 'btn btn-sm btn-danger btn-icon',
+                'onclick' => "return confirm('Are you sure?')"])
+          }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="text-right">
+        {{ Form::open([
+            'url' => route('admin.files.store'),
+            'method' => 'POST',
+            'class' => 'form-inline',
+            'files' => true
+           ])
+        }}
 
-    {{-- Show all the files here --}}
-    <table class="table table-hover table-responsive">
-        @if(count($model->files))
-        <thead>
-            <tr>
-                <td>Name</td>
-                <td>Direct Link</td>
-                <td>Downloads</td>
-                <td class="text-right"></td>
-            </tr>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($model->files as $file)
-            <tr>
-                <td>{{ $file->name }}</td>
-                <td><a href="{{ $file->url }}" target="_blank">Link to file</a></td>
-                <td>{{$file->download_count}}</td>
-                <td class="text-right">
-                    {{ Form::open(['route' => ['admin.files.delete', $file->id], 'method' => 'delete']) }}
-                    {{ Form::hidden('id', $file->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>', [
-                          'type' => 'submit',
-                          'class' => 'btn btn-sm btn-danger btn-icon',
-                          'onclick' => "return confirm('Are you sure?')"])
-                    }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                {{ Form::open([
-                    'url' => route('admin.files.store'),
-                    'method' => 'POST',
-                    'class' => 'form-inline',
-                    'files' => true
-                   ])
-                }}
+        {{ Form::token() }}
 
-                {{ Form::token() }}
+        <span class="required">*</span>
+        {{ Form::text('file_name', null, ['class' => 'form-control', 'placeholder' => 'Name']) }}
+        {{ Form::text('file_description', null, ['class' => 'form-control', 'placeholder' => 'Description']) }}
+        {{ Form::text('url', null, ['class' => 'form-control', 'placeholder' => 'URL']) }}
+        {{ Form::file('file', ['class' => 'form-control']) }}
 
-                <span class="required">*</span>
-                {{ Form::text('file_name', null, ['class' => 'form-control', 'placeholder' => 'Name']) }}
-                {{ Form::text('file_description', null, ['class' => 'form-control', 'placeholder' => 'Description']) }}
-                {{ Form::text('url', null, ['class' => 'form-control', 'placeholder' => 'URL']) }}
-                {{ Form::file('file', ['class' => 'form-control']) }}
+        {{-- Fields for the model --}}
+        {{ Form::hidden('ref_model', get_class($model)) }}
+        {{ Form::hidden('ref_model_id', $model->id) }}
 
-                {{-- Fields for the model --}}
-                {{ Form::hidden('ref_model', get_class($model)) }}
-                {{ Form::hidden('ref_model_id', $model->id) }}
-
-                {{ Form::submit('Save', [
-                    'id'    => 'save_file_upload',
-                    'class' => 'btn btn-success'
-                   ])
-                }}
-                <div class="text-danger" style="padding-top: 10px;">
-                    <span>{{ $errors->first('filename') }}</span>
-                    <span>{{ $errors->first('url') }}</span>
-                    <span>{{ $errors->first('file') }}</span>
-                </div>
-
-                {{ Form::close() }}
-            </div>
+        {{ Form::submit('Save', [
+            'id'    => 'save_file_upload',
+            'class' => 'btn btn-success'
+           ])
+        }}
+        <div class="text-danger" style="padding-top: 10px;">
+          <span>{{ $errors->first('filename') }}</span>
+          <span>{{ $errors->first('url') }}</span>
+          <span>{{ $errors->first('file') }}</span>
         </div>
+
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 
 </div>
diff --git a/resources/views/admin/common/import.blade.php b/resources/views/admin/common/import.blade.php
index a27158e9..c58f9dc8 100644
--- a/resources/views/admin/common/import.blade.php
+++ b/resources/views/admin/common/import.blade.php
@@ -1,37 +1,37 @@
 <div class="card border-blue-bottom">
-    <div class="content">
-        <div class="row">
+  <div class="content">
+    <div class="row">
 
-            {{ Form::open(['method' => 'post', 'route' => $route, 'files' => true]) }}
-            <div class="form-group col-12">
-                {{ Form::label('csv_file', 'Choose a CSV file to import') }}
-                {{ Form::file('csv_file', ['accept' => '.csv']) }}
-                <p class="text-danger">{{ $errors->first('csv_file') }}</p>
-            </div>
+      {{ Form::open(['method' => 'post', 'route' => $route, 'files' => true]) }}
+      <div class="form-group col-12">
+        {{ Form::label('csv_file', 'Choose a CSV file to import') }}
+        {{ Form::file('csv_file', ['accept' => '.csv']) }}
+        <p class="text-danger">{{ $errors->first('csv_file') }}</p>
+      </div>
 
-            <div class="form-group col-md-12">
-                <div class="text-right">
-                    {{ Form::button('Start Import', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                </div>
-            </div>
-
-            {{ Form::close() }}
-
-            <div class="form-group col-md-12">
-                @if($logs['success'])
-                    <h4>Logs</h4>
-                    @foreach($logs['success'] as $line)
-                        <p>{{ $line }}</p>
-                    @endforeach
-                @endif
-
-                @if($logs['errors'])
-                    <h4>Errors</h4>
-                    @foreach($logs['errors'] as $line)
-                        <p>{{ $line }}</p>
-                    @endforeach
-                @endif
-            </div>
+      <div class="form-group col-md-12">
+        <div class="text-right">
+          {{ Form::button('Start Import', ['type' => 'submit', 'class' => 'btn btn-success']) }}
         </div>
+      </div>
+
+      {{ Form::close() }}
+
+      <div class="form-group col-md-12">
+        @if($logs['success'])
+          <h4>Logs</h4>
+          @foreach($logs['success'] as $line)
+            <p>{{ $line }}</p>
+          @endforeach
+        @endif
+
+        @if($logs['errors'])
+          <h4>Errors</h4>
+          @foreach($logs['errors'] as $line)
+            <p>{{ $line }}</p>
+          @endforeach
+        @endif
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/common/none_added.blade.php b/resources/views/admin/common/none_added.blade.php
index 1833f9d3..7f52a03e 100644
--- a/resources/views/admin/common/none_added.blade.php
+++ b/resources/views/admin/common/none_added.blade.php
@@ -1,5 +1,5 @@
 <div class="jumbotron">
-    <p class="text-center">
-        No {{ $type }} have been added
-    </p>
+  <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 a7f192c7..c2d022e1 100644
--- a/resources/views/admin/components/info.blade.php
+++ b/resources/views/admin/components/info.blade.php
@@ -1,10 +1,10 @@
 <div>
-    <p style="float:left; margin-right: 10px; margin-left: 2px;">
+  <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" style="text-transform:none;">
-        {{ $slot }}
-    </p>
+  </p>
+  <p class="category" style="text-transform:none;">
+    {{ $slot }}
+  </p>
 </div>
diff --git a/resources/views/admin/components/infobox.blade.php b/resources/views/admin/components/infobox.blade.php
index e37fb364..55f31686 100644
--- a/resources/views/admin/components/infobox.blade.php
+++ b/resources/views/admin/components/infobox.blade.php
@@ -1,32 +1,32 @@
 <div class="card border-blue-bottom">
-    <div class="content">
-        <div class="row">
-            <div class="col-xs-5">
-                <div class="icon-big icon-info text-center">
-                    <i class="{{$icon}}"></i>
-                </div>
-            </div>
-            <div class="col-xs-7">
-                <div class="numbers">
-                    <p>{{$type}}</p>
-                    @if(isset($link))
-                        <a href="{{ $link }}">
-                    @endif
-                        {{$pending}} pending
-                    @if(isset($link))
-                        </a>
-                    @endif
-                </div>
-            </div>
+  <div class="content">
+    <div class="row">
+      <div class="col-xs-5">
+        <div class="icon-big icon-info text-center">
+          <i class="{{$icon}}"></i>
         </div>
-        <div class="footer">
-            <hr>
-            @if(isset($total))
-                <div class="stats">
-                    <i class="ti-medall"></i> {{$total}} total
-                </div>
-            @endif
+      </div>
+      <div class="col-xs-7">
+        <div class="numbers">
+          <p>{{$type}}</p>
+          @if(isset($link))
+            <a href="{{ $link }}">
+              @endif
+              {{$pending}} pending
+              @if(isset($link))
+            </a>
+          @endif
         </div>
+      </div>
     </div>
+    <div class="footer">
+      <hr>
+      @if(isset($total))
+        <div class="stats">
+          <i class="ti-medall"></i> {{$total}} total
+        </div>
+      @endif
+    </div>
+  </div>
 
 </div>
diff --git a/resources/views/admin/dashboard/news.blade.php b/resources/views/admin/dashboard/news.blade.php
index df6e3b0a..14ac241a 100644
--- a/resources/views/admin/dashboard/news.blade.php
+++ b/resources/views/admin/dashboard/news.blade.php
@@ -1,66 +1,66 @@
 <div id="pjax_news_wrapper">
-    <div class="card border-blue-bottom">
-        @if($news->count() === 0)
-            <div class="text-center text-muted" style="padding: 30px;">
-                no news items
-            </div>
-        @endif
-        @foreach($news as $item)
-        <div class="content">
-            <div class="header">
-                <h4 class="title">{{ $item->subject }}</h4>
-                <p class="category">{{ $item->user->name }} - {{ show_datetime($item->created_at) }}</p>
-            </div>
-
-            {{ $item->body }}
-
-            <div class="text-right">
-                {{ Form::open(['route' => 'admin.dashboard.news',
-                'method' => 'delete',
-                'class' => 'pjax_news_form',
-            ]) }}
-                {{ Form::hidden('news_id', $item->id) }}
-                {{
-                     Form::button('<i class="far fa-trash-alt"></i>&nbsp;delete',
-                                     ['type' => 'submit',
-                                      'class' => ' btn btn-danger btn-xs text-small',
-                                      'onclick' => "return confirm('Are you sure?')"
-                                      ])
-
-                     }}
-                {{ Form::close() }}
-            </div>
+  <div class="card border-blue-bottom">
+    @if($news->count() === 0)
+      <div class="text-center text-muted" style="padding: 30px;">
+        no news items
+      </div>
+    @endif
+    @foreach($news as $item)
+      <div class="content">
+        <div class="header">
+          <h4 class="title">{{ $item->subject }}</h4>
+          <p class="category">{{ $item->user->name }} - {{ show_datetime($item->created_at) }}</p>
         </div>
-        <hr />
-        @endforeach
-        <div class="content">
-            <div class="header">
-                <h4 class="title">Add News</h4>
-            </div>
-            {{ Form::open(['route' => 'admin.dashboard.news',
-                'method' => 'post',
-                'class' => 'pjax_news_form',
-            ]) }}
-            <table class="table">
-                <tr>
-                    <td>{{ Form::label('subject', 'Subject:') }}</td>
-                    <td>{{ Form::text('subject', '', ['class' => 'form-control'])  }}</td>
-                </tr>
 
-                <tr>
-                    <td>{{ Form::label('body', 'Body:') }}</td>
-                    <td>{{ Form::textarea('body', '', ['class' => 'form-control']) }}</td>
-                </tr>
-            </table>
-            <div class="text-right">
-                {{
-                 Form::button('<i class="fas fa-plus-circle"></i>&nbsp;add',
-                                 ['type' => 'submit',
-                                  'class' => 'btn btn-success btn-s'])
+        {{ $item->body }}
 
-                 }}
-                {{ Form::close() }}
-            </div>
+        <div class="text-right">
+          {{ Form::open(['route' => 'admin.dashboard.news',
+          'method' => 'delete',
+          'class' => 'pjax_news_form',
+      ]) }}
+          {{ Form::hidden('news_id', $item->id) }}
+          {{
+               Form::button('<i class="far fa-trash-alt"></i>&nbsp;delete',
+                               ['type' => 'submit',
+                                'class' => ' btn btn-danger btn-xs text-small',
+                                'onclick' => "return confirm('Are you sure?')"
+                                ])
+
+               }}
+          {{ Form::close() }}
         </div>
+      </div>
+      <hr/>
+    @endforeach
+    <div class="content">
+      <div class="header">
+        <h4 class="title">Add News</h4>
+      </div>
+      {{ Form::open(['route' => 'admin.dashboard.news',
+          'method' => 'post',
+          'class' => 'pjax_news_form',
+      ]) }}
+      <table class="table">
+        <tr>
+          <td>{{ Form::label('subject', 'Subject:') }}</td>
+          <td>{{ Form::text('subject', '', ['class' => 'form-control'])  }}</td>
+        </tr>
+
+        <tr>
+          <td>{{ Form::label('body', 'Body:') }}</td>
+          <td>{{ Form::textarea('body', '', ['class' => 'form-control']) }}</td>
+        </tr>
+      </table>
+      <div class="text-right">
+        {{
+         Form::button('<i class="fas fa-plus-circle"></i>&nbsp;add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-s'])
+
+         }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/dashboard/pirep_chart.blade.php b/resources/views/admin/dashboard/pirep_chart.blade.php
index a8288a5a..6c149b7b 100644
--- a/resources/views/admin/dashboard/pirep_chart.blade.php
+++ b/resources/views/admin/dashboard/pirep_chart.blade.php
@@ -1,20 +1,105 @@
 <div class="card">
-    <div class="header">
-        <h4 class="title">PIREPs Submitted</h4>
-        <p class="category">24 Hours performance</p>
+  <div class="header">
+    <h4 class="title">PIREPs Submitted</h4>
+    <p class="category">24 Hours performance</p>
+  </div>
+  <div class="content">
+    <div id="chartHours" class="ct-chart">
+      <svg xmlns:ct="http://gionkunz.github.com/chartist-js/ct" width="100%" height="245px" class="ct-chart-line"
+           style="width: 100%; height: 245px;">
+        <g class="ct-grids">
+          <line y1="210" y2="210" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+          <line y1="171" y2="171" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+          <line y1="132" y2="132" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+          <line y1="93" y2="93" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+          <line y1="54" y2="54" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+          <line y1="15" y2="15" x1="50" x2="1187" class="ct-grid ct-vertical"></line>
+        </g>
+        <g>
+          <g class="ct-series ct-series-a">
+            <path
+              d="M50,210L50,154.035C97.375,154.035,144.75,134.925,192.125,134.925C239.5,134.925,286.875,114.45,334.25,114.45C381.625,114.45,429,100.41,476.375,100.41C523.75,100.41,571.125,94.17,618.5,94.17C665.875,94.17,713.25,87.93,760.625,87.93C808,87.93,855.375,73.89,902.75,73.89C950.125,73.89,997.5,35.475,1044.875,35.475C1092.25,35.475,1139.625,24.36,1187,24.36L1187,210Z"
+              class="ct-area"
+              values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path>
+            <path
+              d="M50,154.035C97.375,154.035,144.75,134.925,192.125,134.925C239.5,134.925,286.875,114.45,334.25,114.45C381.625,114.45,429,100.41,476.375,100.41C523.75,100.41,571.125,94.17,618.5,94.17C665.875,94.17,713.25,87.93,760.625,87.93C808,87.93,855.375,73.89,902.75,73.89C950.125,73.89,997.5,35.475,1044.875,35.475C1092.25,35.475,1139.625,24.36,1187,24.36"
+              class="ct-line"></path>
+          </g>
+          <g class="ct-series ct-series-b">
+            <path
+              d="M50,210L50,196.935C97.375,196.935,144.75,180.36,192.125,180.36C239.5,180.36,286.875,172.365,334.25,172.365C381.625,172.365,429,163.2,476.375,163.2C523.75,163.2,571.125,134.535,618.5,134.535C665.875,134.535,713.25,125.175,760.625,125.175C808,125.175,855.375,105.675,902.75,105.675C950.125,105.675,997.5,84.81,1044.875,84.81C1092.25,84.81,1139.625,64.92,1187,64.92L1187,210Z"
+              class="ct-area"
+              values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path>
+            <path
+              d="M50,196.935C97.375,196.935,144.75,180.36,192.125,180.36C239.5,180.36,286.875,172.365,334.25,172.365C381.625,172.365,429,163.2,476.375,163.2C523.75,163.2,571.125,134.535,618.5,134.535C665.875,134.535,713.25,125.175,760.625,125.175C808,125.175,855.375,105.675,902.75,105.675C950.125,105.675,997.5,84.81,1044.875,84.81C1092.25,84.81,1139.625,64.92,1187,64.92"
+              class="ct-line"></path>
+          </g>
+          <g class="ct-series ct-series-c">
+            <path
+              d="M50,210L50,205.515C97.375,205.515,144.75,187.965,192.125,187.965C239.5,187.965,286.875,196.935,334.25,196.935C381.625,196.935,429,188.94,476.375,188.94C523.75,188.94,571.125,172.95,618.5,172.95C665.875,172.95,713.25,163.395,760.625,163.395C808,163.395,855.375,150.135,902.75,150.135C950.125,150.135,997.5,130.05,1044.875,130.05C1092.25,130.05,1139.625,130.05,1187,130.05L1187,210Z"
+              class="ct-area"
+              values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path>
+            <path
+              d="M50,205.515C97.375,205.515,144.75,187.965,192.125,187.965C239.5,187.965,286.875,196.935,334.25,196.935C381.625,196.935,429,188.94,476.375,188.94C523.75,188.94,571.125,172.95,618.5,172.95C665.875,172.95,713.25,163.395,760.625,163.395C808,163.395,855.375,150.135,902.75,150.135C950.125,150.135,997.5,130.05,1044.875,130.05C1092.25,130.05,1139.625,130.05,1187,130.05"
+              class="ct-line"></path>
+          </g>
+        </g>
+        <g class="ct-labels">
+          <foreignObject style="overflow: visible;" x="50" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">9:00AM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="192.125" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">12:00AM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="334.25" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">3:00PM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="476.375" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">6:00PM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="618.5" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">9:00PM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="760.625" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">12:00PM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="902.75" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">3:00AM</span></foreignObject>
+          <foreignObject style="overflow: visible;" x="1044.875" y="215" width="142.125" height="20"><span
+              class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px"
+              xmlns="http://www.w3.org/1999/xhtml">6:00AM</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="171" x="10" height="39" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">0</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="132" x="10" height="39" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">200</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="93" x="10" height="39" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">400</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="54" x="10" height="39" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">600</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="15" x="10" height="39" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">800</span></foreignObject>
+          <foreignObject style="overflow: visible;" y="-15" x="10" height="30" width="30"><span
+              class="ct-label ct-vertical ct-start" style="height: 30px; width: 30px"
+              xmlns="http://www.w3.org/1999/xhtml">1000</span></foreignObject>
+        </g>
+      </svg>
     </div>
-    <div class="content">
-        <div id="chartHours" class="ct-chart"><svg xmlns:ct="http://gionkunz.github.com/chartist-js/ct" width="100%" height="245px" class="ct-chart-line" style="width: 100%; height: 245px;"><g class="ct-grids"><line y1="210" y2="210" x1="50" x2="1187" class="ct-grid ct-vertical"></line><line y1="171" y2="171" x1="50" x2="1187" class="ct-grid ct-vertical"></line><line y1="132" y2="132" x1="50" x2="1187" class="ct-grid ct-vertical"></line><line y1="93" y2="93" x1="50" x2="1187" class="ct-grid ct-vertical"></line><line y1="54" y2="54" x1="50" x2="1187" class="ct-grid ct-vertical"></line><line y1="15" y2="15" x1="50" x2="1187" class="ct-grid ct-vertical"></line></g><g><g class="ct-series ct-series-a"><path d="M50,210L50,154.035C97.375,154.035,144.75,134.925,192.125,134.925C239.5,134.925,286.875,114.45,334.25,114.45C381.625,114.45,429,100.41,476.375,100.41C523.75,100.41,571.125,94.17,618.5,94.17C665.875,94.17,713.25,87.93,760.625,87.93C808,87.93,855.375,73.89,902.75,73.89C950.125,73.89,997.5,35.475,1044.875,35.475C1092.25,35.475,1139.625,24.36,1187,24.36L1187,210Z" class="ct-area" values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path><path d="M50,154.035C97.375,154.035,144.75,134.925,192.125,134.925C239.5,134.925,286.875,114.45,334.25,114.45C381.625,114.45,429,100.41,476.375,100.41C523.75,100.41,571.125,94.17,618.5,94.17C665.875,94.17,713.25,87.93,760.625,87.93C808,87.93,855.375,73.89,902.75,73.89C950.125,73.89,997.5,35.475,1044.875,35.475C1092.25,35.475,1139.625,24.36,1187,24.36" class="ct-line"></path></g><g class="ct-series ct-series-b"><path d="M50,210L50,196.935C97.375,196.935,144.75,180.36,192.125,180.36C239.5,180.36,286.875,172.365,334.25,172.365C381.625,172.365,429,163.2,476.375,163.2C523.75,163.2,571.125,134.535,618.5,134.535C665.875,134.535,713.25,125.175,760.625,125.175C808,125.175,855.375,105.675,902.75,105.675C950.125,105.675,997.5,84.81,1044.875,84.81C1092.25,84.81,1139.625,64.92,1187,64.92L1187,210Z" class="ct-area" values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path><path d="M50,196.935C97.375,196.935,144.75,180.36,192.125,180.36C239.5,180.36,286.875,172.365,334.25,172.365C381.625,172.365,429,163.2,476.375,163.2C523.75,163.2,571.125,134.535,618.5,134.535C665.875,134.535,713.25,125.175,760.625,125.175C808,125.175,855.375,105.675,902.75,105.675C950.125,105.675,997.5,84.81,1044.875,84.81C1092.25,84.81,1139.625,64.92,1187,64.92" class="ct-line"></path></g><g class="ct-series ct-series-c"><path d="M50,210L50,205.515C97.375,205.515,144.75,187.965,192.125,187.965C239.5,187.965,286.875,196.935,334.25,196.935C381.625,196.935,429,188.94,476.375,188.94C523.75,188.94,571.125,172.95,618.5,172.95C665.875,172.95,713.25,163.395,760.625,163.395C808,163.395,855.375,150.135,902.75,150.135C950.125,150.135,997.5,130.05,1044.875,130.05C1092.25,130.05,1139.625,130.05,1187,130.05L1187,210Z" class="ct-area" values="[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object],[object Object]"></path><path d="M50,205.515C97.375,205.515,144.75,187.965,192.125,187.965C239.5,187.965,286.875,196.935,334.25,196.935C381.625,196.935,429,188.94,476.375,188.94C523.75,188.94,571.125,172.95,618.5,172.95C665.875,172.95,713.25,163.395,760.625,163.395C808,163.395,855.375,150.135,902.75,150.135C950.125,150.135,997.5,130.05,1044.875,130.05C1092.25,130.05,1139.625,130.05,1187,130.05" class="ct-line"></path></g></g><g class="ct-labels"><foreignObject style="overflow: visible;" x="50" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">9:00AM</span></foreignObject><foreignObject style="overflow: visible;" x="192.125" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">12:00AM</span></foreignObject><foreignObject style="overflow: visible;" x="334.25" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">3:00PM</span></foreignObject><foreignObject style="overflow: visible;" x="476.375" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">6:00PM</span></foreignObject><foreignObject style="overflow: visible;" x="618.5" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">9:00PM</span></foreignObject><foreignObject style="overflow: visible;" x="760.625" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">12:00PM</span></foreignObject><foreignObject style="overflow: visible;" x="902.75" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">3:00AM</span></foreignObject><foreignObject style="overflow: visible;" x="1044.875" y="215" width="142.125" height="20"><span class="ct-label ct-horizontal ct-end" style="width: 142px; height: 20px" xmlns="http://www.w3.org/1999/xhtml">6:00AM</span></foreignObject><foreignObject style="overflow: visible;" y="171" x="10" height="39" width="30"><span class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">0</span></foreignObject><foreignObject style="overflow: visible;" y="132" x="10" height="39" width="30"><span class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">200</span></foreignObject><foreignObject style="overflow: visible;" y="93" x="10" height="39" width="30"><span class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">400</span></foreignObject><foreignObject style="overflow: visible;" y="54" x="10" height="39" width="30"><span class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">600</span></foreignObject><foreignObject style="overflow: visible;" y="15" x="10" height="39" width="30"><span class="ct-label ct-vertical ct-start" style="height: 39px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">800</span></foreignObject><foreignObject style="overflow: visible;" y="-15" x="10" height="30" width="30"><span class="ct-label ct-vertical ct-start" style="height: 30px; width: 30px" xmlns="http://www.w3.org/1999/xhtml">1000</span></foreignObject></g></svg></div>
-        <div class="footer">
-            <div class="chart-legend">
-                <i class="fa fa-circle text-info"></i> Open
-                <i class="fa fa-circle text-danger"></i> Click
-                <i class="fa fa-circle text-warning"></i> Click Second Time
-            </div>
-            <hr>
-            <div class="stats">
-                <i class="ti-reload"></i> Updated 3 minutes ago
-            </div>
-        </div>
+    <div class="footer">
+      <div class="chart-legend">
+        <i class="fa fa-circle text-info"></i> Open
+        <i class="fa fa-circle text-danger"></i> Click
+        <i class="fa fa-circle text-warning"></i> Click Second Time
+      </div>
+      <hr>
+      <div class="stats">
+        <i class="ti-reload"></i> Updated 3 minutes ago
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/expenses/create.blade.php b/resources/views/admin/expenses/create.blade.php
index c03fb038..ada45652 100644
--- a/resources/views/admin/expenses/create.blade.php
+++ b/resources/views/admin/expenses/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add Expense')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.expenses.store']) }}
-             @include('admin.expenses.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.expenses.store']) }}
+      @include('admin.expenses.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/expenses/edit.blade.php b/resources/views/admin/expenses/edit.blade.php
index ad6c9c74..6dd767bb 100644
--- a/resources/views/admin/expenses/edit.blade.php
+++ b/resources/views/admin/expenses/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', "Edit \"$expense->name\"")
 @section('content')
-<div class="card border-blue-bottom">
-   <div class="content">
-       {{ Form::model($expense, ['route' => ['admin.expenses.update', $expense->id], 'method' => 'patch']) }}
-            @include('admin.expenses.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($expense, ['route' => ['admin.expenses.update', $expense->id], 'method' => 'patch']) }}
+      @include('admin.expenses.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/expenses/fields.blade.php b/resources/views/admin/expenses/fields.blade.php
index 151d0e8f..87072a89 100644
--- a/resources/views/admin/expenses/fields.blade.php
+++ b/resources/views/admin/expenses/fields.blade.php
@@ -1,64 +1,64 @@
 <div class="row">
-    <!-- Code Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('airline_id', 'Airline:') }}
+  <!-- Code Field -->
+  <div class="form-group col-sm-6">
+    {{ Form::label('airline_id', 'Airline:') }}
 
-        {{ Form::select('airline_id', $airlines_list, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-        @component('admin.components.info')
-            If an airline is selected, then the expense will only be applied
-            to the selected airline, or flights in that airline.
-        @endcomponent
-    </div>
+    {{ Form::select('airline_id', $airlines_list, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+    @component('admin.components.info')
+      If an airline is selected, then the expense will only be applied
+      to the selected airline, or flights in that airline.
+    @endcomponent
+  </div>
 
-    <!-- Name Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('type', 'Expense Type:') }}&nbsp;<span class="required">*</span>
-        {{ Form::select('type', $expense_types, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('type') }}</p>
-    </div>
+  <!-- Name Field -->
+  <div class="form-group col-sm-6">
+    {{ Form::label('type', 'Expense Type:') }}&nbsp;<span class="required">*</span>
+    {{ Form::select('type', $expense_types, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('type') }}</p>
+  </div>
 </div>
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('name', 'Expense Name:') }}
-        {{ 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('name', 'Expense Name:') }}
+    {{ 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('amount', 'Amount:') }}
-        {{ Form::number('amount', null, ['class' => 'form-control', 'min' => 0, 'step' => '0.01']) }}
-        <p class="text-danger">{{ $errors->first('amount') }}</p>
-    </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('amount', 'Amount:') }}
+    {{ Form::number('amount', null, ['class' => 'form-control', 'min' => 0, 'step' => '0.01']) }}
+    <p class="text-danger">{{ $errors->first('amount') }}</p>
+  </div>
 
 </div>
 
 <div class="row">
 
-    <div class="col-sm-5">
-        {{ Form::label('multiplier', 'Multiplier:') }}
-        <label class="checkbox-inline">
-            {{ Form::hidden('multiplier', 0, false) }}
-            {{ Form::checkbox('multiplier', 1, null) }}
-        </label>
-        @component('admin.components.info')
-            If checked, with a PIREP, this expense can be modified by a multiplier
-            on the subfleet. This is ignored for daily and monthly expenses
-        @endcomponent
-    </div>
+  <div class="col-sm-5">
+    {{ Form::label('multiplier', 'Multiplier:') }}
+    <label class="checkbox-inline">
+      {{ Form::hidden('multiplier', 0, false) }}
+      {{ Form::checkbox('multiplier', 1, null) }}
+    </label>
+    @component('admin.components.info')
+      If checked, with a PIREP, this expense can be modified by a multiplier
+      on the subfleet. This is ignored for daily and monthly expenses
+    @endcomponent
+  </div>
 
-    <div class="col-sm-3">
-        {{ Form::label('active', 'Active:') }}
-        <label class="checkbox-inline">
-            {{ Form::hidden('active', 0, false) }}
-            {{ Form::checkbox('active', 1, null) }}
-        </label>
-    </div>
+  <div class="col-sm-3">
+    {{ Form::label('active', 'Active:') }}
+    <label class="checkbox-inline">
+      {{ Form::hidden('active', 0, false) }}
+      {{ Form::checkbox('active', 1, null) }}
+    </label>
+  </div>
 
-    <div class="form-group col-sm-4">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.expenses.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  <div class="form-group col-sm-4">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.expenses.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/expenses/import.blade.php b/resources/views/admin/expenses/import.blade.php
index 4b17b069..fe8486ce 100644
--- a/resources/views/admin/expenses/import.blade.php
+++ b/resources/views/admin/expenses/import.blade.php
@@ -2,5 +2,5 @@
 @section('title', 'Import Expenses')
 
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.expenses.import'])
+  @include('admin.common.import', ['route' => 'admin.expenses.import'])
 @endsection
diff --git a/resources/views/admin/expenses/index.blade.php b/resources/views/admin/expenses/index.blade.php
index b8c90f49..881d558c 100644
--- a/resources/views/admin/expenses/index.blade.php
+++ b/resources/views/admin/expenses/index.blade.php
@@ -2,22 +2,22 @@
 @section('title', 'Expenses')
 
 @section('actions')
-    <li><a href="{{ route('admin.expenses.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <li><a href="{{ route('admin.expenses.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    <li><a href="{{ route('admin.expenses.create') }}"><i class="ti-plus"></i>Add New</a></li>
+  <li><a href="{{ route('admin.expenses.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+  <li><a href="{{ route('admin.expenses.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li><a href="{{ route('admin.expenses.create') }}"><i class="ti-plus"></i>Add New</a></li>
 @endsection
 
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-        @if(!filled($expenses))
-            <p class="text-center">
-                There are no expenses
-            </p>
-        @else
-            @include('admin.expenses.table')
-        @endif
+      @if(!filled($expenses))
+        <p class="text-center">
+          There are no expenses
+        </p>
+      @else
+        @include('admin.expenses.table')
+      @endif
     </div>
-</div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/expenses/table.blade.php b/resources/views/admin/expenses/table.blade.php
index 6f9a0bea..ad33a59f 100644
--- a/resources/views/admin/expenses/table.blade.php
+++ b/resources/views/admin/expenses/table.blade.php
@@ -1,40 +1,40 @@
 <table class="table table-hover table-responsive" id="expenses-table">
-    <thead>
-        <th>Name</th>
-        <th>Type</th>
-        <th style="text-align: center;">Amount</th>
-        <th>Airline</th>
-        <th class="text-center">Active</th>
-        <th></th>
-    </thead>
-    <tbody>
-    @foreach($expenses as $expense)
-        <tr>
-            <td><a href="{{ route('admin.expenses.edit', [$expense->id]) }}">
-                {{ $expense->name }}</a>
-            </td>
-            <td>{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</td>
-            <td style="text-align: center;">{{ $expense->amount }}</td>
-            <td>
-                @if(filled($expense->airline))
-                    {{ $expense->airline->name }}
-                @else
-                    <span class="description">-</span>
-                @endif
-            </td>
-            <td class="text-center">
+  <thead>
+  <th>Name</th>
+  <th>Type</th>
+  <th style="text-align: center;">Amount</th>
+  <th>Airline</th>
+  <th class="text-center">Active</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach($expenses as $expense)
+    <tr>
+      <td><a href="{{ route('admin.expenses.edit', [$expense->id]) }}">
+          {{ $expense->name }}</a>
+      </td>
+      <td>{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</td>
+      <td style="text-align: center;">{{ $expense->amount }}</td>
+      <td>
+        @if(filled($expense->airline))
+          {{ $expense->airline->name }}
+        @else
+          <span class="description">-</span>
+        @endif
+      </td>
+      <td class="text-center">
                 <span class="label label-{{ $expense->active?'success':'default' }}">
                     {{ \App\Models\Enums\ActiveState::label($expense->active) }}
                 </span>
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.expenses.destroy', $expense->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.expenses.edit', [$expense->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+      </td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.expenses.destroy', $expense->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.expenses.edit', [$expense->id]) }}"
+           class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/fares/create.blade.php b/resources/views/admin/fares/create.blade.php
index 172c4531..42e1eb87 100644
--- a/resources/views/admin/fares/create.blade.php
+++ b/resources/views/admin/fares/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add Fare')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.fares.store']) }}
-            @include('admin.fares.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.fares.store']) }}
+      @include('admin.fares.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/fares/edit.blade.php b/resources/views/admin/fares/edit.blade.php
index bbc11592..f93b15cc 100644
--- a/resources/views/admin/fares/edit.blade.php
+++ b/resources/views/admin/fares/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', "Edit \"$fare->name\"")
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-       {{ Form::model($fare, ['route' => ['admin.fares.update', $fare->id], 'method' => 'patch']) }}
-            @include('admin.fares.fields')
-       {{ Form::close() }}
+      {{ Form::model($fare, ['route' => ['admin.fares.update', $fare->id], 'method' => 'patch']) }}
+      @include('admin.fares.fields')
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/admin/fares/fields.blade.php b/resources/views/admin/fares/fields.blade.php
index fe30205d..3fa6ab5c 100644
--- a/resources/views/admin/fares/fields.blade.php
+++ b/resources/views/admin/fares/fields.blade.php
@@ -1,79 +1,79 @@
 <div class="row">
-    <div class="col-md-12">
-        <div class="callout callout-success">
-        When a fare is assigned to a subfleet, the price, cost and capacity can be overridden,
-        so you can create default values that will apply to most of your subfleets, and change
-        them where they will differ.
-        </div>
-        <br />
+  <div class="col-md-12">
+    <div class="callout callout-success">
+      When a fare is assigned to a subfleet, the price, cost and capacity can be overridden,
+      so you can create default values that will apply to most of your subfleets, and change
+      them where they will differ.
     </div>
+    <br/>
+  </div>
 </div>
 <div class="row">
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('code', 'Code:') }}&nbsp;<span class="required">*</span>
     @component('admin.components.info')
-        How this fare class will show up on a ticket
+      How this fare class will show up on a ticket
     @endcomponent
     {{ Form::text('code', null, ['class' => 'form-control']) }}
     <p class="text-danger">{{ $errors->first('code') }}</p>
-</div>
+  </div>
 
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('name', 'Name:') }}&nbsp;<span class="required">*</span>
     @component('admin.components.info')
-        The fare class name, E.g, "Economy" or "First"
+      The fare class name, E.g, "Economy" or "First"
     @endcomponent
     {{ Form::text('name', null, ['class' => 'form-control']) }}
     <p class="text-danger">{{ $errors->first('name') }}</p>
-</div>
+  </div>
 
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('price', 'Price:') }}
     @component('admin.components.info')
-        This is the price of a ticket for a passenger
+      This is the price of a ticket for a passenger
     @endcomponent
     {{ Form::text('price', null, ['class' => 'form-control', 'placeholder' => 0]) }}
     <p class="text-danger">{{ $errors->first('price') }}</p>
-</div>
+  </div>
 
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('cost', 'Cost:') }}
     @component('admin.components.info')
-        The operating cost
+      The operating cost
     @endcomponent
     {{ Form::number('cost', null, ['class' => 'form-control', 'placeholder' => 0, 'step' => '0.01']) }}
     <p class="text-danger">{{ $errors->first('cost') }}</p>
-</div>
+  </div>
 
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('capacity', 'Capacity:') }}
     @component('admin.components.info')
-        The number of seats available in this class.
+      The number of seats available in this class.
     @endcomponent
     {{ Form::number('capacity', null, ['class' => 'form-control', 'min' => 0]) }}
     <p class="text-danger">{{ $errors->first('capacity') }}</p>
-</div>
+  </div>
 
-<div class="form-group col-sm-6">
+  <div class="form-group col-sm-6">
     {{ Form::label('notes', 'Notes:') }}
     {{ Form::text('notes', null, ['class' => 'form-control']) }}
     <p class="text-danger">{{ $errors->first('notes') }}</p>
-</div>
+  </div>
 
-<!-- Active Field -->
-<div class="form-group col-sm-12">
+  <!-- Active Field -->
+  <div class="form-group col-sm-12">
     {{ Form::label('active', 'Active:') }}
     <label class="checkbox-inline">
-        {{ Form::hidden('active', 0, false) }}
-        {{ Form::checkbox('active', 1, null) }}
+      {{ Form::hidden('active', 0, false) }}
+      {{ Form::checkbox('active', 1, null) }}
     </label>
-</div>
+  </div>
 
-<!-- Submit Field -->
-<div class="form-group col-sm-12">
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
     <div class="pull-right">
-        {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-        <a href="{{ route('admin.fares.index') }}" class="btn btn-warn">Cancel</a>
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.fares.index') }}" class="btn btn-warn">Cancel</a>
     </div>
-</div>
+  </div>
 </div>
diff --git a/resources/views/admin/fares/import.blade.php b/resources/views/admin/fares/import.blade.php
index 523612ad..2f0d9420 100644
--- a/resources/views/admin/fares/import.blade.php
+++ b/resources/views/admin/fares/import.blade.php
@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Fares')
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.fares.import'])
+  @include('admin.common.import', ['route' => 'admin.fares.import'])
 @endsection
diff --git a/resources/views/admin/fares/index.blade.php b/resources/views/admin/fares/index.blade.php
index f0599165..4c06ba11 100644
--- a/resources/views/admin/fares/index.blade.php
+++ b/resources/views/admin/fares/index.blade.php
@@ -2,16 +2,16 @@
 
 @section('title', 'Fares')
 @section('actions')
-    <li><a href="{{ route('admin.fares.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <li><a href="{{ route('admin.fares.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    <li><a href="{{ route('admin.fares.create') }}"><i class="ti-plus"></i>Add New</a></li>
+  <li><a href="{{ route('admin.fares.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+  <li><a href="{{ route('admin.fares.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li><a href="{{ route('admin.fares.create') }}"><i class="ti-plus"></i>Add New</a></li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.fares.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.fares.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/fares/show.blade.php b/resources/views/admin/fares/show.blade.php
index f60aeee7..2da39218 100644
--- a/resources/views/admin/fares/show.blade.php
+++ b/resources/views/admin/fares/show.blade.php
@@ -1,9 +1,9 @@
 @extends('admin.app')
 
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-        @include('admin.fares.show_fields')
+      @include('admin.fares.show_fields')
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/admin/fares/show_fields.blade.php b/resources/views/admin/fares/show_fields.blade.php
index 7d39e8fd..e82950ea 100644
--- a/resources/views/admin/fares/show_fields.blade.php
+++ b/resources/views/admin/fares/show_fields.blade.php
@@ -1,35 +1,35 @@
 <!-- Code Field -->
 <div class="form-group">
-    {{ Form::label('code', 'Code:') }}
-    <p>{{ $fare->code }}</p>
+  {{ Form::label('code', 'Code:') }}
+  <p>{{ $fare->code }}</p>
 </div>
 
 <!-- Name Field -->
 <div class="form-group">
-    {{ Form::label('name', 'Name:') }}
-    <p>{{ $fare->name }}</p>
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $fare->name }}</p>
 </div>
 
 <!-- Price Field -->
 <div class="form-group">
-    {{ Form::label('price', 'Price:') }}
-    <p>{{ $fare->price }}</p>
+  {{ Form::label('price', 'Price:') }}
+  <p>{{ $fare->price }}</p>
 </div>
 
 <!-- Cost Field -->
 <div class="form-group">
-    {{ Form::label('cost', 'Cost:') }}
-    <p>{{ $fare->cost }}</p>
+  {{ Form::label('cost', 'Cost:') }}
+  <p>{{ $fare->cost }}</p>
 </div>
 
 <!-- Notes Field -->
 <div class="form-group">
-    {{ Form::label('notes', 'Notes:') }}
-    <p>{{ $fare->notes }}</p>
+  {{ Form::label('notes', 'Notes:') }}
+  <p>{{ $fare->notes }}</p>
 </div>
 
 <!-- Active Field -->
 <div class="form-group">
-    {{ Form::label('active', 'Active:') }}
-    <p>{{ $fare->active }}</p>
+  {{ Form::label('active', 'Active:') }}
+  <p>{{ $fare->active }}</p>
 </div>
diff --git a/resources/views/admin/fares/table.blade.php b/resources/views/admin/fares/table.blade.php
index f76aebd1..4b3de789 100644
--- a/resources/views/admin/fares/table.blade.php
+++ b/resources/views/admin/fares/table.blade.php
@@ -1,36 +1,36 @@
 <table class="table table-hover table-responsive" id="fares-table">
-    <thead>
-        <th>Code</th>
-        <th>Name</th>
-        <th>Price</th>
-        <th>Cost</th>
-        <th>Notes</th>
-        <th class="text-center">Active</th>
-        <th class="text-right">Action</th>
-    </thead>
-    <tbody>
-    @foreach($fares as $fare)
-        <tr>
-            <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>
-            <td>{{ $fare->notes }}</td>
-            <td class="text-center">
-                @if($fare->active == 1)
-                    <span class="label label-success">Active</span>
-                @else
-                    <span class="label label-default">Inactive</span>
-                @endif
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.fares.destroy', $fare->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.fares.edit', [$fare->id]) }}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+  <thead>
+  <th>Code</th>
+  <th>Name</th>
+  <th>Price</th>
+  <th>Cost</th>
+  <th>Notes</th>
+  <th class="text-center">Active</th>
+  <th class="text-right">Action</th>
+  </thead>
+  <tbody>
+  @foreach($fares as $fare)
+    <tr>
+      <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>
+      <td>{{ $fare->notes }}</td>
+      <td class="text-center">
+        @if($fare->active == 1)
+          <span class="label label-success">Active</span>
+        @else
+          <span class="label label-default">Inactive</span>
+        @endif
+      </td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.fares.destroy', $fare->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.fares.edit', [$fare->id]) }}" class='btn btn-sm btn-success btn-icon'>
+          <i class="fas fa-pencil-alt"></i></a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/finances/index.blade.php b/resources/views/admin/finances/index.blade.php
index 4b2686ae..6bf08d8f 100644
--- a/resources/views/admin/finances/index.blade.php
+++ b/resources/views/admin/finances/index.blade.php
@@ -2,23 +2,23 @@
 
 @section('title', 'Financial Reports')
 @section('actions')
-    <li><a href="{{ route('admin.finances.index') }}"><i class="ti-menu-alt"></i>Overview</a></li>
+  <li><a href="{{ route('admin.finances.index') }}"><i class="ti-menu-alt"></i>Overview</a></li>
 @endsection
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <div style="float:right;">
-                {{ Form::select(
-                        'month_select',
-                        $months_list,
-                        $current_month,
-                        ['id' => 'month_select']
-                    ) }}
-            </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div style="float:right;">
+        {{ Form::select(
+                'month_select',
+                $months_list,
+                $current_month,
+                ['id' => 'month_select']
+            ) }}
+      </div>
 
-            @include('admin.finances.table')
+      @include('admin.finances.table')
 
-        </div>
     </div>
+  </div>
 @endsection
 @include('admin.finances.scripts')
diff --git a/resources/views/admin/finances/scripts.blade.php b/resources/views/admin/finances/scripts.blade.php
index 98c648fe..511ab4c3 100644
--- a/resources/views/admin/finances/scripts.blade.php
+++ b/resources/views/admin/finances/scripts.blade.php
@@ -1,12 +1,12 @@
 @section('scripts')
-<script>
-$(document).ready(() => {
-    const select_id = "select#month_select";
-    $(select_id).change((e) => {
+  <script>
+    $(document).ready(() => {
+      const select_id = "select#month_select";
+      $(select_id).change((e) => {
         const date = $(select_id + " option:selected").val();
         const location = window.location.toString().split('?')[0];
-        window.location =  location + '?month='+date;
+        window.location = location + '?month=' + date;
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/finances/table.blade.php b/resources/views/admin/finances/table.blade.php
index 38ceecb9..1cb0f194 100644
--- a/resources/views/admin/finances/table.blade.php
+++ b/resources/views/admin/finances/table.blade.php
@@ -1,63 +1,62 @@
-
 @foreach($transaction_groups as $group)
 
-    <h3>{{ $group['airline']->icao }} - {{ $group['airline']->name }}</h3>
+  <h3>{{ $group['airline']->icao }} - {{ $group['airline']->name }}</h3>
 
-    <table
-        id="finances-table"
-        style="width: 95%; margin: 0px auto;"
-        class="table table-hover table-responsive">
+  <table
+    id="finances-table"
+    style="width: 95%; margin: 0px auto;"
+    class="table table-hover table-responsive">
 
-        <thead>
-        <th>Expenses</th>
-        <th>Credit</th>
-        <th>Debit</th>
-        </thead>
-        <tbody>
-        @foreach($group['transactions'] as $ta)
-            <tr>
-                <td>
-                    {{ $ta->transaction_group }}
-                </td>
-                <td>
-                    @if($ta->sum_credits)
-                        {{ money($ta->sum_credits, $ta->currency) }}
-                    @endif
-                </td>
-                <td>
-                    @if($ta->sum_debits)
-                        <i>{{ money($ta->sum_debits, $ta->currency) }}</i>
-                    @endif
-                </td>
-            </tr>
-        @endforeach
+    <thead>
+    <th>Expenses</th>
+    <th>Credit</th>
+    <th>Debit</th>
+    </thead>
+    <tbody>
+    @foreach($group['transactions'] as $ta)
+      <tr>
+        <td>
+          {{ $ta->transaction_group }}
+        </td>
+        <td>
+          @if($ta->sum_credits)
+            {{ money($ta->sum_credits, $ta->currency) }}
+          @endif
+        </td>
+        <td>
+          @if($ta->sum_debits)
+            <i>{{ money($ta->sum_debits, $ta->currency) }}</i>
+          @endif
+        </td>
+      </tr>
+    @endforeach
 
-        {{-- show sums --}}
-        <tr>
-            <td></td>
-            <td>
-                {{ $group['credits'] }}
-            </td>
-            <td>
-                <i>{{ $group['debits'] }}</i>
-            </td>
-        </tr>
+    {{-- show sums --}}
+    <tr>
+      <td></td>
+      <td>
+        {{ $group['credits'] }}
+      </td>
+      <td>
+        <i>{{ $group['debits'] }}</i>
+      </td>
+    </tr>
 
-        {{-- final total --}}
-        <tr style="border-top: 3px; border-top-style: double;">
-            <td></td>
-            <td align="right">
-                <b>Total</b>
-            </td>
-            <td>
-                {{ $group['credits']->subtract($group['debits']) }}
-            </td>
-        </tr>
+    {{-- final total --}}
+    <tr style="border-top: 3px; border-top-style: double;">
+      <td></td>
+      <td align="right">
+        <b>Total</b>
+      </td>
+      <td>
+        {{ $group['credits']->subtract($group['debits']) }}
+      </td>
+    </tr>
 
-        </tbody>
-    </table>
+    </tbody>
+  </table>
 
-    @if(!$loop->last)
-        <hr>
-    @endif
+  @if(!$loop->last)
+    <hr>
+  @endif
 @endforeach
diff --git a/resources/views/admin/flash/check_error.blade.php b/resources/views/admin/flash/check_error.blade.php
index cc67ffc0..334aa5fd 100644
--- a/resources/views/admin/flash/check_error.blade.php
+++ b/resources/views/admin/flash/check_error.blade.php
@@ -1,6 +1,6 @@
 @if($errors->has($field))
-    <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
-{{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
-    {{ $errors->first($field) }}
-</div>--}}
+  <p class="text-danger" style="margin-top: 10px;">{{ $errors->first($field) }}</p>
+  {{--<div class="alert alert-danger" role="alert" style="margin-top: 10px;">
+      {{ $errors->first($field) }}
+  </div>--}}
 @endif
diff --git a/resources/views/admin/flash/message.blade.php b/resources/views/admin/flash/message.blade.php
index 1c324239..13fcdf9f 100644
--- a/resources/views/admin/flash/message.blade.php
+++ b/resources/views/admin/flash/message.blade.php
@@ -1,30 +1,31 @@
 @foreach (session('flash_notification', []) as $message)
-    @if ($message['overlay'])
-        @include('flash::modal', [
-            'modalClass' => 'flash-modal',
-            'title'      => $message['title'],
-            'body'       => $message['message']
-        ])
-    @else
-        <div class="alert
+  @if ($message['overlay'])
+    @include('flash::modal', [
+        'modalClass' => 'flash-modal',
+        'title'      => $message['title'],
+        'body'       => $message['message']
+    ])
+  @else
+    <div class="alert
                     alert-{{ $message['level'] }}
-        {{ $message['important'] ? 'alert-important' : '' }}"
-             role="alert"
-        >
-            <div class="alert-icon">
-                <i class="now-ui-icons ui-2_like"></i>
-            </div>
-            @if ($message['important'])
-            @endif
-            <button type="button"
-                    class="close"
-                    data-dismiss="alert"
-                    aria-hidden="true">&times;</button>
+    {{ $message['important'] ? 'alert-important' : '' }}"
+         role="alert"
+    >
+      <div class="alert-icon">
+        <i class="now-ui-icons ui-2_like"></i>
+      </div>
+      @if ($message['important'])
+      @endif
+      <button type="button"
+              class="close"
+              data-dismiss="alert"
+              aria-hidden="true">&times;
+      </button>
 
-            {{ $message['message'] }}
+      {{ $message['message'] }}
 
-        </div>
-    @endif
+    </div>
+  @endif
 @endforeach
 
 {{ session()->forget('flash_notification') }}
diff --git a/resources/views/admin/flightfields/create.blade.php b/resources/views/admin/flightfields/create.blade.php
index e3126101..ee4052c7 100644
--- a/resources/views/admin/flightfields/create.blade.php
+++ b/resources/views/admin/flightfields/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Adding Field')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.flightfields.store']) }}
-                @include('admin.flightfields.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.flightfields.store']) }}
+      @include('admin.flightfields.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/flightfields/edit.blade.php b/resources/views/admin/flightfields/edit.blade.php
index 636ed3b5..33b40cee 100644
--- a/resources/views/admin/flightfields/edit.blade.php
+++ b/resources/views/admin/flightfields/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Editing ' . $field->name)
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-       {{ Form::model($field, ['route' => ['admin.flightfields.update', $field->id], 'method' => 'patch']) }}
-            @include('admin.flightfields.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+      {{ Form::model($field, ['route' => ['admin.flightfields.update', $field->id], 'method' => 'patch']) }}
+      @include('admin.flightfields.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/flightfields/fields.blade.php b/resources/views/admin/flightfields/fields.blade.php
index 9aecf4b3..15d13aab 100644
--- a/resources/views/admin/flightfields/fields.blade.php
+++ b/resources/views/admin/flightfields/fields.blade.php
@@ -1,14 +1,14 @@
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('name', 'Name:') }}&nbsp;&nbsp;<span class="required">*</span>
-        {{ 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('name', 'Name:') }}&nbsp;&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">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-        <a href="{{ route('admin.flightfields.index') }}" class="btn btn-default">Cancel</a>
-    </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+    <a href="{{ route('admin.flightfields.index') }}" class="btn btn-default">Cancel</a>
+  </div>
 </div>
diff --git a/resources/views/admin/flightfields/index.blade.php b/resources/views/admin/flightfields/index.blade.php
index f2d8902b..bd1205f4 100644
--- a/resources/views/admin/flightfields/index.blade.php
+++ b/resources/views/admin/flightfields/index.blade.php
@@ -1,18 +1,18 @@
 @extends('admin.app')
 @section('title', 'Flight Fields')
 @section('actions')
-    <li><a href="{{ route('admin.flightfields.create') }}"><i class="ti-plus"></i>Add Field</a></li>
-    <li>
-        <a href="{{ route('admin.flights.create') }}">
-            <i class="ti-plus"></i>
-            Add Flight</a>
-    </li>
+  <li><a href="{{ route('admin.flightfields.create') }}"><i class="ti-plus"></i>Add Field</a></li>
+  <li>
+    <a href="{{ route('admin.flights.create') }}">
+      <i class="ti-plus"></i>
+      Add Flight</a>
+  </li>
 @endsection
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.flightfields.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flightfields.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/flightfields/table.blade.php b/resources/views/admin/flightfields/table.blade.php
index 37651d60..15182ff1 100644
--- a/resources/views/admin/flightfields/table.blade.php
+++ b/resources/views/admin/flightfields/table.blade.php
@@ -1,34 +1,34 @@
 <div class="content table-responsive table-full-width">
 
-    <div class="header">
-        @component('admin.components.info')
-            Flights fields that can be filled out. You can still add other custom fields
-            directly in the flight, but this provides a template for all flights.
-        @endcomponent
-    </div>
+  <div class="header">
+    @component('admin.components.info')
+      Flights fields that can be filled out. You can still add other custom fields
+      directly in the flight, but this provides a template for all flights.
+    @endcomponent
+  </div>
 
-    <table class="table table-hover table-responsive" id="pirepFields-table">
+  <table class="table table-hover table-responsive" id="pirepFields-table">
     <thead>
-        <th>Name</th>
-        <th></th>
+    <th>Name</th>
+    <th></th>
     </thead>
     <tbody>
     @foreach($fields as $field)
-        <tr>
-            <td>{{ $field->name }}</td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.flightfields.destroy', $field->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.flightfields.edit', [$field->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
+      <tr>
+        <td>{{ $field->name }}</td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.flightfields.destroy', $field->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.flightfields.edit', [$field->id]) }}"
+             class='btn btn-sm btn-success btn-icon'>
+            <i class="fas fa-pencil-alt"></i></a>
 
-                {{ Form::button('<i class="fa fa-times"></i>',
-                             ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
-                              'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
+          {{ Form::button('<i class="fa fa-times"></i>',
+                       ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
+                        'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
     @endforeach
     </tbody>
-</table>
+  </table>
 </div>
diff --git a/resources/views/admin/flights/create.blade.php b/resources/views/admin/flights/create.blade.php
index 452f5a7c..dac27ad5 100644
--- a/resources/views/admin/flights/create.blade.php
+++ b/resources/views/admin/flights/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add Flight')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::model($flight, ['route' => ['admin.flights.store']]) }}
-                @include('admin.flights.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($flight, ['route' => ['admin.flights.store']]) }}
+      @include('admin.flights.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/flights/edit.blade.php b/resources/views/admin/flights/edit.blade.php
index 68ef532a..ce79e7e1 100644
--- a/resources/views/admin/flights/edit.blade.php
+++ b/resources/views/admin/flights/edit.blade.php
@@ -2,30 +2,30 @@
 
 @section('title', 'Edit Flight')
 @section('content')
-    <div class="card border-blue-bottom">
-       <div class="content">
-            {{ Form::model($flight, ['route' => ['admin.flights.update', $flight->id], 'method' => 'patch']) }}
-                @include('admin.flights.fields')
-            {{ Form::close() }}
-       </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($flight, ['route' => ['admin.flights.update', $flight->id], 'method' => 'patch']) }}
+      @include('admin.flights.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.flights.subfleets')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flights.subfleets')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-           @include('admin.flights.flight_fields')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flights.flight_fields')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.flights.fares')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flights.fares')
     </div>
+  </div>
 @endsection
 @include('admin.flights.scripts')
diff --git a/resources/views/admin/flights/fares.blade.php b/resources/views/admin/flights/fares.blade.php
index 0be18e68..1f3cc9f2 100644
--- a/resources/views/admin/flights/fares.blade.php
+++ b/resources/views/admin/flights/fares.blade.php
@@ -1,86 +1,86 @@
 <div id="flight_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
-    <div class="header">
-        <h3>fares</h3>
-        @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>.
-        @endcomponent
+  <div class="header">
+    <h3>fares</h3>
+    @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>.
+    @endcomponent
 
-        <p class="text-danger">{{ $errors->first('value') }}</p>
-    </div>
+    <p class="text-danger">{{ $errors->first('value') }}</p>
+  </div>
 
-    @if(count($flight->fares) === 0)
-        @include('admin.common.none_added', ['type' => 'fares'])
+  @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">
+    @if(count($flight->fares))
+      <thead>
+      <tr role="row">
+        <th>Name</th>
+        <th style="text-align: center;">Code</th>
+        <th>Capacity</th>
+        <th>Price</th>
+        <th>Cost</th>
+        <th>Actions</th>
+      </tr>
+      </thead>
     @endif
-
-    <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>
-            <th style="text-align: center;">Code</th>
-            <th>Capacity</th>
-            <th>Price</th>
-            <th>Cost</th>
-            <th>Actions</th>
-        </tr>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($flight->fares as $atf)
-            <tr>
-                <td class="sorting_1">{{ $atf->name }}</td>
-                <td style="text-align: center;">{{ $atf->code }}</td>
-                <td>
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
-                </td>
-                <td>
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
-                </td>
-                <td>
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
-                </td>
-                <td style="text-align: center; width:3%;">
-                    {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',
-                                    'method' => 'delete',
-                                    'class' => 'pjax_fares_form'
-                                    ])
-                    }}
-                    {{ Form::hidden('fare_id', $atf->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>',
-                                     ['type' => 'submit',
-                                      'class' => 'btn btn-danger btn-xs']) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr />
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="text-right">
-                {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',
-                        'method' => 'post',
-                        'class' => 'pjax_fares_form form-inline'
-                ]) }}
-                {{ Form::select('fare_id', $avail_fares, null, [
-                        'placeholder' => 'Select Fare',
-                        'class' => 'ac-fare-dropdown form-control input-lg select2',
-                        'style' => 'width: 400px;',
-                ]) }}
-                {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add', [
-                        'type' => 'submit',
-                        'class' => 'btn btn-success btn-s']
-                ) }}
-                {{ Form::close() }}
-            </div>
-        </div>
+    <tbody>
+    @foreach($flight->fares as $atf)
+      <tr>
+        <td class="sorting_1">{{ $atf->name }}</td>
+        <td style="text-align: center;">{{ $atf->code }}</td>
+        <td>
+          <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
+        </td>
+        <td>
+          <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
+        </td>
+        <td>
+          <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
+        </td>
+        <td style="text-align: center; width:3%;">
+          {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',
+                          'method' => 'delete',
+                          'class' => 'pjax_fares_form'
+                          ])
+          }}
+          {{ Form::hidden('fare_id', $atf->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>',
+                           ['type' => 'submit',
+                            'class' => 'btn btn-danger btn-xs']) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fares',
+                'method' => 'post',
+                'class' => 'pjax_fares_form form-inline'
+        ]) }}
+        {{ Form::select('fare_id', $avail_fares, null, [
+                'placeholder' => 'Select Fare',
+                'class' => 'ac-fare-dropdown form-control input-lg select2',
+                'style' => 'width: 400px;',
+        ]) }}
+        {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add', [
+                'type' => 'submit',
+                'class' => 'btn btn-success btn-s']
+        ) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/fields.blade.php b/resources/views/admin/flights/fields.blade.php
index b6475e3b..2efd88d6 100644
--- a/resources/views/admin/flights/fields.blade.php
+++ b/resources/views/admin/flights/fields.blade.php
@@ -1,249 +1,249 @@
 <!-- Airline Id Field -->
 <div class="row">
-    <div class="col-12">
-        <div class="form-container">
-            <h6><i class="fas fa-info-circle"></i>
-                &nbsp;Flight Information
-            </h6>
-            <div class="form-container-body">
-                <div class="row">
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('airline_id', 'Airline:') }}&nbsp;<span
-                                class="required">*</span>
-                        {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-                        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-                    </div>
+  <div class="col-12">
+    <div class="form-container">
+      <h6><i class="fas fa-info-circle"></i>
+        &nbsp;Flight Information
+      </h6>
+      <div class="form-container-body">
+        <div class="row">
+          <div class="form-group col-sm-3">
+            {{ Form::label('airline_id', 'Airline:') }}&nbsp;<span
+              class="required">*</span>
+            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+            <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+          </div>
 
-                    <!-- Flight Number Field -->
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('flight_number', 'Flight Number/Code/Leg') }}&nbsp;<span class="required">*</span>
+          <!-- Flight Number Field -->
+          <div class="form-group col-sm-3">
+            {{ Form::label('flight_number', 'Flight Number/Code/Leg') }}&nbsp;<span class="required">*</span>
 
-                        <div class="input-group input-group-sm mb3">
-                            {{ Form::text('flight_number', null, ['class' => 'form-control', 'style' => 'width: 33%']) }}
-                            {{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional', 'style' => 'width: 33%']) }}
-                            {{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional', 'style' => 'width: 33%']) }}
-                        </div>
-
-                        <p class="text-danger">{{ $errors->first('flight_number') }}</p>
-                        <p class="text-danger">{{ $errors->first('route_code') }}</p>
-                        <p class="text-danger">{{ $errors->first('route_leg') }}</p>
-
-                    </div>
-
-                    <!-- Route Code Field -->
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('level', 'Flight Type:') }}&nbsp;<span class="required">*</span>
-                        {{ Form::select('flight_type', $flight_types, null, ['class' => 'form-control select2']) }}
-                        <p class="text-danger">{{ $errors->first('flight_type') }}</p>
-                    </div>
-
-                    <!-- Route Leg Field -->
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('flight_time', 'Flight Time (hours & minutes)') }}
-
-                        <div class="input-group input-group-sm mb3">
-                            {{ Form::number('hours', null, [
-                                    'class' => 'form-control',
-                                    'placeholder' => 'hours',
-                                    'style' => 'width: 50%',
-                                    'min' => '0',
-                                ]) }}
-
-                            {{ Form::number('minutes', null, [
-                                    'class' => 'form-control',
-                                    'placeholder' => 'minutes',
-                                    'style' => 'width: 50%',
-                                    'min' => '0',
-                                ]) }}
-                        </div>
-
-                        <p class="text-danger">{{ $errors->first('hours') }}</p>
-                        <p class="text-danger">{{ $errors->first('minutes') }}</p>
-
-                    </div>
-                </div>
-
-                {{-- NEXT ROW --}}
-
-                <div class="row">
-                    <div class="form-group col-sm-4">
-                        {{ Form::label('dpt_airport_id', 'Departure Airport:') }}&nbsp;<span
-                                class="required">*</span>
-                        {{ Form::select('dpt_airport_id', $airports, null , [
-                                'id'    => 'dpt_airport_id',
-                                'class' => 'form-control select2'
-                            ]) }}
-                        <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
-                    </div>
-
-                    <!-- Arr Airport Id Field -->
-                    <div class="form-group col-sm-4">
-                        {{ Form::label('arr_airport_id', 'Arrival Airport:') }}&nbsp;<span
-                                class="required">*</span>
-                        {{ Form::select('arr_airport_id', $airports, null , [
-                                'id'    => 'arr_airport_id',
-                                'class' => 'form-control select2 select2'
-                            ]) }}
-                        <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
-                    </div>
-
-                    <!-- Alt Airport Id Field -->
-                    <div class="form-group col-sm-4">
-                        {{ Form::label('alt_airport_id', 'Alt Airport:') }}
-                        {{ Form::select('alt_airport_id', $alt_airports, null , ['class' => 'form-control select2']) }}
-                        <p class="text-danger">{{ $errors->first('alt_airport_id') }}</p>
-                    </div>
-                </div>
-
-
-                {{-- NEXT ROW --}}
-
-                <div class="row">
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('dpt_time', 'Departure Time:') }}
-                        {{ Form::text('dpt_time', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('dpt_time') }}</p>
-                    </div>
-
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('arr_time', 'Arrival Time:') }}
-                        {{ Form::text('arr_time', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('arr_time') }}</p>
-                    </div>
-
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('level', 'Flight Level:') }}
-                        {{ Form::text('level', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('level') }}</p>
-                    </div>
-
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('distance', 'Distance:') }} <span class="description small">in nautical miles</span>
-                        <a href="#" class="airport_distance_lookup">Calculate</a>
-                        {{ Form::text('distance', null, ['id' => 'distance', 'class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('distance') }}</p>
-                    </div>
-                </div>
+            <div class="input-group input-group-sm mb3">
+              {{ Form::text('flight_number', null, ['class' => 'form-control', 'style' => 'width: 33%']) }}
+              {{ Form::text('route_code', null, ['class'=>'form-control', 'placeholder'=>'optional', 'style' => 'width: 33%']) }}
+              {{ Form::text('route_leg', null, ['class'=>'form-control', 'placeholder'=>'optional', 'style' => 'width: 33%']) }}
             </div>
+
+            <p class="text-danger">{{ $errors->first('flight_number') }}</p>
+            <p class="text-danger">{{ $errors->first('route_code') }}</p>
+            <p class="text-danger">{{ $errors->first('route_leg') }}</p>
+
+          </div>
+
+          <!-- Route Code Field -->
+          <div class="form-group col-sm-3">
+            {{ Form::label('level', 'Flight Type:') }}&nbsp;<span class="required">*</span>
+            {{ Form::select('flight_type', $flight_types, null, ['class' => 'form-control select2']) }}
+            <p class="text-danger">{{ $errors->first('flight_type') }}</p>
+          </div>
+
+          <!-- Route Leg Field -->
+          <div class="form-group col-sm-3">
+            {{ Form::label('flight_time', 'Flight Time (hours & minutes)') }}
+
+            <div class="input-group input-group-sm mb3">
+              {{ Form::number('hours', null, [
+                      'class' => 'form-control',
+                      'placeholder' => 'hours',
+                      'style' => 'width: 50%',
+                      'min' => '0',
+                  ]) }}
+
+              {{ Form::number('minutes', null, [
+                      'class' => 'form-control',
+                      'placeholder' => 'minutes',
+                      'style' => 'width: 50%',
+                      'min' => '0',
+                  ]) }}
+            </div>
+
+            <p class="text-danger">{{ $errors->first('hours') }}</p>
+            <p class="text-danger">{{ $errors->first('minutes') }}</p>
+
+          </div>
         </div>
+
+        {{-- NEXT ROW --}}
+
+        <div class="row">
+          <div class="form-group col-sm-4">
+            {{ Form::label('dpt_airport_id', 'Departure Airport:') }}&nbsp;<span
+              class="required">*</span>
+            {{ Form::select('dpt_airport_id', $airports, null , [
+                    'id'    => 'dpt_airport_id',
+                    'class' => 'form-control select2'
+                ]) }}
+            <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
+          </div>
+
+          <!-- Arr Airport Id Field -->
+          <div class="form-group col-sm-4">
+            {{ Form::label('arr_airport_id', 'Arrival Airport:') }}&nbsp;<span
+              class="required">*</span>
+            {{ Form::select('arr_airport_id', $airports, null , [
+                    'id'    => 'arr_airport_id',
+                    'class' => 'form-control select2 select2'
+                ]) }}
+            <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
+          </div>
+
+          <!-- Alt Airport Id Field -->
+          <div class="form-group col-sm-4">
+            {{ Form::label('alt_airport_id', 'Alt Airport:') }}
+            {{ Form::select('alt_airport_id', $alt_airports, null , ['class' => 'form-control select2']) }}
+            <p class="text-danger">{{ $errors->first('alt_airport_id') }}</p>
+          </div>
+        </div>
+
+
+        {{-- NEXT ROW --}}
+
+        <div class="row">
+          <div class="form-group col-sm-3">
+            {{ Form::label('dpt_time', 'Departure Time:') }}
+            {{ Form::text('dpt_time', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('dpt_time') }}</p>
+          </div>
+
+          <div class="form-group col-sm-3">
+            {{ Form::label('arr_time', 'Arrival Time:') }}
+            {{ Form::text('arr_time', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('arr_time') }}</p>
+          </div>
+
+          <div class="form-group col-sm-3">
+            {{ Form::label('level', 'Flight Level:') }}
+            {{ Form::text('level', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('level') }}</p>
+          </div>
+
+          <div class="form-group col-sm-3">
+            {{ Form::label('distance', 'Distance:') }} <span class="description small">in nautical miles</span>
+            <a href="#" class="airport_distance_lookup">Calculate</a>
+            {{ Form::text('distance', null, ['id' => 'distance', 'class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('distance') }}</p>
+          </div>
+        </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="col-12">
-        <div class="form-container">
-            <h6><i class="fas fa-clock"></i>
-                &nbsp;Scheduling
-            </h6>
-            <div class="form-container-body">
-                <div class="row">
+  <div class="col-12">
+    <div class="form-container">
+      <h6><i class="fas fa-clock"></i>
+        &nbsp;Scheduling
+      </h6>
+      <div class="form-container-body">
+        <div class="row">
 
-                    <div class="col-sm-4">
-                        {{ Form::label('start_date', 'Start Date') }}
-                        <span class="description small">optional</span>
-                        {{ Form::text('start_date', null, ['id' => 'start_date', 'class' => 'form-control']) }}
-                    </div>
+          <div class="col-sm-4">
+            {{ Form::label('start_date', 'Start Date') }}
+            <span class="description small">optional</span>
+            {{ Form::text('start_date', null, ['id' => 'start_date', 'class' => 'form-control']) }}
+          </div>
 
-                    <div class="col-sm-4">
-                        {{ Form::label('end_date', 'End Date') }}
-                        <span class="description small">optional</span>
-                        {{ Form::text('end_date', null, ['id' => 'end_date', 'class' => 'form-control']) }}
-                    </div>
+          <div class="col-sm-4">
+            {{ Form::label('end_date', 'End Date') }}
+            <span class="description small">optional</span>
+            {{ Form::text('end_date', null, ['id' => 'end_date', 'class' => 'form-control']) }}
+          </div>
 
-                    <div class="form-group col-sm-4">
-                        {{ Form::label('days', 'Days of Week') }}
-                        <span class="description small">optional</span>
-                        <select id="days_of_week" name="days[]" multiple="multiple" size="7" style="width: 100%;">
-                            <option value="{{\App\Models\Enums\Days::MONDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::MONDAY) ? 'selected':'' }}>
-                                @lang('common.days.mon')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::TUESDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::TUESDAY) ? 'selected':'' }}>
-                                @lang('common.days.tues')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::WEDNESDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::WEDNESDAY) ? 'selected':'' }}>
-                                @lang('common.days.wed')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::THURSDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::THURSDAY) ? 'selected':'' }}>
-                                @lang('common.days.thurs')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::FRIDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::FRIDAY) ? 'selected':'' }}>
-                                @lang('common.days.fri')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::SATURDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::SATURDAY) ? 'selected':'false' }}>
-                                @lang('common.days.sat')
-                            </option>
-                            <option value="{{\App\Models\Enums\Days::SUNDAY}}"
-                                    {{in_mask($days, \App\Models\Enums\Days::SUNDAY) ? 'selected':'false' }}>
-                                @lang('common.days.sun')
-                            </option>
-                        </select>
-                    </div>
-                </div>
-            </div>
+          <div class="form-group col-sm-4">
+            {{ Form::label('days', 'Days of Week') }}
+            <span class="description small">optional</span>
+            <select id="days_of_week" name="days[]" multiple="multiple" size="7" style="width: 100%;">
+              <option value="{{\App\Models\Enums\Days::MONDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::MONDAY) ? 'selected':'' }}>
+                @lang('common.days.mon')
+              </option>
+              <option value="{{\App\Models\Enums\Days::TUESDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::TUESDAY) ? 'selected':'' }}>
+                @lang('common.days.tues')
+              </option>
+              <option value="{{\App\Models\Enums\Days::WEDNESDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::WEDNESDAY) ? 'selected':'' }}>
+                @lang('common.days.wed')
+              </option>
+              <option value="{{\App\Models\Enums\Days::THURSDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::THURSDAY) ? 'selected':'' }}>
+                @lang('common.days.thurs')
+              </option>
+              <option value="{{\App\Models\Enums\Days::FRIDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::FRIDAY) ? 'selected':'' }}>
+                @lang('common.days.fri')
+              </option>
+              <option value="{{\App\Models\Enums\Days::SATURDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::SATURDAY) ? 'selected':'false' }}>
+                @lang('common.days.sat')
+              </option>
+              <option value="{{\App\Models\Enums\Days::SUNDAY}}"
+                {{in_mask($days, \App\Models\Enums\Days::SUNDAY) ? 'selected':'false' }}>
+                @lang('common.days.sun')
+              </option>
+            </select>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="col-lg-12">
-        <div class="form-container">
-            <h6><i class="fas fa-map"></i>
-                &nbsp;Route
-            </h6>
-            <div class="form-container-body row">
-                <!-- Route Field -->
-                <div class="form-group col-sm-12">
-                    {{ Form::textarea('route', null, [
-                        'class' => 'form-control input-text',
-                        'style' => 'padding: 10px',
-                    ]) }}
-                    <p class="text-danger">{{ $errors->first('route') }}</p>
-                </div>
-            </div>
+  <div class="col-lg-12">
+    <div class="form-container">
+      <h6><i class="fas fa-map"></i>
+        &nbsp;Route
+      </h6>
+      <div class="form-container-body row">
+        <!-- Route Field -->
+        <div class="form-group col-sm-12">
+          {{ Form::textarea('route', null, [
+              'class' => 'form-control input-text',
+              'style' => 'padding: 10px',
+          ]) }}
+          <p class="text-danger">{{ $errors->first('route') }}</p>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="col-lg-12">
-        <div class="form-container">
-            <h6><i class="fas fa-sticky-note"></i>
-                &nbsp;Remarks
-            </h6>
-            <div class="form-container-body row">
-                <div class="form-group col-sm-12">
-                    {{ Form::textarea('notes', null, [
-                        'class' => 'form-control input-text',
-                        'style' => 'padding: 10px',
-                    ]) }}
-                    <p class="text-danger">{{ $errors->first('notes') }}</p>
-                </div>
-            </div>
+  <div class="col-lg-12">
+    <div class="form-container">
+      <h6><i class="fas fa-sticky-note"></i>
+        &nbsp;Remarks
+      </h6>
+      <div class="form-container-body row">
+        <div class="form-group col-sm-12">
+          {{ Form::textarea('notes', null, [
+              'class' => 'form-control input-text',
+              'style' => 'padding: 10px',
+          ]) }}
+          <p class="text-danger">{{ $errors->first('notes') }}</p>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <!-- Active Field -->
-    <div class="col-sm-4">
-        <div class="checkbox">
-            <label class="checkbox-inline">
-                {{ Form::label('active', 'Active:') }}
-                {{ Form::hidden('active', 0, false) }}
-                {{ Form::checkbox('active') }}
-            </label>
-        </div>
+  <!-- Active Field -->
+  <div class="col-sm-4">
+    <div class="checkbox">
+      <label class="checkbox-inline">
+        {{ Form::label('active', 'Active:') }}
+        {{ Form::hidden('active', 0, false) }}
+        {{ Form::checkbox('active') }}
+      </label>
     </div>
-    <div class="col-8">
-        <div class="text-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.flights.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  </div>
+  <div class="col-8">
+    <div class="text-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.flights.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/flight_fields.blade.php b/resources/views/admin/flights/flight_fields.blade.php
index 1f2c2f07..7464e8ad 100644
--- a/resources/views/admin/flights/flight_fields.blade.php
+++ b/resources/views/admin/flights/flight_fields.blade.php
@@ -1,79 +1,79 @@
 <div id="flight_fields_wrapper">
-    <h3>custom fields</h3><br />
-    <table class="table table-responsive" id="flight-fields-table">
-        @if(count($flight->field_values))
-        <thead>
-        <th>Name</th>
-        <th>Value</th>
-        <th></th>
-        </thead>
-        @endif
-        <tbody>
-        @php
-        #
-        # A little nasty having logic like this in a template, but we need
-        # to filter out the field values that have already been shown, since
-        # they were values set because they had a FlightField parent
-        #
-        $shown = [];
-        @endphp
-        @foreach($flight_fields->concat($flight->field_values) as $field)
-            @php
-                if(in_array($field->name, $shown, true)) {
-                    continue;
-                }
+  <h3>custom fields</h3><br/>
+  <table class="table table-responsive" id="flight-fields-table">
+    @if(count($flight->field_values))
+      <thead>
+      <th>Name</th>
+      <th>Value</th>
+      <th></th>
+      </thead>
+    @endif
+    <tbody>
+    @php
+      #
+      # A little nasty having logic like this in a template, but we need
+      # to filter out the field values that have already been shown, since
+      # they were values set because they had a FlightField parent
+      #
+      $shown = [];
+    @endphp
+    @foreach($flight_fields->concat($flight->field_values) as $field)
+      @php
+        if(in_array($field->name, $shown, true)) {
+            continue;
+        }
 
-                $shown[] = $field->name;
-                $val_field = $flight->field_values->where('name', $field->name)->first();
-            @endphp
-            <tr>
-                <td>{{ $field->name }}</td>
-                <td>
-                    <a class="inline" href="#" data-pk="{{ $val_field['id'] ?? '' }}" data-name="{{ $field->name }}">
-                        {{ $val_field['value'] ?? '' }}
-                    </a>
-                </td>
-                <td style="width: 10%; text-align: center;" class="form-inline">
-                    {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fields',
-                                    'method' => 'delete',
-                                    'class' => 'pjax_form pjax_flight_fields'
-                                    ]) }}
-                    {{ Form::hidden('field_id', $val_field['id'] ?? null) }}
-                    <div class='btn-group'>
-                        {{ Form::button('<i class="fa fa-times"></i>',
-                             ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
-                              'onclick' => "return confirm('Are you sure?')"]) }}
-                    </div>
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-md-12">
-            <div class="text-right">
-                {{ Form::open([
-                    'url' => '/admin/flights/'.$flight->id.'/fields',
-                    'method' => 'post',
-                    'class' => 'pjax_form form-inline pjax_flight_fields'
-                ])
-                }}
+        $shown[] = $field->name;
+        $val_field = $flight->field_values->where('name', $field->name)->first();
+      @endphp
+      <tr>
+        <td>{{ $field->name }}</td>
+        <td>
+          <a class="inline" href="#" data-pk="{{ $val_field['id'] ?? '' }}" data-name="{{ $field->name }}">
+            {{ $val_field['value'] ?? '' }}
+          </a>
+        </td>
+        <td style="width: 10%; text-align: center;" class="form-inline">
+          {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/fields',
+                          'method' => 'delete',
+                          'class' => 'pjax_form pjax_flight_fields'
+                          ]) }}
+          {{ Form::hidden('field_id', $val_field['id'] ?? null) }}
+          <div class='btn-group'>
+            {{ Form::button('<i class="fa fa-times"></i>',
+                 ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
+                  'onclick' => "return confirm('Are you sure?')"]) }}
+          </div>
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-md-12">
+      <div class="text-right">
+        {{ Form::open([
+            'url' => '/admin/flights/'.$flight->id.'/fields',
+            'method' => 'post',
+            'class' => 'pjax_form form-inline pjax_flight_fields'
+        ])
+        }}
 
-                {{ Form::label('name', 'Name:') }}
-                {{ Form::text('name', null, ['class' => 'form-control']) }}
-                &nbsp;&nbsp;
-                {{ Form::label('value', 'Value:') }}
-                {{ Form::text('value', null, ['class' => 'form-control']) }}
-                &nbsp;&nbsp;
-                {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
-                                 ['type' => 'submit',
-                                  'class' => 'btn btn-success btn-s']) }}
-                <p class="text-danger">{{ $errors->first('name') }}</p>
-                <p class="text-danger">{{ $errors->first('value') }}</p>
-                {{ Form::close() }}
-            </div>
-        </div>
+        {{ Form::label('name', 'Name:') }}
+        {{ Form::text('name', null, ['class' => 'form-control']) }}
+        &nbsp;&nbsp;
+        {{ Form::label('value', 'Value:') }}
+        {{ Form::text('value', null, ['class' => 'form-control']) }}
+        &nbsp;&nbsp;
+        {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-s']) }}
+        <p class="text-danger">{{ $errors->first('name') }}</p>
+        <p class="text-danger">{{ $errors->first('value') }}</p>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/import.blade.php b/resources/views/admin/flights/import.blade.php
index 24306ef4..0e3842ab 100644
--- a/resources/views/admin/flights/import.blade.php
+++ b/resources/views/admin/flights/import.blade.php
@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Flights')
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.flights.import'])
+  @include('admin.common.import', ['route' => 'admin.flights.import'])
 @endsection
diff --git a/resources/views/admin/flights/index.blade.php b/resources/views/admin/flights/index.blade.php
index a993e48c..3e09a80d 100644
--- a/resources/views/admin/flights/index.blade.php
+++ b/resources/views/admin/flights/index.blade.php
@@ -2,30 +2,30 @@
 @section('title', 'Flights')
 
 @section('actions')
-    <li><a href="{{ route('admin.flights.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
-    <li><a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    <li><a href="{{ route('admin.flightfields.index') }}"><i class="ti-plus"></i>Fields</a></li>
-    <li>
-        <a href="{{ route('admin.flights.create') }}">
-            <i class="ti-plus"></i>
-            Add Flight</a>
-    </li>
+  <li><a href="{{ route('admin.flights.export') }}"><i class="ti-plus"></i>Export to CSV</a></li>
+  <li><a href="{{ route('admin.flights.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li><a href="{{ route('admin.flightfields.index') }}"><i class="ti-plus"></i>Fields</a></li>
+  <li>
+    <a href="{{ route('admin.flights.create') }}">
+      <i class="ti-plus"></i>
+      Add Flight</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card">
-        @include('admin.flights.search')
-    </div>
+  <div class="card">
+    @include('admin.flights.search')
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.flights.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flights.table')
     </div>
+  </div>
 
-    <div class="row">
-        <div class="col-12 text-center">
-            {{ $flights->links('admin.pagination.default') }}
-        </div>
+  <div class="row">
+    <div class="col-12 text-center">
+      {{ $flights->links('admin.pagination.default') }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/flights/scripts.blade.php b/resources/views/admin/flights/scripts.blade.php
index 5c0e9933..1a7c31d0 100644
--- a/resources/views/admin/flights/scripts.blade.php
+++ b/resources/views/admin/flights/scripts.blade.php
@@ -1,121 +1,120 @@
 @section('scripts')
-<script>
+  <script>
 
-const setEditable = () =>
-{
-    const api_key = $('meta[name="api-key"]').attr('content');
-    const csrf_token = $('meta[name="csrf-token"]').attr('content');
+    const setEditable = () => {
+      const api_key = $('meta[name="api-key"]').attr('content');
+      const csrf_token = $('meta[name="csrf-token"]').attr('content');
 
-    $('#flight_fares a').editable({
+      $('#flight_fares a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'inherited',
         url: '{{ url('/admin/flights/'.$flight->id.'/fares') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': csrf_token
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': csrf_token
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                fare_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            fare_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
-};
+      });
+    };
 
-const setFieldsEditable = () => {
-    const api_key = $('meta[name="api-key"]').attr('content');
-    const csrf_token = $('meta[name="csrf-token"]').attr('content');
+    const setFieldsEditable = () => {
+      const api_key = $('meta[name="api-key"]').attr('content');
+      const csrf_token = $('meta[name="csrf-token"]').attr('content');
 
-    $('#flight_fields_wrapper a.inline').editable({
+      $('#flight_fields_wrapper a.inline').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'no value',
         url: '{{ url('/admin/flights/'.$flight->id.'/fields') }}',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': csrf_token
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': csrf_token
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                field_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            field_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
+      });
+    };
+
+    $(document).ready(function () {
+      $("select#days_of_week").select2();
+
+      setEditable();
+      setFieldsEditable();
+
+      const start_date_picker = new Pikaday({
+        field: document.getElementById('start_date'),
+        minDate: new Date(),
+      });
+
+      const end_date_picker = new Pikaday({
+        field: document.getElementById('end_date'),
+        minDate: new Date(),
+      });
+
+      $(document).on('submit', 'form.pjax_flight_fields', function (event) {
+        event.preventDefault();
+        $.pjax.submit(event, '#flight_fields_wrapper', {push: false});
+      });
+
+      $(document).on('submit', 'form.pjax_subfleet_form', function (event) {
+        event.preventDefault();
+        $.pjax.submit(event, '#subfleet_flight_wrapper', {push: false});
+      });
+
+      $(document).on('submit', 'form.pjax_fares_form', function (event) {
+        event.preventDefault();
+        $.pjax.submit(event, '#flight_fares_wrapper', {push: false});
+      });
+
+      $(document).on('pjax:complete', function () {
+        initPlugins();
+        setEditable();
+        setFieldsEditable();
+      });
+
+      $('a.airport_distance_lookup').click(async function (e) {
+        e.preventDefault();
+        const fromIcao = $("select#dpt_airport_id option:selected").val();
+        const toIcao = $("select#arr_airport_id option:selected").val();
+        console.log('fromIcao="' + fromIcao + '", toIcao="' + toIcao + '"');
+
+        if (fromIcao === '' || toIcao === '') {
+          return;
+        }
+
+        console.log(`Calculating from ${fromIcao} to ${toIcao}`);
+        let response;
+
+        try {
+          response = await phpvms.calculate_distance(fromIcao, toIcao);
+        } catch (e) {
+          console.log('Error calculating distance:', e);
+          return;
+        }
+
+        $("#distance").val(response.data.distance.nmi);
+      });
     });
-};
-
-$(document).ready(function () {
-  $("select#days_of_week").select2();
-
-  setEditable();
-  setFieldsEditable();
-
-  const start_date_picker = new Pikaday({
-    field: document.getElementById('start_date'),
-    minDate: new Date(),
-  });
-
-  const end_date_picker = new Pikaday({
-    field: document.getElementById('end_date'),
-    minDate: new Date(),
-  });
-
-  $(document).on('submit', 'form.pjax_flight_fields', function (event) {
-    event.preventDefault();
-    $.pjax.submit(event, '#flight_fields_wrapper', {push: false});
-  });
-
-  $(document).on('submit', 'form.pjax_subfleet_form', function (event) {
-    event.preventDefault();
-    $.pjax.submit(event, '#subfleet_flight_wrapper', {push: false});
-  });
-
-  $(document).on('submit', 'form.pjax_fares_form', function (event) {
-    event.preventDefault();
-    $.pjax.submit(event, '#flight_fares_wrapper', {push: false});
-  });
-
-  $(document).on('pjax:complete', function () {
-    initPlugins();
-    setEditable();
-    setFieldsEditable();
-  });
-
-  $('a.airport_distance_lookup').click(async function (e) {
-     e.preventDefault();
-     const fromIcao = $("select#dpt_airport_id option:selected").val();
-     const toIcao = $("select#arr_airport_id option:selected").val();
-     console.log('fromIcao="' + fromIcao + '", toIcao="' + toIcao + '"');
-
-     if (fromIcao === '' || toIcao === '') {
-       return;
-     }
-
-     console.log(`Calculating from ${fromIcao} to ${toIcao}`);
-     let response;
-
-     try {
-       response = await phpvms.calculate_distance(fromIcao, toIcao);
-     } catch (e) {
-       console.log('Error calculating distance:', e);
-       return;
-     }
-
-     $("#distance").val(response.data.distance.nmi);
-  });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/flights/search.blade.php b/resources/views/admin/flights/search.blade.php
index 72b9c76d..4b3ef45b 100644
--- a/resources/views/admin/flights/search.blade.php
+++ b/resources/views/admin/flights/search.blade.php
@@ -1,23 +1,23 @@
 <div class="content">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="form-group">
-                {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="form-group">
+        {{ Form::open(['route' => 'admin.flights.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
 
-                {{ Form::label('flight_number', 'Flight Number:') }}
-                {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
-                &nbsp;
-                {{ Form::label('dpt_airport_id', 'Departure:') }}
-                {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control']) }}
-                &nbsp;
-                {{ Form::label('arr_airport_id', 'Arrival:') }}
-                {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control']) }}
-                &nbsp;
-                {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
-                &nbsp;
-                <a href="{{ route('admin.flights.index') }}">clear</a>
-                {{ Form::close() }}
-            </div>
-        </div>
+        {{ Form::label('flight_number', 'Flight Number:') }}
+        {{ Form::text('flight_number', null, ['class' => 'form-control']) }}
+        &nbsp;
+        {{ Form::label('dpt_airport_id', 'Departure:') }}
+        {{ Form::select('dpt_airport_id', $airports, null , ['class' => 'form-control']) }}
+        &nbsp;
+        {{ Form::label('arr_airport_id', 'Arrival:') }}
+        {{ Form::select('arr_airport_id', $airports, null , ['class' => 'form-control']) }}
+        &nbsp;
+        {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
+        &nbsp;
+        <a href="{{ route('admin.flights.index') }}">clear</a>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/show.blade.php b/resources/views/admin/flights/show.blade.php
index 6455236b..eb80a4e5 100644
--- a/resources/views/admin/flights/show.blade.php
+++ b/resources/views/admin/flights/show.blade.php
@@ -1,45 +1,45 @@
 @extends('admin.app')
 
 @section('content')
-<section class="content-header">
+  <section class="content-header">
     <h1 class="pull-left">{{ $flight->airline->code }}{{ $flight->flight_number }}</h1>
     <h1 class="pull-right">
-        <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
-           href="{{ route('admin.flights.edit', $flight->id) }}">Edit</a>
+      <a class="btn btn-primary pull-right" style="margin-top: -10px;margin-bottom: 5px"
+         href="{{ route('admin.flights.edit', $flight->id) }}">Edit</a>
     </h1>
-</section>
-<section class="content">
+  </section>
+  <section class="content">
     <div class="clearfix"></div>
     <div class="row">
-        @include('admin.flights.show_fields')
+      @include('admin.flights.show_fields')
     </div>
     <div class="box box-primary">
-        <div class="box-body">
-            <div class="row">
-                <div class="col-xs-12">
-                    <h3>assigned subfleets</h3>
-                    <div class="box-body">
-                        @include('admin.flights.subfleets')
-                    </div>
-                </div>
+      <div class="box-body">
+        <div class="row">
+          <div class="col-xs-12">
+            <h3>assigned subfleets</h3>
+            <div class="box-body">
+              @include('admin.flights.subfleets')
             </div>
+          </div>
         </div>
+      </div>
     </div>
-</section>
+  </section>
 @endsection
 @section('scripts')
-<script>
-$(document).ready(function () {
-    $(".select2_dropdown").select2();
+  <script>
+    $(document).ready(function () {
+      $(".select2_dropdown").select2();
 
-    $(document).on('submit', 'form.pjax_form', function (event) {
+      $(document).on('submit', 'form.pjax_form', function (event) {
         event.preventDefault();
         $.pjax.submit(event, '#subfleet_flight_wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function() {
+      $(document).on('pjax:complete', function () {
         $(".select2_dropdown").select2();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/flights/show_fields.blade.php b/resources/views/admin/flights/show_fields.blade.php
index 8468a70a..c51a6741 100644
--- a/resources/views/admin/flights/show_fields.blade.php
+++ b/resources/views/admin/flights/show_fields.blade.php
@@ -1,81 +1,81 @@
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
-        </div>
-        <div class="box-body"><p class="lead">
-            {{ $flight->dpt_airport->icao }} - {{ $flight->dpt_airport->name }}
-        </p></div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      {{--<i class="fa fa-text-width"></i>--}}
+      <h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
     </div>
+    <div class="box-body"><p class="lead">
+        {{ $flight->dpt_airport->icao }} - {{ $flight->dpt_airport->name }}
+      </p></div>
+  </div>
 </div>
 
 <div class="form-group col-sm-6">
-    <div class="box box-solid">
-        <div class="box-header with-border">
-            {{--<i class="fa fa-text-width"></i>--}}
-            <h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
-        </div>
-        <div class="box-body"><p class="lead">
-            {{ $flight->arr_airport->icao }} - {{ $flight->arr_airport->name }}
-            </p>
-        </div>
+  <div class="box box-solid">
+    <div class="box-header with-border">
+      {{--<i class="fa fa-text-width"></i>--}}
+      <h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
     </div>
+    <div class="box-body"><p class="lead">
+        {{ $flight->arr_airport->icao }} - {{ $flight->arr_airport->name }}
+      </p>
+    </div>
+  </div>
 </div>
 
 
 <div class="form-group col-sm-12">
-    <div class="box box-primary">
-        <div class="box-body">
-            <!-- Route Code Field -->
-            <div class="form-group">
-                {{ Form::label('route_code', 'Route Code:') }}
-                {{ $flight->route_code }}
-            </div>
+  <div class="box box-primary">
+    <div class="box-body">
+      <!-- Route Code Field -->
+      <div class="form-group">
+        {{ Form::label('route_code', 'Route Code:') }}
+        {{ $flight->route_code }}
+      </div>
 
-            <!-- Route Leg Field -->
-            <div class="form-group">
-                {{ Form::label('route_leg', 'Route Leg:') }}
-                {{ $flight->route_leg }}
-            </div>
+      <!-- Route Leg Field -->
+      <div class="form-group">
+        {{ Form::label('route_leg', 'Route Leg:') }}
+        {{ $flight->route_leg }}
+      </div>
 
-            <!-- Alt Airport Id Field -->
-            @if($flight->alt_airport_id)
-            <div class="form-group">
-                {{ Form::label('alt_airport_id', 'Alt Airport Id:') }}
-                <p>{{ $flight->alt_airport->icao }}</p>
-            </div>
-            @endif
-
-            <!-- Route Field -->
-            <div class="form-group">
-                {{ Form::label('route', 'Route:') }}
-                <p>{{ $flight->route }}</p>
-            </div>
-
-            <!-- Dpt Time Field -->
-            <div class="form-group">
-                {{ Form::label('dpt_time', 'Departure Time:') }}
-                {{ $flight->dpt_time }}
-            </div>
-
-            <!-- Arr Time Field -->
-            <div class="form-group">
-                {{ Form::label('arr_time', 'Arrival Time:') }}
-                {{ $flight->arr_time }}
-            </div>
-
-            <!-- Notes Field -->
-            <div class="form-group">
-                {{ Form::label('notes', 'Notes:') }}
-                <p>{{ $flight->notes }}</p>
-            </div>
-
-            <!-- Active Field -->
-            <div class="form-group">
-                {{ Form::label('active', 'Active:') }}
-                <p>{{ $flight->active }}</p>
-            </div>
+      <!-- Alt Airport Id Field -->
+      @if($flight->alt_airport_id)
+        <div class="form-group">
+          {{ Form::label('alt_airport_id', 'Alt Airport Id:') }}
+          <p>{{ $flight->alt_airport->icao }}</p>
         </div>
+    @endif
+
+    <!-- Route Field -->
+      <div class="form-group">
+        {{ Form::label('route', 'Route:') }}
+        <p>{{ $flight->route }}</p>
+      </div>
+
+      <!-- Dpt Time Field -->
+      <div class="form-group">
+        {{ Form::label('dpt_time', 'Departure Time:') }}
+        {{ $flight->dpt_time }}
+      </div>
+
+      <!-- Arr Time Field -->
+      <div class="form-group">
+        {{ Form::label('arr_time', 'Arrival Time:') }}
+        {{ $flight->arr_time }}
+      </div>
+
+      <!-- Notes Field -->
+      <div class="form-group">
+        {{ Form::label('notes', 'Notes:') }}
+        <p>{{ $flight->notes }}</p>
+      </div>
+
+      <!-- Active Field -->
+      <div class="form-group">
+        {{ Form::label('active', 'Active:') }}
+        <p>{{ $flight->active }}</p>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/subfleets.blade.php b/resources/views/admin/flights/subfleets.blade.php
index b95c2cea..c8eb6935 100644
--- a/resources/views/admin/flights/subfleets.blade.php
+++ b/resources/views/admin/flights/subfleets.blade.php
@@ -1,66 +1,66 @@
 <div id="subfleet_flight_wrapper">
-    <div class="header">
-        <h3>subfleets</h3>
-        @component('admin.components.info')
-            The subfleets that are assigned to this flight.
-        @endcomponent
-    </div>
+  <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' => 'subfleets'])
+  @if(count($flight->subfleets) === 0)
+    @include('admin.common.none_added', ['type' => 'subfleets'])
+  @endif
+
+  <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
-
-    <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>
-                <td>{{ $sf->type }}</td>
-                <td>{{ $sf->name }}</td>
-                <td style="width: 10%; text-align: center;" class="form-inline">
-                    {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/subfleets',
-                                    'method' => 'delete',
-                                    'class' => 'pjax_subfleet_form']) }}
-                    {{ Form::hidden('subfleet_id', $sf->id) }}
-                    <div class='btn-group'>
-                        {{ Form::button('<i class="fa fa-times"></i>',
-                                         ['type' => 'submit',
-                                          'class' => 'btn btn-danger btn-xs'])
-                          }}
-                    </div>
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="text-right">
-                {{ Form::open([
-                        'url' => '/admin/flights/'.$flight->id.'/subfleets',
-                        'method' => 'post',
-                        'class' => 'pjax_form form-inline pjax_subfleet_form'
-                    ])
-                }}
-                {{ Form::select('subfleet_id', $avail_subfleets, null, [
-                        'placeholder' => 'Select Subfleet',
-                        'class' => 'select2 form-control input-lg',
-                        'style' => 'width: 400px;',
-                    ])
-                }}&nbsp;
-                {{ Form::button('<i class="fas fa-plus"></i> add',
-                                 ['type' => 'submit',
-                                  'class' => 'btn btn-success btn-s']) }}
-                {{ Form::close() }}
-            </div>
-        </div>
+    <tbody>
+    @foreach($flight->subfleets as $sf)
+      <tr>
+        <td>{{ $sf->type }}</td>
+        <td>{{ $sf->name }}</td>
+        <td style="width: 10%; text-align: center;" class="form-inline">
+          {{ Form::open(['url' => '/admin/flights/'.$flight->id.'/subfleets',
+                          'method' => 'delete',
+                          'class' => 'pjax_subfleet_form']) }}
+          {{ Form::hidden('subfleet_id', $sf->id) }}
+          <div class='btn-group'>
+            {{ Form::button('<i class="fa fa-times"></i>',
+                             ['type' => 'submit',
+                              'class' => 'btn btn-danger btn-xs'])
+              }}
+          </div>
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open([
+                'url' => '/admin/flights/'.$flight->id.'/subfleets',
+                'method' => 'post',
+                'class' => 'pjax_form form-inline pjax_subfleet_form'
+            ])
+        }}
+        {{ Form::select('subfleet_id', $avail_subfleets, null, [
+                'placeholder' => 'Select Subfleet',
+                'class' => 'select2 form-control input-lg',
+                'style' => 'width: 400px;',
+            ])
+        }}&nbsp;
+        {{ Form::button('<i class="fas fa-plus"></i> add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-s']) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/flights/table.blade.php b/resources/views/admin/flights/table.blade.php
index fdad0dda..cafcff1f 100644
--- a/resources/views/admin/flights/table.blade.php
+++ b/resources/views/admin/flights/table.blade.php
@@ -1,50 +1,51 @@
 <div class="content table-responsive table-full-width">
-<table class="table table-hover" id="flights-table">
+  <table class="table table-hover" id="flights-table">
     <thead>
-        <th>Flight #</th>
-        <th>Dep</th>
-        <th>Arr</th>
-        {{--<th>Route</th>--}}
-        <th>Dpt Time</th>
-        <th>Arr Time</th>
-        <th>Notes</th>
-        <th style="text-align: center;">Active</th>
-        <th colspan="3" style="text-align: right;">Action</th>
+    <th>Flight #</th>
+    <th>Dep</th>
+    <th>Arr</th>
+    {{--<th>Route</th>--}}
+    <th>Dpt Time</th>
+    <th>Arr Time</th>
+    <th>Notes</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.edit', [$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>
-            <td style="text-align: center;">
-                @if($flight->active == 1)
-                    <span class="label label-success">@lang('common.active')</span>
-                @else
-                    <span class="label label-default">@lang('common.inactive')</span>
-                @endif
-            </td>
-            <td style="text-align: right;">
-                {{ Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.flights.edit', [$flight->id]) }}" class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
+      <tr>
+        <td>
+          <a href="{{ route('admin.flights.edit', [$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>
+        <td style="text-align: center;">
+          @if($flight->active == 1)
+            <span class="label label-success">@lang('common.active')</span>
+          @else
+            <span class="label label-default">@lang('common.inactive')</span>
+          @endif
+        </td>
+        <td style="text-align: right;">
+          {{ Form::open(['route' => ['admin.flights.destroy', $flight->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.flights.edit', [$flight->id]) }}" class='btn btn-sm btn-success btn-icon'><i
+              class="fas fa-pencil-alt"></i></a>
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
     @endforeach
     </tbody>
-</table>
+  </table>
 </div>
diff --git a/resources/views/admin/maintenance/caches.blade.php b/resources/views/admin/maintenance/caches.blade.php
index bfb5a01d..973d4a58 100644
--- a/resources/views/admin/maintenance/caches.blade.php
+++ b/resources/views/admin/maintenance/caches.blade.php
@@ -1,29 +1,29 @@
 <div class="row">
-    <div class="col-sm-12">
-        <div class="form-container">
-            <h6><i class="fas fa-clock"></i>
-                &nbsp;Reset Caches
-            </h6>
-            <div class="row" style="padding-top: 5px">
-                <div class="col-sm-4 text-center">
-                    {{ Form::open(['route' => 'admin.maintenance.cache']) }}
-                    {{ Form::hidden('type', 'all') }}
-                    {{ Form::button('Clear all caches', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                    {{ Form::close() }}
-                </div>
-                <div class="col-sm-4 text-center">
-                    {{ Form::open(['route' => 'admin.maintenance.cache']) }}
-                    {{ Form::hidden('type', 'application') }}
-                    {{ Form::button('Application', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                    {{ Form::close() }}
-                </div>
-                <div class="col-sm-4 text-center">
-                    {{ Form::open(['route' => 'admin.maintenance.cache']) }}
-                    {{ Form::hidden('type', 'views') }}
-                    {{ Form::button('Views', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                    {{ Form::close() }}
-                </div>
-            </div>
+  <div class="col-sm-12">
+    <div class="form-container">
+      <h6><i class="fas fa-clock"></i>
+        &nbsp;Reset Caches
+      </h6>
+      <div class="row" style="padding-top: 5px">
+        <div class="col-sm-4 text-center">
+          {{ Form::open(['route' => 'admin.maintenance.cache']) }}
+          {{ Form::hidden('type', 'all') }}
+          {{ Form::button('Clear all caches', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+          {{ Form::close() }}
         </div>
+        <div class="col-sm-4 text-center">
+          {{ Form::open(['route' => 'admin.maintenance.cache']) }}
+          {{ Form::hidden('type', 'application') }}
+          {{ Form::button('Application', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+          {{ Form::close() }}
+        </div>
+        <div class="col-sm-4 text-center">
+          {{ Form::open(['route' => 'admin.maintenance.cache']) }}
+          {{ Form::hidden('type', 'views') }}
+          {{ Form::button('Views', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+          {{ Form::close() }}
+        </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/maintenance/index.blade.php b/resources/views/admin/maintenance/index.blade.php
index f496f5fd..5771abf4 100644
--- a/resources/views/admin/maintenance/index.blade.php
+++ b/resources/views/admin/maintenance/index.blade.php
@@ -2,17 +2,17 @@
 
 @section('title', 'Maintenance')
 @section('content')
-    @include('flash::message')
+  @include('flash::message')
 
-    <div class="card border-blue-bottom">
-      <div class="content">
-        @include('admin.maintenance.cron')
-      </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.maintenance.cron')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.maintenance.caches')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.maintenance.caches')
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/menu.blade.php b/resources/views/admin/menu.blade.php
index 46725061..050437d9 100644
--- a/resources/views/admin/menu.blade.php
+++ b/resources/views/admin/menu.blade.php
@@ -1,100 +1,99 @@
-
 <li>
-    <a href="{{ url('/admin/dashboard') }}"><i class="pe-7s-display1"></i>dashboard</a>
+  <a href="{{ url('/admin/dashboard') }}"><i class="pe-7s-display1"></i>dashboard</a>
 </li>
 
 <li>
-    <a data-toggle="collapse" href="#operations_menu" class="menu operations_menu" aria-expanded="true">
-        <h5>operations&nbsp;<b class="pe-7s-angle-right"></b></h5>
-    </a>
+  <a data-toggle="collapse" href="#operations_menu" class="menu operations_menu" aria-expanded="true">
+    <h5>operations&nbsp;<b class="pe-7s-angle-right"></b></h5>
+  </a>
 
-    <div class="collapse" id="operations_menu" aria-expanded="true">
-        <ul class="nav">
-            @ability('admin', 'pireps')
-            <li><a href="{{ url('/admin/pireps') }}"><i class="pe-7s-cloud-upload"></i>pireps
-                    <span data-toggle="tooltip" title="3 New" class="badge bg-light-blue pull-right">3</span>
-                </a>
-            </li>
-            @endability
+  <div class="collapse" id="operations_menu" aria-expanded="true">
+    <ul class="nav">
+      @ability('admin', 'pireps')
+      <li><a href="{{ url('/admin/pireps') }}"><i class="pe-7s-cloud-upload"></i>pireps
+          <span data-toggle="tooltip" title="3 New" class="badge bg-light-blue pull-right">3</span>
+        </a>
+      </li>
+      @endability
 
-            @ability('admin', 'flights')
-            <li><a href="{{ url('/admin/flights') }}"><i class="pe-7s-vector"></i>flights</a></li>
-            @endability
+      @ability('admin', 'flights')
+      <li><a href="{{ url('/admin/flights') }}"><i class="pe-7s-vector"></i>flights</a></li>
+      @endability
 
-            @ability('admin', 'fleet')
-            <li><a href="{{ url('/admin/subfleets') }}"><i class="pe-7s-plane"></i>fleet</a></li>
-            @endability
+      @ability('admin', 'fleet')
+      <li><a href="{{ url('/admin/subfleets') }}"><i class="pe-7s-plane"></i>fleet</a></li>
+      @endability
 
-            @ability('admin', 'fares')
-            <li><a href="{{ url('/admin/fares') }}"><i class="pe-7s-graph2"></i>fares</a></li>
-            @endability
+      @ability('admin', 'fares')
+      <li><a href="{{ url('/admin/fares') }}"><i class="pe-7s-graph2"></i>fares</a></li>
+      @endability
 
-            @ability('admin', 'finances')
-            <li><a href="{{ url('/admin/finances') }}"><i class="pe-7s-display1"></i>finances</a></li>
-            @endability
+      @ability('admin', 'finances')
+      <li><a href="{{ url('/admin/finances') }}"><i class="pe-7s-display1"></i>finances</a></li>
+      @endability
 
-            @ability('admin', 'users')
-            <li><a href="{{ url('/admin/users') }}"><i class="pe-7s-users"></i>users</a></li>
-            @endability
-        </ul>
-    </div>
+      @ability('admin', 'users')
+      <li><a href="{{ url('/admin/users') }}"><i class="pe-7s-users"></i>users</a></li>
+      @endability
+    </ul>
+  </div>
 </li>
 
 <li>
-    <a data-toggle="collapse" href="#config_menu" class="menu config_menu" aria-expanded="true">
-        <h5>config&nbsp;<b class="pe-7s-angle-right"></b></h5>
-    </a>
+  <a data-toggle="collapse" href="#config_menu" class="menu config_menu" aria-expanded="true">
+    <h5>config&nbsp;<b class="pe-7s-angle-right"></b></h5>
+  </a>
 
-    <div class="collapse" id="config_menu" aria-expanded="true">
-        <ul class="nav">
-            @ability('admin', 'airlines')
-            <li><a href="{{ url('/admin/airlines') }}"><i class="pe-7s-paper-plane"></i>airlines</a></li>
-            @endability
+  <div class="collapse" id="config_menu" aria-expanded="true">
+    <ul class="nav">
+      @ability('admin', 'airlines')
+      <li><a href="{{ url('/admin/airlines') }}"><i class="pe-7s-paper-plane"></i>airlines</a></li>
+      @endability
 
-            @ability('admin', 'airports')
-            <li><a href="{{ url('/admin/airports') }}"><i class="pe-7s-map-marker"></i>airports</a></li>
-            @endability
+      @ability('admin', 'airports')
+      <li><a href="{{ url('/admin/airports') }}"><i class="pe-7s-map-marker"></i>airports</a></li>
+      @endability
 
-            @ability('admin', 'finances')
-            <li><a href="{{ url('/admin/expenses') }}"><i class="pe-7s-cash"></i>expenses</a></li>
-            @endability
+      @ability('admin', 'finances')
+      <li><a href="{{ url('/admin/expenses') }}"><i class="pe-7s-cash"></i>expenses</a></li>
+      @endability
 
-            @ability('admin', 'ranks')
-            <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
-            @endability
+      @ability('admin', 'ranks')
+      <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
+      @endability
 
-            @ability('admin', 'awards')
-            <li><a href="{!! url('/admin/awards') !!}"><i class="pe-7s-diamond"></i>awards</a></li>
-            @endability
+      @ability('admin', 'awards')
+      <li><a href="{!! url('/admin/awards') !!}"><i class="pe-7s-diamond"></i>awards</a></li>
+      @endability
 
-            @ability('admin', 'users')
-            <li><a href="{!! url('/admin/roles') !!}"><i class="pe-7s-network"></i>roles</a></li>
-            @endability
+      @ability('admin', 'users')
+      <li><a href="{!! url('/admin/roles') !!}"><i class="pe-7s-network"></i>roles</a></li>
+      @endability
 
-            @ability('admin', 'settings')
-            <li><a href="{{ url('/admin/settings') }}"><i class="pe-7s-config"></i>settings</a></li>
-            @endability
+      @ability('admin', 'settings')
+      <li><a href="{{ url('/admin/settings') }}"><i class="pe-7s-config"></i>settings</a></li>
+      @endability
 
-            @ability('admin', 'maintenance')
-            <li><a href="{{ url('/admin/maintenance') }}"><i class="pe-7s-tools"></i>maintenance</a></li>
-            @endability
-        </ul>
-    </div>
+      @ability('admin', 'maintenance')
+      <li><a href="{{ url('/admin/maintenance') }}"><i class="pe-7s-tools"></i>maintenance</a></li>
+      @endability
+    </ul>
+  </div>
 </li>
 
 <li>
-    <a data-toggle="collapse" href="#addons_menu" class="menu addons_menu" aria-expanded="true">
-        <h5>addons&nbsp;<b class="pe-7s-angle-right"></b></h5>
-    </a>
+  <a data-toggle="collapse" href="#addons_menu" class="menu addons_menu" aria-expanded="true">
+    <h5>addons&nbsp;<b class="pe-7s-angle-right"></b></h5>
+  </a>
 
-    <div class="collapse" id="addons_menu" aria-expanded="true">
-        <ul class="nav">
-            @ability('admin', 'addons')
-            @foreach($moduleSvc->getAdminLinks() as &$link)
-                <li><a href="{{ url($link['url']) }}"><i class="{{ $link['icon'] }}"></i>{{ $link['title'] }}</a></li>
-            @endforeach
-            @endability
-        </ul>
-    </div>
+  <div class="collapse" id="addons_menu" aria-expanded="true">
+    <ul class="nav">
+      @ability('admin', 'addons')
+      @foreach($moduleSvc->getAdminLinks() as &$link)
+        <li><a href="{{ url($link['url']) }}"><i class="{{ $link['icon'] }}"></i>{{ $link['title'] }}</a></li>
+      @endforeach
+      @endability
+    </ul>
+  </div>
 </li>
 
diff --git a/resources/views/admin/pagination/bootstrap-4.blade.php b/resources/views/admin/pagination/bootstrap-4.blade.php
index 3fe813a1..346b2252 100644
--- a/resources/views/admin/pagination/bootstrap-4.blade.php
+++ b/resources/views/admin/pagination/bootstrap-4.blade.php
@@ -1,34 +1,34 @@
 <ul class="pagination">
-    <!-- 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>
+  <!-- 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="page-item disabled"><span class="page-link">{{ $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>
+  <!-- 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
-
-        <!-- 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
-
-    <!-- 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>
+      @endforeach
     @endif
+  @endforeach
+
+<!-- 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>
diff --git a/resources/views/admin/pagination/default.blade.php b/resources/views/admin/pagination/default.blade.php
index 1552cbca..9d49b2b2 100644
--- a/resources/views/admin/pagination/default.blade.php
+++ b/resources/views/admin/pagination/default.blade.php
@@ -1,34 +1,34 @@
 <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>
+  <!-- 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
+
+<!-- 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="disabled"><span>{{ $element }}</span></li>
+  <!-- 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>
         @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>
-                @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>
+      @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>
diff --git a/resources/views/admin/pagination/semantic-ui.blade.php b/resources/views/admin/pagination/semantic-ui.blade.php
index c6e0d210..cd36853b 100644
--- a/resources/views/admin/pagination/semantic-ui.blade.php
+++ b/resources/views/admin/pagination/semantic-ui.blade.php
@@ -1,36 +1,36 @@
 @if ($paginator->hasPages())
-    <div class="ui pagination menu">
-        {{-- Previous Page Link --}}
-        @if ($paginator->onFirstPage())
-            <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
-        @else
-            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
-        @endif
+  <div class="ui pagination menu">
+    {{-- Previous Page Link --}}
+    @if ($paginator->onFirstPage())
+      <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
+    @else
+      <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
+    @endif
 
-        {{-- Pagination Elements --}}
-        @foreach ($elements as $element)
-            {{-- "Three Dots" Separator --}}
-            @if (is_string($element))
-                <a class="icon item disabled">{{ $element }}</a>
-            @endif
+    {{-- Pagination Elements --}}
+    @foreach ($elements as $element)
+      {{-- "Three Dots" Separator --}}
+      @if (is_string($element))
+        <a class="icon item disabled">{{ $element }}</a>
+      @endif
 
-            {{-- Array Of Links --}}
-            @if (is_array($element))
-                @foreach ($element as $page => $url)
-                    @if ($page == $paginator->currentPage())
-                        <a class="item active" href="{{ $url }}">{{ $page }}</a>
-                    @else
-                        <a class="item" href="{{ $url }}">{{ $page }}</a>
-                    @endif
-                @endforeach
-            @endif
+      {{-- Array Of Links --}}
+      @if (is_array($element))
+        @foreach ($element as $page => $url)
+          @if ($page == $paginator->currentPage())
+            <a class="item active" href="{{ $url }}">{{ $page }}</a>
+          @else
+            <a class="item" href="{{ $url }}">{{ $page }}</a>
+          @endif
         @endforeach
+      @endif
+    @endforeach
 
-        {{-- Next Page Link --}}
-        @if ($paginator->hasMorePages())
-            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
-        @else
-            <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
-        @endif
-    </div>
+    {{-- Next Page Link --}}
+    @if ($paginator->hasMorePages())
+      <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
+    @else
+      <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
+    @endif
+  </div>
 @endif
diff --git a/resources/views/admin/pagination/simple-bootstrap-4.blade.php b/resources/views/admin/pagination/simple-bootstrap-4.blade.php
index 878fcf92..bd4c9a2a 100644
--- a/resources/views/admin/pagination/simple-bootstrap-4.blade.php
+++ b/resources/views/admin/pagination/simple-bootstrap-4.blade.php
@@ -1,15 +1,15 @@
 <ul class="pagination">
-    <!-- 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
+  <!-- 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
 
-    <!-- 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
+<!-- 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>
diff --git a/resources/views/admin/pagination/simple-default.blade.php b/resources/views/admin/pagination/simple-default.blade.php
index dce63ebd..04f89834 100644
--- a/resources/views/admin/pagination/simple-default.blade.php
+++ b/resources/views/admin/pagination/simple-default.blade.php
@@ -1,15 +1,15 @@
 <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
+  <!-- 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
 
-    <!-- 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
+<!-- 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>
diff --git a/resources/views/admin/pirepfields/create.blade.php b/resources/views/admin/pirepfields/create.blade.php
index 82bd210e..f55e2cff 100644
--- a/resources/views/admin/pirepfields/create.blade.php
+++ b/resources/views/admin/pirepfields/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Adding Field')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.pirepfields.store']) }}
-                @include('admin.pirepfields.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.pirepfields.store']) }}
+      @include('admin.pirepfields.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/pirepfields/edit.blade.php b/resources/views/admin/pirepfields/edit.blade.php
index 71bcc871..3c042a5e 100644
--- a/resources/views/admin/pirepfields/edit.blade.php
+++ b/resources/views/admin/pirepfields/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Editing ' . $field->name)
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-       {{ Form::model($field, ['route' => ['admin.pirepfields.update', $field->id], 'method' => 'patch']) }}
-            @include('admin.pirepfields.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+      {{ Form::model($field, ['route' => ['admin.pirepfields.update', $field->id], 'method' => 'patch']) }}
+      @include('admin.pirepfields.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/pirepfields/fields.blade.php b/resources/views/admin/pirepfields/fields.blade.php
index d9446a13..b7820d40 100644
--- a/resources/views/admin/pirepfields/fields.blade.php
+++ b/resources/views/admin/pirepfields/fields.blade.php
@@ -1,21 +1,21 @@
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('name', 'Name:') }}&nbsp;&nbsp;<span class="required">*</span>
-        {{ 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('name', 'Name:') }}&nbsp;&nbsp;<span class="required">*</span>
+    {{ Form::text('name', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('name') }}</p>
+  </div>
 
-    <!-- Required Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('required', 'Required:') }}
-        {{ Form::hidden('required', 0) }}
-        {{ Form::checkbox('required', null) }}
-    </div>
+  <!-- Required Field -->
+  <div class="form-group col-sm-6">
+    {{ Form::label('required', 'Required:') }}
+    {{ Form::hidden('required', 0) }}
+    {{ Form::checkbox('required', null) }}
+  </div>
 </div>
 <div class="row">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-        <a href="{{ route('admin.pirepfields.index') }}" class="btn btn-default">Cancel</a>
-    </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+    <a href="{{ route('admin.pirepfields.index') }}" class="btn btn-default">Cancel</a>
+  </div>
 </div>
diff --git a/resources/views/admin/pirepfields/index.blade.php b/resources/views/admin/pirepfields/index.blade.php
index 9013253c..b4751e31 100644
--- a/resources/views/admin/pirepfields/index.blade.php
+++ b/resources/views/admin/pirepfields/index.blade.php
@@ -1,14 +1,14 @@
 @extends('admin.app')
 @section('title', 'PIREP Fields')
 @section('actions')
-    <li><a href="{{ route('admin.pirepfields.create') }}"><i class="ti-plus"></i>Add
-            Field</a></li>
+  <li><a href="{{ route('admin.pirepfields.create') }}"><i class="ti-plus"></i>Add
+      Field</a></li>
 @endsection
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.pirepfields.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.pirepfields.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/pirepfields/show.blade.php b/resources/views/admin/pirepfields/show.blade.php
index 224a6c92..3b26f5d9 100644
--- a/resources/views/admin/pirepfields/show.blade.php
+++ b/resources/views/admin/pirepfields/show.blade.php
@@ -1,17 +1,17 @@
 @extends('layouts.app')
 
 @section('content')
-    <section class="content-header">
-        <h1>{{ $pirepFields->name }}</h1>
-    </section>
-    <div class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row" style="padding-left: 20px">
-                    @include('admin.pirepfields.show_fields')
-                    <a href="{{ route('admin.pirepfields.index') }}" class="btn btn-default">Back</a>
-                </div>
-            </div>
+  <section class="content-header">
+    <h1>{{ $pirepFields->name }}</h1>
+  </section>
+  <div class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="row" style="padding-left: 20px">
+          @include('admin.pirepfields.show_fields')
+          <a href="{{ route('admin.pirepfields.index') }}" class="btn btn-default">Back</a>
         </div>
+      </div>
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/pirepfields/show_fields.blade.php b/resources/views/admin/pirepfields/show_fields.blade.php
index 4e6c0dad..84b92a0f 100644
--- a/resources/views/admin/pirepfields/show_fields.blade.php
+++ b/resources/views/admin/pirepfields/show_fields.blade.php
@@ -1,30 +1,30 @@
 <!-- Id Field -->
 <div class="form-group">
-    {{ Form::label('id', 'Id:') }}
-    <p>{{ $field->id }}</p>
+  {{ Form::label('id', 'Id:') }}
+  <p>{{ $field->id }}</p>
 </div>
 
 <!-- Name Field -->
 <div class="form-group">
-    {{ Form::label('name', 'Name:') }}
-    <p>{{ $field->name }}</p>
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $field->name }}</p>
 </div>
 
 <!-- Required Field -->
 <div class="form-group">
-    {{ Form::label('required', 'Required:') }}
-    <p>{{ $field->required }}</p>
+  {{ Form::label('required', 'Required:') }}
+  <p>{{ $field->required }}</p>
 </div>
 
 <!-- Created At Field -->
 <div class="form-group">
-    {{ Form::label('created_at', 'Created At:') }}
-    <p>{{ show_datetime($field->created_at) }}</p>
+  {{ Form::label('created_at', 'Created At:') }}
+  <p>{{ show_datetime($field->created_at) }}</p>
 </div>
 
 <!-- Updated At Field -->
 <div class="form-group">
-    {{ Form::label('updated_at', 'Updated At:') }}
-    <p>{{ show_datetime($field->updated_at) }}</p>
+  {{ Form::label('updated_at', 'Updated At:') }}
+  <p>{{ show_datetime($field->updated_at) }}</p>
 </div>
 
diff --git a/resources/views/admin/pirepfields/table.blade.php b/resources/views/admin/pirepfields/table.blade.php
index 48f02889..5717c5ce 100644
--- a/resources/views/admin/pirepfields/table.blade.php
+++ b/resources/views/admin/pirepfields/table.blade.php
@@ -1,39 +1,39 @@
 <div class="content table-responsive table-full-width">
 
-    <div class="header">
-        @component('admin.components.info')
-            PIREP fields are only shown for manual PIREPs.
-        @endcomponent
-    </div>
+  <div class="header">
+    @component('admin.components.info')
+      PIREP fields are only shown for manual PIREPs.
+    @endcomponent
+  </div>
 
-    <table class="table table-hover table-responsive" id="pirepFields-table">
+  <table class="table table-hover table-responsive" id="pirepFields-table">
     <thead>
-        <th>Name</th>
-        <th style="text-align: center;">Required</th>
-        <th></th>
+    <th>Name</th>
+    <th style="text-align: center;">Required</th>
+    <th></th>
     </thead>
     <tbody>
     @foreach($fields as $field)
-        <tr>
-            <td>{{ $field->name }}</td>
-            <td style="text-align: center;">
-                @if($field->required === true)
-                    <span class="label label-success">Required</span>
-                @endif
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.pirepfields.destroy', $field->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.pirepfields.edit', [$field->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
+      <tr>
+        <td>{{ $field->name }}</td>
+        <td style="text-align: center;">
+          @if($field->required === true)
+            <span class="label label-success">Required</span>
+          @endif
+        </td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.pirepfields.destroy', $field->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.pirepfields.edit', [$field->id]) }}"
+             class='btn btn-sm btn-success btn-icon'>
+            <i class="fas fa-pencil-alt"></i></a>
 
-                {{ Form::button('<i class="fa fa-times"></i>',
-                             ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
-                              'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
+          {{ Form::button('<i class="fa fa-times"></i>',
+                       ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
+                        'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
     @endforeach
     </tbody>
-</table>
+  </table>
 </div>
diff --git a/resources/views/admin/pireps/actions.blade.php b/resources/views/admin/pireps/actions.blade.php
index 7ef52758..5c4a3b8a 100644
--- a/resources/views/admin/pireps/actions.blade.php
+++ b/resources/views/admin/pireps/actions.blade.php
@@ -1,41 +1,42 @@
 <table class="">
-    <tr>
-        <td>
-            @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
-                {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
-                                'method' => 'post',
-                                'name' => 'accept_'.$pirep->id,
-                                'id' => $pirep->id.'_accept',
-                                'pirep_id' => $pirep->id,
-                                'new_status' => PirepState::ACCEPTED,
-                                'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
-                {{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-                {{ Form::close() }}
-            @endif
-        </td>
-        <td>&nbsp;</td>
-        <td>
-            @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
-                {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
-                                'method' => 'post',
-                                'name' => 'reject_'.$pirep->id,
-                                'id' => $pirep->id.'_reject',
-                                'pirep_id' => $pirep->id,
-                                'new_status' => PirepState::REJECTED,
-                                'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
-                {{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) }}
-                {{ Form::close() }}
-            @endif
-        </td>
-        <td>&nbsp;</td>
-        @if ($on_edit_page === false)
-        <td>
-            <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
-            <button type="submit"
-               class='btn btn-info'>
-                <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit</button>
-            </form>
-        </td>
-        @endif
-    </tr>
+  <tr>
+    <td>
+      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::REJECTED)
+        {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
+                        'method' => 'post',
+                        'name' => 'accept_'.$pirep->id,
+                        'id' => $pirep->id.'_accept',
+                        'pirep_id' => $pirep->id,
+                        'new_status' => PirepState::ACCEPTED,
+                        'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
+        {{ Form::button('Accept', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+        {{ Form::close() }}
+      @endif
+    </td>
+    <td>&nbsp;</td>
+    <td>
+      @if($pirep->state === PirepState::PENDING || $pirep->state === PirepState::ACCEPTED)
+        {{ Form::open(['url' => route('admin.pirep.status', [$pirep->id]),
+                        'method' => 'post',
+                        'name' => 'reject_'.$pirep->id,
+                        'id' => $pirep->id.'_reject',
+                        'pirep_id' => $pirep->id,
+                        'new_status' => PirepState::REJECTED,
+                        'class' => $on_edit_page ? 'pirep_change_status': 'pirep_submit_status']) }}
+        {{ Form::button('Reject', ['type' => 'submit', 'class' => 'btn btn-danger']) }}
+        {{ Form::close() }}
+      @endif
+    </td>
+    <td>&nbsp;</td>
+    @if ($on_edit_page === false)
+      <td>
+        <form action="{{ route('admin.pireps.edit', [$pirep->id]) }}">
+          <button type="submit"
+                  class='btn btn-info'>
+            <i class="fas fa-pencil-alt"></i>&nbsp;&nbsp;Edit
+          </button>
+        </form>
+      </td>
+    @endif
+  </tr>
 </table>
diff --git a/resources/views/admin/pireps/comments.blade.php b/resources/views/admin/pireps/comments.blade.php
index 8ae0d6da..8d07554e 100644
--- a/resources/views/admin/pireps/comments.blade.php
+++ b/resources/views/admin/pireps/comments.blade.php
@@ -1,47 +1,47 @@
 <div id="pirep_comments_wrapper" class="col-12">
-    <table class="table table-responsive" id="pireps-comments-table">
-        <thead>
-        <th></th>
-        <th></th>
-        <th></th>
-        </thead>
-        <tbody>
-        @foreach($pirep->comments as $comment)
-            <tr>
-                <td width="1%" nowrap="" style="vertical-align: text-top">
-                    <a href="{{ route('admin.users.show', [$comment->user_id]) }}">
-                        {{ $comment->user->name }}
-                    </a>
-                </td>
-                <td>
-                    <p>{{ $comment->comment }}</p>
-                    <p class="small">{{ show_datetime($comment->created_at) }}</p>
-                </td>
-                <td align="right">
-                    {{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
-                                'method' => 'delete', 'class' => 'pjax_form form-inline']) }}
-                    {{ Form::hidden('comment_id', $comment->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
-                                     'class' => 'btn btn-danger btn-small',
-                                     'onclick' => "return confirm('Are you sure?')",
-                                     ]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                {{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
-                                'method' => 'post', 'class' => 'pjax_form form-inline']) }}
-                {{ Form::input('text', 'comment', null, ['class' => 'form-control input-sm']) }}
-                {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
-                                 'class' => 'btn btn-success btn-small']) }}
-                {{ Form::close() }}
-            </div>
-        </div>
+  <table class="table table-responsive" id="pireps-comments-table">
+    <thead>
+    <th></th>
+    <th></th>
+    <th></th>
+    </thead>
+    <tbody>
+    @foreach($pirep->comments as $comment)
+      <tr>
+        <td width="1%" nowrap="" style="vertical-align: text-top">
+          <a href="{{ route('admin.users.show', [$comment->user_id]) }}">
+            {{ $comment->user->name }}
+          </a>
+        </td>
+        <td>
+          <p>{{ $comment->comment }}</p>
+          <p class="small">{{ show_datetime($comment->created_at) }}</p>
+        </td>
+        <td align="right">
+          {{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
+                      'method' => 'delete', 'class' => 'pjax_form form-inline']) }}
+          {{ Form::hidden('comment_id', $comment->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
+                           'class' => 'btn btn-danger btn-small',
+                           'onclick' => "return confirm('Are you sure?')",
+                           ]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="text-right">
+        {{ Form::open(['url' => url('/admin/pireps/'.$pirep->id.'/comments'),
+                        'method' => 'post', 'class' => 'pjax_form form-inline']) }}
+        {{ Form::input('text', 'comment', null, ['class' => 'form-control input-sm']) }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
+                         'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/pireps/create.blade.php b/resources/views/admin/pireps/create.blade.php
index 9169acd8..6fd06371 100644
--- a/resources/views/admin/pireps/create.blade.php
+++ b/resources/views/admin/pireps/create.blade.php
@@ -2,13 +2,13 @@
 @section('title', 'Create PIREP')
 
 <div class="content">
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.pireps.store']) }}
-            @include('admin.pireps.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.pireps.store']) }}
+      @include('admin.pireps.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 </div>
 @endsection
 @include('admin.pireps.scripts')
diff --git a/resources/views/admin/pireps/edit.blade.php b/resources/views/admin/pireps/edit.blade.php
index 3567a128..f4b4b2e5 100644
--- a/resources/views/admin/pireps/edit.blade.php
+++ b/resources/views/admin/pireps/edit.blade.php
@@ -2,59 +2,60 @@
 @section('title', 'Edit ' . $pirep->ident )
 
 @section('content')
-<div class="content">
-   <div class="card border-blue-bottom">
-       <div class="content">
-
-            {{-- pulled out to here otherwise the form::close() within a form undo it --}}
-           <div class="row">
-               <div class="col-md-8">
-                   <h5 style="margin-top: 0px;">
-                       Filed By: <a href="{{ route('admin.users.edit', [$pirep->user_id]) }}" target="_blank">
-                           {{ $pirep->user->ident }} {{ $pirep->user->name }}
-                       </a>
-                   </h5>
-               </div>
-               <div class="col-md-4">
-                   <div class="pull-right">
-                       @include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => true])
-                   </div>
-               </div>
-           </div>
-
-           {{ Form::model($pirep, ['route' => ['admin.pireps.update', $pirep->id], 'method' => 'patch']) }}
-                @include('admin.pireps.fields')
-           {{ Form::close() }}
-       </div>
-   </div>
-
+  <div class="content">
     <div class="card border-blue-bottom">
-        <div class="content">
-            <h4>comments</h4>
-            @include('admin.pireps.comments')
-        </div>
-    </div>
+      <div class="content">
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <h4>flight log</h4>
-            @include('admin.pireps.flight_log')
-        </div>
-    </div>
-
-    <div class="card border-blue-bottom">
-        <div class="content">
+        {{-- pulled out to here otherwise the form::close() within a form undo it --}}
+        <div class="row">
+          <div class="col-md-8">
+            <h5 style="margin-top: 0px;">
+              Filed By: <a href="{{ route('admin.users.edit', [$pirep->user_id]) }}" target="_blank">
+                {{ $pirep->user->ident }} {{ $pirep->user->name }}
+              </a>
+            </h5>
+          </div>
+          <div class="col-md-4">
             <div class="pull-right">
-                <button id="recalculate-finances"
-                        class="btn btn-success"
-                        data-pirep-id="{{ $pirep->id }}">Recalcuate Finances</button>
+              @include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => true])
             </div>
-            <h4>transactions</h4>
-            @include('admin.pireps.transactions')
+          </div>
         </div>
+
+        {{ Form::model($pirep, ['route' => ['admin.pireps.update', $pirep->id], 'method' => 'patch']) }}
+        @include('admin.pireps.fields')
+        {{ Form::close() }}
+      </div>
     </div>
 
-</div>
+    <div class="card border-blue-bottom">
+      <div class="content">
+        <h4>comments</h4>
+        @include('admin.pireps.comments')
+      </div>
+    </div>
+
+    <div class="card border-blue-bottom">
+      <div class="content">
+        <h4>flight log</h4>
+        @include('admin.pireps.flight_log')
+      </div>
+    </div>
+
+    <div class="card border-blue-bottom">
+      <div class="content">
+        <div class="pull-right">
+          <button id="recalculate-finances"
+                  class="btn btn-success"
+                  data-pirep-id="{{ $pirep->id }}">Recalcuate Finances
+          </button>
+        </div>
+        <h4>transactions</h4>
+        @include('admin.pireps.transactions')
+      </div>
+    </div>
+
+  </div>
 @endsection
 
 @include('admin.pireps.scripts')
diff --git a/resources/views/admin/pireps/fares.blade.php b/resources/views/admin/pireps/fares.blade.php
index 6bac7c01..928eb2f6 100644
--- a/resources/views/admin/pireps/fares.blade.php
+++ b/resources/views/admin/pireps/fares.blade.php
@@ -1,30 +1,30 @@
 @if($aircraft)
-<table class="table table-hover table-responsive">
+  <table class="table table-hover table-responsive">
     <thead>
-        <th>Fare</th>
-        <th>Count</th>
+    <th>Fare</th>
+    <th>Count</th>
     </thead>
     </thead>
     <tbody>
     @foreach($aircraft->subfleet->fares as $fare)
-    <tr>
+      <tr>
         <td>{{ $fare->name }} ({{ $fare->code }})</td>
         <td>
-            <div class="form-group">
-                @if(isset($pirep) && $pirep->read_only)
-                    <p>{{ $pirep->{'fare_'.$fare->id} }}</p>
-                    {{ Form::hidden('fare_'.$fare->id) }}
-                @else
-                    {{ Form::number('fare_'.$fare->id, null, [
-                        'class' => 'form-control',
-                        'min' => 0,
-                        'step' => '0.01',
-                        ]) }}
-                @endif
-            </div>
+          <div class="form-group">
+            @if(isset($pirep) && $pirep->read_only)
+              <p>{{ $pirep->{'fare_'.$fare->id} }}</p>
+              {{ Form::hidden('fare_'.$fare->id) }}
+            @else
+              {{ Form::number('fare_'.$fare->id, null, [
+                  'class' => 'form-control',
+                  'min' => 0,
+                  'step' => '0.01',
+                  ]) }}
+            @endif
+          </div>
         </td>
-    </tr>
+      </tr>
     @endforeach
     </tbody>
-</table>
+  </table>
 @endif
diff --git a/resources/views/admin/pireps/field_values.blade.php b/resources/views/admin/pireps/field_values.blade.php
index 95b37d3f..822d9998 100644
--- a/resources/views/admin/pireps/field_values.blade.php
+++ b/resources/views/admin/pireps/field_values.blade.php
@@ -1,36 +1,36 @@
 <table class="table table-responsive table-hover" id="flight-fields-table">
-    @if(count($pirep->fields))
+  @if(count($pirep->fields))
     <thead>
     <th></th>
     <th>Value</th>
     <th>Source</th>
     </thead>
-    @endif
-    <tbody>
-    @foreach($pirep->fields as $field)
-        <tr>
-            <td>
-                {{ $field->name }}
-                @if($field->required === true)
-                    <span class="text-danger">*</span>
-                @endif
-            </td>
-            <td>
-                <div class="form-group">
-                    @if(!$field->read_only)
-                        {{ Form::text($field->slug, $field->value, [
-                            'class' => 'form-control'
-                            ]) }}
-                    @else
-                        <p>{{ $field->value }}</p>
-                    @endif
-                </div>
-                <p class="text-danger">{{ $errors->first($field->slug) }}</p>
-            </td>
-            <td>
-                {{ PirepSource::label($field->source) }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+  @endif
+  <tbody>
+  @foreach($pirep->fields as $field)
+    <tr>
+      <td>
+        {{ $field->name }}
+        @if($field->required === true)
+          <span class="text-danger">*</span>
+        @endif
+      </td>
+      <td>
+        <div class="form-group">
+          @if(!$field->read_only)
+            {{ Form::text($field->slug, $field->value, [
+                'class' => 'form-control'
+                ]) }}
+          @else
+            <p>{{ $field->value }}</p>
+          @endif
+        </div>
+        <p class="text-danger">{{ $errors->first($field->slug) }}</p>
+      </td>
+      <td>
+        {{ PirepSource::label($field->source) }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/pireps/fields.blade.php b/resources/views/admin/pireps/fields.blade.php
index 506cc101..2dbd9fa6 100644
--- a/resources/views/admin/pireps/fields.blade.php
+++ b/resources/views/admin/pireps/fields.blade.php
@@ -1,248 +1,248 @@
 @if(!empty($pirep) && $pirep->read_only)
-   <div class="row">
-       <div class="col-sm-12">
-           @component('admin.components.info')
-               Once a PIREP has been accepted/rejected, certain fields go into read-only mode.
-           @endcomponent
-       </div>
-   </div>
+  <div class="row">
+    <div class="col-sm-12">
+      @component('admin.components.info')
+        Once a PIREP has been accepted/rejected, certain fields go into read-only mode.
+      @endcomponent
+    </div>
+  </div>
 @endif
 <div class="row">
-    <div class="col-xl-12">
-        <div class="form-container">
-            <h6><i class="fas fa-info-circle"></i>
-                &nbsp;Flight Information
-            </h6>
-            <div class="form-container-body">
+  <div class="col-xl-12">
+    <div class="form-container">
+      <h6><i class="fas fa-info-circle"></i>
+        &nbsp;Flight Information
+      </h6>
+      <div class="form-container-body">
 
-                <div class="row">
-                    <div class="form-group col-sm-6">
-                        {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
-                        @if($pirep->read_only)
-                            <p>{{ $pirep->ident }}
-                                {{ Form::hidden('flight_number') }}
-                                {{ Form::hidden('flight_code') }}
-                                {{ Form::hidden('flight_leg') }}
-                            </p>
-                        @else
-                            <div class="row">
-                                <div class="col-sm-4">
-                                    {{ Form::text('flight_number', null, [
-                                            'placeholder' => 'Flight Number',
-                                            'class' => 'form-control']) }}
-                                    <p class="text-danger">{{ $errors->first('flight_number') }}</p>
-                                </div>
-                                <div class="col-sm-4">
-                                    {{ Form::text('route_code', null, [
-                                            'placeholder' => 'Code (optional)',
-                                            'class' => 'form-control']) }}
-                                    <p class="text-danger">{{ $errors->first('route_code') }}</p>
-                                </div>
-                                <div class="col-sm-4">
-                                    {{ Form::text('route_leg', null, [
-                                            'placeholder' => 'Leg (optional)',
-                                            'class' => 'form-control']) }}
-                                    <p class="text-danger">{{ $errors->first('route_leg') }}</p>
-                                </div>
-                            </div>
-                        @endif
-                    </div>
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('flight_type', 'Flight Type') }}
-                        {{ Form::select('flight_type',
-                            \App\Models\Enums\FlightType::select(),
-                            null, [
-                                'class' => 'form-control select2',
-                                'readonly' => $pirep->read_only
-                            ])
-                        }}
-                        <p class="text-danger">{{ $errors->first('flight_type') }}</p>
-                    </div>
-                    <div class="form-group col-sm-3">
-                        <p class="description">Filed Via:</p>
-                        {{ PirepSource::label($pirep->source) }}
-                        @if(filled($pirep->source_name))
-                            ({{ $pirep->source_name }})
-                        @endif
-                    </div>
+        <div class="row">
+          <div class="form-group col-sm-6">
+            {{ Form::label('flight_number', 'Flight Number/Route Code/Leg') }}
+            @if($pirep->read_only)
+              <p>{{ $pirep->ident }}
+                {{ Form::hidden('flight_number') }}
+                {{ Form::hidden('flight_code') }}
+                {{ Form::hidden('flight_leg') }}
+              </p>
+            @else
+              <div class="row">
+                <div class="col-sm-4">
+                  {{ Form::text('flight_number', null, [
+                          'placeholder' => 'Flight Number',
+                          'class' => 'form-control']) }}
+                  <p class="text-danger">{{ $errors->first('flight_number') }}</p>
                 </div>
-            </div>
+                <div class="col-sm-4">
+                  {{ Form::text('route_code', null, [
+                          'placeholder' => 'Code (optional)',
+                          'class' => 'form-control']) }}
+                  <p class="text-danger">{{ $errors->first('route_code') }}</p>
+                </div>
+                <div class="col-sm-4">
+                  {{ Form::text('route_leg', null, [
+                          'placeholder' => 'Leg (optional)',
+                          'class' => 'form-control']) }}
+                  <p class="text-danger">{{ $errors->first('route_leg') }}</p>
+                </div>
+              </div>
+            @endif
+          </div>
+          <div class="form-group col-sm-3">
+            {{ Form::label('flight_type', 'Flight Type') }}
+            {{ Form::select('flight_type',
+                \App\Models\Enums\FlightType::select(),
+                null, [
+                    'class' => 'form-control select2',
+                    'readonly' => $pirep->read_only
+                ])
+            }}
+            <p class="text-danger">{{ $errors->first('flight_type') }}</p>
+          </div>
+          <div class="form-group col-sm-3">
+            <p class="description">Filed Via:</p>
+            {{ PirepSource::label($pirep->source) }}
+            @if(filled($pirep->source_name))
+              ({{ $pirep->source_name }})
+            @endif
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 <div class="row">
-    <div class="col-xl-12">
-        <div class="form-container">
-            <h6><i class="fas fa-info-circle"></i>
-                &nbsp;Flight Information
-            </h6>
-            <div class="form-container-body">
+  <div class="col-xl-12">
+    <div class="form-container">
+      <h6><i class="fas fa-info-circle"></i>
+        &nbsp;Flight Information
+      </h6>
+      <div class="form-container-body">
 
-                <div class="row">
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('airline_id', 'Airline') }}
-                        @if($pirep->read_only)
-                            <p>{{ $pirep->airline->name }}</p>
-                            {{ Form::hidden('airline_id') }}
-                        @else
-                            {{ Form::select('airline_id', $airlines_list, null, [
-                                    'class' => 'form-control select2',
-                                    'readonly' => $pirep->read_only]) }}
-                            <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-                        @endif
-                    </div>
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('aircraft_id', 'Aircraft:') }}
-                        @if($pirep->read_only)
-                            <p>{{ $pirep->aircraft->name }}</p>
-                            {{ Form::hidden('aircraft_id') }}
-                        @else
-                            {{ Form::select('aircraft_id', $aircraft_list, null, [
-                                    'id' => 'aircraft_select',
-                                    'class' => 'form-control select2',
-                                    'readonly' => $pirep->read_only
-                                ]) }}
-                            <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
-                        @endif
-                    </div>
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
-                        @if($pirep->read_only)
-                            <p>{{ $pirep->dpt_airport_id }}@if($pirep->dpt_airport->name) - {{ $pirep->dpt_airport->name }}@endif
-                            </p>
-                            {{ Form::hidden('dpt_airport_id') }}
-                        @else
-                            {{ Form::select('dpt_airport_id', $airports_list, null, [
-                                    'class' => 'form-control select2',
-                                    'readonly' => $pirep->read_only]) }}
-                            <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
-                        @endif
-                    </div>
+        <div class="row">
+          <div class="form-group col-sm-3">
+            {{ Form::label('airline_id', 'Airline') }}
+            @if($pirep->read_only)
+              <p>{{ $pirep->airline->name }}</p>
+              {{ Form::hidden('airline_id') }}
+            @else
+              {{ Form::select('airline_id', $airlines_list, null, [
+                      'class' => 'form-control select2',
+                      'readonly' => $pirep->read_only]) }}
+              <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+            @endif
+          </div>
+          <div class="form-group col-sm-3">
+            {{ Form::label('aircraft_id', 'Aircraft:') }}
+            @if($pirep->read_only)
+              <p>{{ $pirep->aircraft->name }}</p>
+              {{ Form::hidden('aircraft_id') }}
+            @else
+              {{ Form::select('aircraft_id', $aircraft_list, null, [
+                      'id' => 'aircraft_select',
+                      'class' => 'form-control select2',
+                      'readonly' => $pirep->read_only
+                  ]) }}
+              <p class="text-danger">{{ $errors->first('aircraft_id') }}</p>
+            @endif
+          </div>
+          <div class="form-group col-sm-3">
+            {{ Form::label('dpt_airport_id', 'Departure Airport:') }}
+            @if($pirep->read_only)
+              <p>{{ $pirep->dpt_airport_id }}@if($pirep->dpt_airport->name) - {{ $pirep->dpt_airport->name }}@endif
+              </p>
+              {{ Form::hidden('dpt_airport_id') }}
+            @else
+              {{ Form::select('dpt_airport_id', $airports_list, null, [
+                      'class' => 'form-control select2',
+                      'readonly' => $pirep->read_only]) }}
+              <p class="text-danger">{{ $errors->first('dpt_airport_id') }}</p>
+            @endif
+          </div>
 
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
-                        @if($pirep->read_only)
-                            <p>{{ $pirep->arr_airport->id }}@if($pirep->arr_airport->name) - {{ $pirep->arr_airport->name }}@endif
-                            </p>
-                            {{ Form::hidden('arr_airport_id') }}
-                        @else
-                            {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
-                            <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
-                        @endif
-                    </div>
-                </div>
-
-
-                <div class="row">
-                    <!-- Flight Time Field -->
-                    <div class="form-group col-sm-3">
-                        {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
-                        @if($pirep->read_only)
-                            <p>
-                                {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
-                                {{ Form::hidden('hours') }}
-                                {{ Form::hidden('minutes') }}
-                            </p>
-                        @else
-                            <div class="row">
-                                <div class="col-sm-6">
-                                    {{ Form::number('hours', null, [
-                                            'class' => 'form-control',
-                                            'placeholder' => 'hours',
-                                            'readonly' => $pirep->read_only]) }}
-                                </div>
-                                <div class="col-sm-6">
-                                    {{ Form::number('minutes', null, [
-                                            'class' => 'form-control',
-                                            'placeholder' => 'minutes',
-                                            'readonly' => $pirep->read_only]) }}
-                                </div>
-                                <p class="text-danger">{{ $errors->first('hours') }}</p>
-                                <p class="text-danger">{{ $errors->first('minutes') }}</p>
-                            </div>
-                        @endif
-                    </div>
-
-                    <!-- Block Fuel Field -->
-                    <div class="form-group col-sm-2">
-                        {{ Form::label('block_fuel', 'Block Fuel:') }}
-                        <div class="row">
-                            <div class="col-sm-12">
-                                {{ Form::number('block_fuel', null, [
-                                    'class' => 'form-control',
-                                    'min' => 0,
-                                    'step' => '0.01',
-                                    ]) }}
-                                <p class="text-danger">{{ $errors->first('block_fuel') }}</p>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Fuel Used Field -->
-                    <div class="form-group col-sm-2">
-                        {{ Form::label('fuel_used', 'Fuel Used:') }}
-                        <div class="row">
-                            <div class="col-sm-12">
-                                {{ Form::number('fuel_used', null, [
-                                    'class' => 'form-control',
-                                    'min' => 0,
-                                    'step' => '0.01'
-                                    ]) }}
-                                <p class="text-danger">{{ $errors->first('fuel_used') }}</p>
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Level Field -->
-                    <div class="form-group col-sm-5">
-                        {{ Form::label('level', 'Flight Level:') }}
-                        <div class="row">
-                            <div class="col-sm-12">
-                                {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
-                                <p class="text-danger">{{ $errors->first('level') }}</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-
-                <div class="row">
-                    <!-- Route Field -->
-                    <div class="form-group col-sm-6">
-                        {{ Form::label('route', 'Route:') }}
-                        {{ Form::textarea('route', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('route') }}</p>
-                    </div>
-
-                    <!-- Notes Field -->
-                    <div class="form-group col-sm-6">
-                        {{ Form::label('notes', 'Notes:') }}
-                        {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('notes') }}</p>
-                    </div>
-                </div>
-
-            </div>
+          <div class="form-group col-sm-3">
+            {{ Form::label('arr_airport_id', 'Arrival Airport:') }}
+            @if($pirep->read_only)
+              <p>{{ $pirep->arr_airport->id }}@if($pirep->arr_airport->name) - {{ $pirep->arr_airport->name }}@endif
+              </p>
+              {{ Form::hidden('arr_airport_id') }}
+            @else
+              {{ Form::select('arr_airport_id', $airports_list, null, ['class' => 'form-control select2']) }}
+              <p class="text-danger">{{ $errors->first('arr_airport_id') }}</p>
+            @endif
+          </div>
         </div>
+
+
+        <div class="row">
+          <!-- Flight Time Field -->
+          <div class="form-group col-sm-3">
+            {{ Form::label('flight_time', 'Flight Time (hours & minutes):') }}
+            @if($pirep->read_only)
+              <p>
+                {{ $pirep->hours }} hours, {{ $pirep->minutes }} minutes
+                {{ Form::hidden('hours') }}
+                {{ Form::hidden('minutes') }}
+              </p>
+            @else
+              <div class="row">
+                <div class="col-sm-6">
+                  {{ Form::number('hours', null, [
+                          'class' => 'form-control',
+                          'placeholder' => 'hours',
+                          'readonly' => $pirep->read_only]) }}
+                </div>
+                <div class="col-sm-6">
+                  {{ Form::number('minutes', null, [
+                          'class' => 'form-control',
+                          'placeholder' => 'minutes',
+                          'readonly' => $pirep->read_only]) }}
+                </div>
+                <p class="text-danger">{{ $errors->first('hours') }}</p>
+                <p class="text-danger">{{ $errors->first('minutes') }}</p>
+              </div>
+            @endif
+          </div>
+
+          <!-- Block Fuel Field -->
+          <div class="form-group col-sm-2">
+            {{ Form::label('block_fuel', 'Block Fuel:') }}
+            <div class="row">
+              <div class="col-sm-12">
+                {{ Form::number('block_fuel', null, [
+                    'class' => 'form-control',
+                    'min' => 0,
+                    'step' => '0.01',
+                    ]) }}
+                <p class="text-danger">{{ $errors->first('block_fuel') }}</p>
+              </div>
+            </div>
+          </div>
+
+          <!-- Fuel Used Field -->
+          <div class="form-group col-sm-2">
+            {{ Form::label('fuel_used', 'Fuel Used:') }}
+            <div class="row">
+              <div class="col-sm-12">
+                {{ Form::number('fuel_used', null, [
+                    'class' => 'form-control',
+                    'min' => 0,
+                    'step' => '0.01'
+                    ]) }}
+                <p class="text-danger">{{ $errors->first('fuel_used') }}</p>
+              </div>
+            </div>
+          </div>
+
+          <!-- Level Field -->
+          <div class="form-group col-sm-5">
+            {{ Form::label('level', 'Flight Level:') }}
+            <div class="row">
+              <div class="col-sm-12">
+                {{ Form::number('level', null, ['class' => 'form-control', 'min' => 0]) }}
+                <p class="text-danger">{{ $errors->first('level') }}</p>
+              </div>
+            </div>
+          </div>
+        </div>
+
+
+        <div class="row">
+          <!-- Route Field -->
+          <div class="form-group col-sm-6">
+            {{ Form::label('route', 'Route:') }}
+            {{ Form::textarea('route', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('route') }}</p>
+          </div>
+
+          <!-- Notes Field -->
+          <div class="form-group col-sm-6">
+            {{ Form::label('notes', 'Notes:') }}
+            {{ Form::textarea('notes', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('notes') }}</p>
+          </div>
+        </div>
+
+      </div>
     </div>
+  </div>
 </div>
 
 {{--
     FARES
 --}}
 <div class="row">
-    <div class="col-sm-12">
-        <div class="form-container">
-            <h6><i class="fas fa-info-circle"></i>
-                &nbsp;fares
-            </h6>
-            <div class="form-container-body">
-                <div id="fares_container">
-                    @include('admin.pireps.fares')
-                </div>
-            </div>
+  <div class="col-sm-12">
+    <div class="form-container">
+      <h6><i class="fas fa-info-circle"></i>
+        &nbsp;fares
+      </h6>
+      <div class="form-container-body">
+        <div id="fares_container">
+          @include('admin.pireps.fares')
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 {{--
@@ -250,24 +250,24 @@
 --}}
 
 <div class="row">
-    <div class="col-sm-12">
-        <div class="form-container">
-            <h6><i class="fas fa-info-circle"></i>
-                &nbsp;fields
-            </h6>
-            <div class="form-container-body">
-                {{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
-                @include('admin.pireps.field_values')
-            </div>
-        </div>
+  <div class="col-sm-12">
+    <div class="form-container">
+      <h6><i class="fas fa-info-circle"></i>
+        &nbsp;fields
+      </h6>
+      <div class="form-container-body">
+        {{-- You don't want to change this ID unless you don't want the fares form to work :) --}}
+        @include('admin.pireps.field_values')
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.pireps.index') }}" class="btn btn-warn">Cancel</a>
-        </div>
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.pireps.index') }}" class="btn btn-warn">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/pireps/flight_log.blade.php b/resources/views/admin/pireps/flight_log.blade.php
index 749dd80a..d26a701f 100644
--- a/resources/views/admin/pireps/flight_log.blade.php
+++ b/resources/views/admin/pireps/flight_log.blade.php
@@ -1,14 +1,14 @@
 @if(count($pirep->acars_logs) > 0)
-<div class="col-12">
+  <div class="col-12">
     <table class="table table-hover" id="users-table">
-        <tbody>
-        @foreach($pirep->acars_logs as $log)
-            <tr>
-                <td nowrap="true">{{ show_datetime($log->created_at) }}</td>
-                <td>{{ $log->log }}</td>
-            </tr>
-        @endforeach
-        </tbody>
+      <tbody>
+      @foreach($pirep->acars_logs as $log)
+        <tr>
+          <td nowrap="true">{{ show_datetime($log->created_at) }}</td>
+          <td>{{ $log->log }}</td>
+        </tr>
+      @endforeach
+      </tbody>
     </table>
-</div>
+  </div>
 @endif
diff --git a/resources/views/admin/pireps/index.blade.php b/resources/views/admin/pireps/index.blade.php
index bc82a596..81f4b570 100644
--- a/resources/views/admin/pireps/index.blade.php
+++ b/resources/views/admin/pireps/index.blade.php
@@ -2,16 +2,16 @@
 
 @section('title', 'Pilot Reports')
 @section('actions')
-    <li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li>
-    <li><a href="{{ route('admin.pireps.index') }}?search=status:0"><i class="ti-plus"></i>Pending</a></li>
-    <li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li>
+  <li><a href="{{ route('admin.pirepfields.index') }}"><i class="ti-menu-alt"></i>PIREP Fields</a></li>
+  <li><a href="{{ route('admin.pireps.index') }}?search=status:0"><i class="ti-plus"></i>Pending</a></li>
+  <li><a href="{{ route('admin.pireps.index') }}"><i class="ti-plus"></i>View All</a></li>
 @endsection
 @section('content')
-    @include('admin.pireps.table')
-    <div class="row">
-        <div class="col-12 text-center">
-            {{ $pireps->links('admin.pagination.default') }}
-        </div>
+  @include('admin.pireps.table')
+  <div class="row">
+    <div class="col-12 text-center">
+      {{ $pireps->links('admin.pagination.default') }}
     </div>
+  </div>
 @endsection
 @include('admin.pireps.scripts')
diff --git a/resources/views/admin/pireps/pirep_card.blade.php b/resources/views/admin/pireps/pirep_card.blade.php
index 9b587824..5e2d70a8 100644
--- a/resources/views/admin/pireps/pirep_card.blade.php
+++ b/resources/views/admin/pireps/pirep_card.blade.php
@@ -1,30 +1,30 @@
 <div id="pirep_{{ $pirep->id }}_container">
-<div class="card border-blue-bottom pirep_card_container">
+  <div class="card border-blue-bottom pirep_card_container">
     <div class="card-block" style="min-height: 0px">
-        <div class="row">
-            <div class="col-sm-2 text-center">
-                <h5>
-                    <a class="text-c"
-                       href="{{ route('admin.pireps.edit', [$pirep->id]) }}">
-                    {{ $pirep->airline->code }}{{ $pirep->ident }}
-                    </a>
-                </h5>
-                <div>
-                    @if($pirep->state === PirepState::PENDING)
-                        <div class="badge badge-warning">
-                    @elseif($pirep->state === PirepState::ACCEPTED)
-                        <div class="badge badge-success">
+      <div class="row">
+        <div class="col-sm-2 text-center">
+          <h5>
+            <a class="text-c"
+               href="{{ route('admin.pireps.edit', [$pirep->id]) }}">
+              {{ $pirep->airline->code }}{{ $pirep->ident }}
+            </a>
+          </h5>
+          <div>
+            @if($pirep->state === PirepState::PENDING)
+              <div class="badge badge-warning">
+                @elseif($pirep->state === PirepState::ACCEPTED)
+                  <div class="badge badge-success">
                     @elseif($pirep->state === PirepState::REJECTED)
-                        <div class="badge badge-danger">
-                    @else
-                        <div class="badge badge-info">
-                    @endif
-                    {{ PirepState::label($pirep->state) }}</div>
-                </div>
-            </div>
-            <div class="col-sm-10">
-                <div class="row">
-                    <div class="col-sm-6">
+                      <div class="badge badge-danger">
+                        @else
+                          <div class="badge badge-info">
+                            @endif
+                            {{ PirepState::label($pirep->state) }}</div>
+                      </div>
+                  </div>
+                  <div class="col-sm-10">
+                    <div class="row">
+                      <div class="col-sm-6">
                         <div>
                             <span class="description">
                                 <b>DEP</b>&nbsp;
@@ -39,25 +39,25 @@
                             </span>
                         </div>
                         @if($pirep->aircraft)
-                            <div><span class="description"><b>Aircraft</b>&nbsp;
+                          <div><span class="description"><b>Aircraft</b>&nbsp;
                                 {{ $pirep->aircraft->registration }}
                                 ({{ $pirep->aircraft->name }})
                                 </span>
-                            </div>
+                          </div>
                         @endif
                         @if(filled($pirep->level))
-                        <div>
+                          <div>
                             <span class="description"><b>Flight Level</b>&nbsp;
                             {{ $pirep->level }}
                             </span>
-                        </div>
+                          </div>
                         @endif
                         <div>
                             <span class="description"><b>Filed Using</b>&nbsp;
                                 {{ PirepSource::label($pirep->source) }}
-                                @if(filled($pirep->source_name))
-                                    ({{ $pirep->source_name }})
-                                @endif
+                              @if(filled($pirep->source_name))
+                                ({{ $pirep->source_name }})
+                              @endif
                             </span>
                         </div>
                         <div>
@@ -65,20 +65,20 @@
                                 {{ show_datetime($pirep->created_at) }}
                             </span>
                         </div>
-                    </div>
-                    <div class="col-sm-6">
+                      </div>
+                      <div class="col-sm-6">
 
+                      </div>
                     </div>
-                </div>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col-lg-12">
-                <div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
+                  </div>
+              </div>
+              <div class="row">
+                <div class="col-lg-12">
+                  <div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
                     @include('admin.pireps.actions', ['pirep' => $pirep, 'on_edit_page' => false])
+                  </div>
                 </div>
-            </div>
+              </div>
+          </div>
         </div>
-    </div>
-</div>
-</div>
+      </div>
diff --git a/resources/views/admin/pireps/scripts.blade.php b/resources/views/admin/pireps/scripts.blade.php
index fd7e50ae..3738419b 100644
--- a/resources/views/admin/pireps/scripts.blade.php
+++ b/resources/views/admin/pireps/scripts.blade.php
@@ -1,88 +1,88 @@
 @section('scripts')
-<script>
-const changeStatus = async (values, fn) => {
-    console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status);
+  <script>
+    const changeStatus = async (values, fn) => {
+      console.log('Changing PIREP ' + values.pirep_id + ' to state ' + values.new_status);
 
-    const opts = {
+      const opts = {
         method: 'POST',
         url: '{{url('/admin/pireps')}}/' + values.pirep_id + '/status',
         data: values,
+      };
+
+      const response = await phpvms.request(opts);
+      fn(response.data);
     };
 
-    const response = await phpvms.request(opts);
-    fn(response.data);
-};
+    $(document).ready(() => {
+      const select_id = "select#aircraft_select";
+      const destContainer = $('#fares_container');
 
-$(document).ready(() => {
-    const select_id = "select#aircraft_select";
-    const destContainer = $('#fares_container');
-
-    $(select_id).change(async (e) => {
+      $(select_id).change(async (e) => {
         const aircraft_id = $(select_id + " option:selected").val();
         console.log('aircraft select change: ', aircraft_id);
 
         const response = await phpvms.request("{{ url('/admin/pireps/fares') }}?aircraft_id=" + aircraft_id);
         console.log('returned new fares', response.data);
         destContainer.html(response.data);
-    });
+      });
 
-    $(document).on('submit', 'form.pjax_form', (event) => {
+      $(document).on('submit', 'form.pjax_form', (event) => {
         event.preventDefault();
         $.pjax.submit(event, '#pirep_comments_wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function () {
+      $(document).on('pjax:complete', function () {
         initPlugins();
-    });
+      });
 
-    /**
-     * Recalculate finances button is clicked
-     */
-    $('button#recalculate-finances').on('click', async (event) => {
+      /**
+       * Recalculate finances button is clicked
+       */
+      $('button#recalculate-finances').on('click', async (event) => {
         event.preventDefault();
         console.log('Sending recalculate finances request');
         const pirep_id = $(event.currentTarget).attr('data-pirep-id');
 
         const opts = {
-            method: 'POST',
-            url: '{{url('/api/pireps')}}/' + pirep_id + '/finances/recalculate',
+          method: 'POST',
+          url: '{{url('/api/pireps')}}/' + pirep_id + '/finances/recalculate',
         };
 
         const response = await phpvms.request(opts);
         console.log(response.data);
         location.reload();
-    });
+      });
 
-    $(document).on('submit', 'form.pirep_submit_status', (event) => {
+      $(document).on('submit', 'form.pirep_submit_status', (event) => {
         event.preventDefault();
         const values = {
-            pirep_id: $(event.currentTarget).attr('pirep_id'),
-            new_status: $(event.currentTarget).attr('new_status')
+          pirep_id: $(event.currentTarget).attr('pirep_id'),
+          new_status: $(event.currentTarget).attr('new_status')
         };
 
         console.log('change status', values);
 
         changeStatus(values, (data) => {
-            const destContainer = '#pirep_' + values.pirep_id + '_actionbar';
-            $(destContainer).html(data);
+          const destContainer = '#pirep_' + values.pirep_id + '_actionbar';
+          $(destContainer).html(data);
         });
-    });
+      });
 
-    $(document).on('submit', 'form.pirep_change_status', (event) => {
+      $(document).on('submit', 'form.pirep_change_status', (event) => {
         event.preventDefault();
 
         const values = {
-            pirep_id: $(event.currentTarget).attr('pirep_id'),
-            new_status: $(event.currentTarget).attr('new_status')
+          pirep_id: $(event.currentTarget).attr('pirep_id'),
+          new_status: $(event.currentTarget).attr('new_status')
         };
 
         console.log('change status', values);
 
         changeStatus(values, (data) => {
-            location.reload();
+          location.reload();
         });
-    });
+      });
 
-});
-</script>
+    });
+  </script>
 @endsection
diff --git a/resources/views/admin/pireps/show.blade.php b/resources/views/admin/pireps/show.blade.php
index 3662662d..6cd5debc 100644
--- a/resources/views/admin/pireps/show.blade.php
+++ b/resources/views/admin/pireps/show.blade.php
@@ -2,30 +2,30 @@
 @section('title', 'pilot report')
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.pireps.show_fields')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.pireps.show_fields')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <h4>custom fields</h4>
-            @include('admin.pireps.field_values')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <h4>custom fields</h4>
+      @include('admin.pireps.field_values')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            <h4>comments</h4>
-            @include('admin.pireps.comments')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <h4>comments</h4>
+      @include('admin.pireps.comments')
     </div>
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.pireps.map')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.pireps.map')
     </div>
+  </div>
 @endsection
 @include('admin.pireps.scripts')
diff --git a/resources/views/admin/pireps/show_fields.blade.php b/resources/views/admin/pireps/show_fields.blade.php
index 8936dc09..7b50340e 100644
--- a/resources/views/admin/pireps/show_fields.blade.php
+++ b/resources/views/admin/pireps/show_fields.blade.php
@@ -1,84 +1,84 @@
 <div class="row">
-    <div class="form-group col-sm-4">
-        <div class="box box-solid">
-            <div class="box-header with-border">
-                {{--<i class="fa fa-text-width"></i>--}}
-                <h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
-            </div>
-            <div class="box-body"><p class="lead">
-                    {{ $pirep->dpt_airport->icao }} - {{ $pirep->dpt_airport->name }}
-            </p></div>
-        </div>
+  <div class="form-group col-sm-4">
+    <div class="box box-solid">
+      <div class="box-header with-border">
+        {{--<i class="fa fa-text-width"></i>--}}
+        <h3 class="box-title">{{ Form::label('dpt_airport_id', 'Dep ICAO') }}</h3>
+      </div>
+      <div class="box-body"><p class="lead">
+          {{ $pirep->dpt_airport->icao }} - {{ $pirep->dpt_airport->name }}
+        </p></div>
     </div>
+  </div>
 
-    <div class="form-group col-sm-5">
-        <div class="box box-solid">
-            <div class="box-header with-border">
-                {{--<i class="fa fa-text-width"></i>--}}
-                <h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
-            </div>
-            <div class="box-body"><p class="lead">
-                    {{ $pirep->arr_airport->icao }} - {{ $pirep->arr_airport->name }}
-                </p>
-            </div>
-        </div>
+  <div class="form-group col-sm-5">
+    <div class="box box-solid">
+      <div class="box-header with-border">
+        {{--<i class="fa fa-text-width"></i>--}}
+        <h3 class="box-title">{{ Form::label('arr_airport_id', 'Arrival ICAO') }}</h3>
+      </div>
+      <div class="box-body"><p class="lead">
+          {{ $pirep->arr_airport->icao }} - {{ $pirep->arr_airport->name }}
+        </p>
+      </div>
     </div>
+  </div>
 
-    <div class="form-group col-sm-3">
-        <div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
-            @include('admin.pireps.actions')
-        </div>
+  <div class="form-group col-sm-3">
+    <div id="pirep_{{ $pirep->id }}_actionbar" class="pull-right">
+      @include('admin.pireps.actions')
     </div>
+  </div>
 </div>
 <div class="row">
-    <div class="col-md-12">
-        <table class="table table-hover">
-            <tr>
-                <td>Pilot</td>
-                <td><a href="{{ route('admin.users.show', [$pirep->pilot->id]) }}"
-                        target="_blank">{{ $pirep->user->name }}</a>
-                </td>
-            </tr>
-            <tr>
-                <td>Flight</td>
-                <td>
-                    <a href="{{ route('admin.flights.show', [$pirep->flight_id]) }}"
-                       target="_blank">
-                        {{ $pirep->ident }}
-                    </a>
-                </td>
-            </tr>
-            <tr>
-                <td>Aircraft</td>
-                <td>{{ $pirep->aircraft->subfleet->name }}, {{ $pirep->aircraft->name }}
-                    ({{ $pirep->aircraft->registration }})
-                </td>
-            </tr>
-            <tr>
-                <td>Flight Time</td>
-                <td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
-            </tr>
-            <tr>
-                <td>Flight Level</td>
-                <td>{{ $pirep->level }}</td>
-            </tr>
-            <tr>
-                <td>Route</td>
-                <td>{{ $pirep->route }}</td>
-            </tr>
-            <tr>
-                <td>Notes</td>
-                <td>{{ $pirep->notes }}</td>
-            </tr>
-            <tr>
-                <td>Filed On</td>
-                <td>{{ show_datetime($pirep->created_at) }}</td>
-            </tr>
+  <div class="col-md-12">
+    <table class="table table-hover">
+      <tr>
+        <td>Pilot</td>
+        <td><a href="{{ route('admin.users.show', [$pirep->pilot->id]) }}"
+               target="_blank">{{ $pirep->user->name }}</a>
+        </td>
+      </tr>
+      <tr>
+        <td>Flight</td>
+        <td>
+          <a href="{{ route('admin.flights.show', [$pirep->flight_id]) }}"
+             target="_blank">
+            {{ $pirep->ident }}
+          </a>
+        </td>
+      </tr>
+      <tr>
+        <td>Aircraft</td>
+        <td>{{ $pirep->aircraft->subfleet->name }}, {{ $pirep->aircraft->name }}
+          ({{ $pirep->aircraft->registration }})
+        </td>
+      </tr>
+      <tr>
+        <td>Flight Time</td>
+        <td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
+      </tr>
+      <tr>
+        <td>Flight Level</td>
+        <td>{{ $pirep->level }}</td>
+      </tr>
+      <tr>
+        <td>Route</td>
+        <td>{{ $pirep->route }}</td>
+      </tr>
+      <tr>
+        <td>Notes</td>
+        <td>{{ $pirep->notes }}</td>
+      </tr>
+      <tr>
+        <td>Filed On</td>
+        <td>{{ show_datetime($pirep->created_at) }}</td>
+      </tr>
 
-            <tr>
-                <td>Updated On</td>
-                <td>{{ show_datetime($pirep->updated_at) }}</td>
-            </tr>
-        </table>
-    </div>
+      <tr>
+        <td>Updated On</td>
+        <td>{{ show_datetime($pirep->updated_at) }}</td>
+      </tr>
+    </table>
+  </div>
 </div>
diff --git a/resources/views/admin/pireps/transactions.blade.php b/resources/views/admin/pireps/transactions.blade.php
index 8f2d7c1f..64ed2614 100644
--- a/resources/views/admin/pireps/transactions.blade.php
+++ b/resources/views/admin/pireps/transactions.blade.php
@@ -1,45 +1,45 @@
 <div class="col-12">
-@if(count($journal['transactions']) > 0)
+  @if(count($journal['transactions']) > 0)
     <table class="table table-hover" id="users-table">
-        <tbody>
-        @foreach($journal['transactions'] as $entry)
-            <tr>
-                <td>{{ $entry->memo }}</td>
-                <td>
-                    @if($entry->credit)
-                        {{ money($entry->credit, config('phpvms.currency')) }}
-                    @endif
-                </td>
-                <td>
-                    @if($entry->debit)
-                        {{ money($entry->debit, config('phpvms.currency')) }}
-                    @endif
-                </td>
-            </tr>
-        @endforeach
-
-        {{-- show sums --}}
+      <tbody>
+      @foreach($journal['transactions'] as $entry)
         <tr>
-            <td></td>
-            <td>
-                {{ $journal['credits'] }}
-            </td>
-            <td>
-                <i>{{ $journal['debits'] }}</i>
-            </td>
+          <td>{{ $entry->memo }}</td>
+          <td>
+            @if($entry->credit)
+              {{ money($entry->credit, config('phpvms.currency')) }}
+            @endif
+          </td>
+          <td>
+            @if($entry->debit)
+              {{ money($entry->debit, config('phpvms.currency')) }}
+            @endif
+          </td>
         </tr>
+      @endforeach
 
-        {{-- final total --}}
-        <tr style="border-top: 3px; border-top-style: double;">
-            <td></td>
-            <td align="right">
-                <b>Total</b>
-            </td>
-            <td>
-                {{ $journal['credits']->subtract($journal['debits']) }}
-            </td>
-        </tr>
-        </tbody>
+      {{-- show sums --}}
+      <tr>
+        <td></td>
+        <td>
+          {{ $journal['credits'] }}
+        </td>
+        <td>
+          <i>{{ $journal['debits'] }}</i>
+        </td>
+      </tr>
+
+      {{-- final total --}}
+      <tr style="border-top: 3px; border-top-style: double;">
+        <td></td>
+        <td align="right">
+          <b>Total</b>
+        </td>
+        <td>
+          {{ $journal['credits']->subtract($journal['debits']) }}
+        </td>
+      </tr>
+      </tbody>
     </table>
 </div>
 @endif
diff --git a/resources/views/admin/ranks/create.blade.php b/resources/views/admin/ranks/create.blade.php
index c3eca80c..11614839 100644
--- a/resources/views/admin/ranks/create.blade.php
+++ b/resources/views/admin/ranks/create.blade.php
@@ -1,12 +1,12 @@
 @extends('admin.app')
 @section('Add Rank')
 @section('content')
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-        {{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }}
-            @include('admin.ranks.fields')
-        {{ Form::close() }}
+      {{ Form::open(['route' => 'admin.ranks.store', 'class' => 'add_rank', 'method'=>'POST']) }}
+      @include('admin.ranks.fields')
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
 @endsection
 @include('admin.ranks.scripts')
diff --git a/resources/views/admin/ranks/edit.blade.php b/resources/views/admin/ranks/edit.blade.php
index a781a2b7..de8c6645 100644
--- a/resources/views/admin/ranks/edit.blade.php
+++ b/resources/views/admin/ranks/edit.blade.php
@@ -1,27 +1,27 @@
 @extends('admin.app')
 @section('title', "Edit \"$rank->name\"")
 @section('content')
-<div class="card border-blue-bottom">
-   <div class="content">
-       {{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }}
-            @include('admin.ranks.fields')
-       {{ Form::close() }}
-   </div>
-</div>
-
-<div class="card border-blue-bottom">
+  <div class="card border-blue-bottom">
     <div class="content">
-        <div class="header">
-           <h3>subfleets</h3>
-            @component('admin.components.info')
-                These are the subfleets this rank is allowed to use. The pay can be
-                set as a fixed amount, or a percentage of the rank's base payrate above
-            @endcomponent
-        </div>
-       <div class="row">
-           @include('admin.ranks.subfleets')
-       </div>
+      {{ Form::model($rank, ['route' => ['admin.ranks.update', $rank->id], 'method' => 'patch']) }}
+      @include('admin.ranks.fields')
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
+
+  <div class="card border-blue-bottom">
+    <div class="content">
+      <div class="header">
+        <h3>subfleets</h3>
+        @component('admin.components.info')
+          These are the subfleets this rank is allowed to use. The pay can be
+          set as a fixed amount, or a percentage of the rank's base payrate above
+        @endcomponent
+      </div>
+      <div class="row">
+        @include('admin.ranks.subfleets')
+      </div>
+    </div>
+  </div>
 @endsection
 @include('admin.ranks.scripts')
diff --git a/resources/views/admin/ranks/fields.blade.php b/resources/views/admin/ranks/fields.blade.php
index 1efd47df..5d4c35b5 100644
--- a/resources/views/admin/ranks/fields.blade.php
+++ b/resources/views/admin/ranks/fields.blade.php
@@ -1,111 +1,111 @@
 <div class="row">
-    <!-- Name Field -->
-    <div class="form-group col-sm-6">
-        {{ Form::label('name', 'Name:') }}
-        {{ Form::text('name', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
-    </div>
+  <!-- Name Field -->
+  <div class="form-group col-sm-6">
+    {{ Form::label('name', 'Name:') }}
+    {{ Form::text('name', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('name') }}</p>
+  </div>
 
-    <div class="form-group col-md-6">
-        {{ Form::label('image_url', 'Image Link:') }}
-        {{ Form::text('image_url', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('image_url') }}</p>
-    </div>
+  <div class="form-group col-md-6">
+    {{ Form::label('image_url', 'Image Link:') }}
+    {{ Form::text('image_url', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('image_url') }}</p>
+  </div>
 </div>
 <div class="row">
-    <!-- Hours Field -->
-    <div class="form-group col-sm-4">
-        {{ Form::label('hours', 'Hours:') }}
-        {{ Form::number('hours', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('hours') }}</p>
-    </div>
+  <!-- Hours Field -->
+  <div class="form-group col-sm-4">
+    {{ Form::label('hours', 'Hours:') }}
+    {{ Form::number('hours', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('hours') }}</p>
+  </div>
 
-    <div class="form-group col-md-4">
-        {{ Form::label('acars_base_pay_rate', 'ACARS Base Pay Rate:') }}
-        {{ Form::number('acars_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
-        <p class="text-danger">{{ $errors->first('acars_base_pay_rate') }}</p>
-        @component('admin.components.info')
-            Base rate, per-flight hour, for ACARS PIREPs.
-            Can be adjusted via a multiplier on the subfleet.
-        @endcomponent
-    </div>
+  <div class="form-group col-md-4">
+    {{ Form::label('acars_base_pay_rate', 'ACARS Base Pay Rate:') }}
+    {{ Form::number('acars_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
+    <p class="text-danger">{{ $errors->first('acars_base_pay_rate') }}</p>
+    @component('admin.components.info')
+      Base rate, per-flight hour, for ACARS PIREPs.
+      Can be adjusted via a multiplier on the subfleet.
+    @endcomponent
+  </div>
 
-    <div class="form-group col-md-4">
-        {{ Form::label('manual_base_pay_rate', 'Manual Base Pay Rate:') }}
-        {{ Form::number('manual_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
-        <p class="text-danger">{{ $errors->first('manual_base_pay_rate') }}</p>
-        @component('admin.components.info')
-            Base rate, per-flight hour, for manually-filed PIREPs.
-            Can be adjusted via a multiplier on the subfleet.
-        @endcomponent
-    </div>
+  <div class="form-group col-md-4">
+    {{ Form::label('manual_base_pay_rate', 'Manual Base Pay Rate:') }}
+    {{ Form::number('manual_base_pay_rate', null, ['min' => 0, 'class' => 'form-control', 'step' => '0.01']) }}
+    <p class="text-danger">{{ $errors->first('manual_base_pay_rate') }}</p>
+    @component('admin.components.info')
+      Base rate, per-flight hour, for manually-filed PIREPs.
+      Can be adjusted via a multiplier on the subfleet.
+    @endcomponent
+  </div>
 
 </div>
 <div class="row">
-    <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">
-                        <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 style="margin-left: 10px">
-                            @component('admin.components.info')
-                                PIREPS submitted through ACARS are automatically accepted
-                            @endcomponent
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Auto Approve Manual Field -->
-                    <div class="form-group col-sm-4">
-                        <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 style="margin-left: 10px">
-                            @component('admin.components.info')
-                                PIREPS submitted manually are automatically accepted
-                            @endcomponent
-                            </div>
-                        </div>
-                    </div>
-
-                    <!-- Auto Promote Field -->
-                    <div class="form-group col-sm-4">
-                        <div class="checkbox">
-                            <label class="checkbox-inline">
-                                {{ Form::hidden('auto_promote', false) }}
-                                {{ Form::checkbox('auto_promote') }}
-                                {{ Form::label('auto_promote', 'Auto Promote') }}
-                            </label>
-                            <div style="margin-left: 10px">
-                            @component('admin.components.info')
-                                When a pilot reaches these hours, they'll be upgraded to this rank
-                            @endcomponent
-                            </div>
-                        </div>
-                    </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">
+            <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 style="margin-left: 10px">
+                @component('admin.components.info')
+                  PIREPS submitted through ACARS are automatically accepted
+                @endcomponent
+              </div>
             </div>
+          </div>
+
+          <!-- Auto Approve Manual Field -->
+          <div class="form-group col-sm-4">
+            <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 style="margin-left: 10px">
+                @component('admin.components.info')
+                  PIREPS submitted manually are automatically accepted
+                @endcomponent
+              </div>
+            </div>
+          </div>
+
+          <!-- Auto Promote Field -->
+          <div class="form-group col-sm-4">
+            <div class="checkbox">
+              <label class="checkbox-inline">
+                {{ Form::hidden('auto_promote', false) }}
+                {{ Form::checkbox('auto_promote') }}
+                {{ Form::label('auto_promote', 'Auto Promote') }}
+              </label>
+              <div style="margin-left: 10px">
+                @component('admin.components.info')
+                  When a pilot reaches these hours, they'll be upgraded to this rank
+                @endcomponent
+              </div>
+            </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="row">
-    <div class="col-sm-12">
-        <div class="text-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-        </div>
+  <div class="col-sm-12">
+    <div class="text-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/ranks/index.blade.php b/resources/views/admin/ranks/index.blade.php
index ebaf5546..7f54a06a 100644
--- a/resources/views/admin/ranks/index.blade.php
+++ b/resources/views/admin/ranks/index.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 @section('title', 'Ranks')
 @section('actions')
-    <li>
-        <a href="{{ route('admin.ranks.create') }}">
-            <i class="ti-plus"></i>
-            Add New</a>
-    </li>
+  <li>
+    <a href="{{ route('admin.ranks.create') }}">
+      <i class="ti-plus"></i>
+      Add New</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.ranks.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.ranks.table')
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/ranks/scripts.blade.php b/resources/views/admin/ranks/scripts.blade.php
index edcff02d..f5465770 100644
--- a/resources/views/admin/ranks/scripts.blade.php
+++ b/resources/views/admin/ranks/scripts.blade.php
@@ -1,48 +1,48 @@
 @section('scripts')
-<script>
-function setEditable() {
+  <script>
+    function setEditable() {
 
-    const token = $('meta[name="csrf-token"]').attr('content');
-    const api_key = $('meta[name="api-key"]').attr('content');
+      const token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
 
-    @if(isset($rank))
-    $('#subfleets-table a').editable({
+      @if(isset($rank))
+      $('#subfleets-table a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'inherited',
         url: '{{ url('/admin/ranks/'.$rank->id.'/subfleets') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'put',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'put',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                subfleet_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            subfleet_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
-    @endif
-}
+      });
+      @endif
+    }
 
-$(document).ready(function () {
+    $(document).ready(function () {
 
-    setEditable();
+      setEditable();
 
-    $(document).on('submit', 'form.pjax_form', function (event) {
+      $(document).on('submit', 'form.pjax_form', function (event) {
         event.preventDefault();
         $.pjax.submit(event, '#rank_subfleet_wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function () {
+      $(document).on('pjax:complete', function () {
         initPlugins();
         setEditable();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/ranks/show.blade.php b/resources/views/admin/ranks/show.blade.php
index a33dd51a..3ca527af 100644
--- a/resources/views/admin/ranks/show.blade.php
+++ b/resources/views/admin/ranks/show.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 
 @section('content')
-    <section class="content-header">
-        <h1>{{ $rank->name }}</h1>
-    </section>
-    <div class="content">
-        <div class="box box-primary">
-            <div class="box-body">
-                <div class="row" style="padding-left: 20px">
-                    @include('admin.ranks.show_fields')
-                </div>
-            </div>
+  <section class="content-header">
+    <h1>{{ $rank->name }}</h1>
+  </section>
+  <div class="content">
+    <div class="box box-primary">
+      <div class="box-body">
+        <div class="row" style="padding-left: 20px">
+          @include('admin.ranks.show_fields')
         </div>
+      </div>
     </div>
+  </div>
 @endsection
 @include('admin.ranks.scripts')
diff --git a/resources/views/admin/ranks/show_fields.blade.php b/resources/views/admin/ranks/show_fields.blade.php
index 8f80d258..2c75806b 100644
--- a/resources/views/admin/ranks/show_fields.blade.php
+++ b/resources/views/admin/ranks/show_fields.blade.php
@@ -1,48 +1,48 @@
 <!-- Id Field -->
 <div class="form-group">
-    {{ Form::label('id', 'Id:') }}
-    <p>{{ $rank->id }}</p>
+  {{ Form::label('id', 'Id:') }}
+  <p>{{ $rank->id }}</p>
 </div>
 
 <!-- Name Field -->
 <div class="form-group">
-    {{ Form::label('name', 'Name:') }}
-    <p>{{ $rank->name }}</p>
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $rank->name }}</p>
 </div>
 
 <!-- Hours Field -->
 <div class="form-group">
-    {{ Form::label('hours', 'Hours:') }}
-    <p>{{ $rank->hours }}</p>
+  {{ Form::label('hours', 'Hours:') }}
+  <p>{{ $rank->hours }}</p>
 </div>
 
 <!-- Auto Approve Acars Field -->
 <div class="form-group">
-    {{ Form::label('auto_approve_acars', 'Auto Approve Acars:') }}
-    <p>{{ $rank->auto_approve_acars }}</p>
+  {{ Form::label('auto_approve_acars', 'Auto Approve Acars:') }}
+  <p>{{ $rank->auto_approve_acars }}</p>
 </div>
 
 <!-- Auto Approve Manual Field -->
 <div class="form-group">
-    {{ Form::label('auto_approve_manual', 'Auto Approve Manual:') }}
-    <p>{{ $rank->auto_approve_manual }}</p>
+  {{ Form::label('auto_approve_manual', 'Auto Approve Manual:') }}
+  <p>{{ $rank->auto_approve_manual }}</p>
 </div>
 
 <!-- Auto Promote Field -->
 <div class="form-group">
-    {{ Form::label('auto_promote', 'Auto Promote:') }}
-    <p>{{ $rank->auto_promote }}</p>
+  {{ Form::label('auto_promote', 'Auto Promote:') }}
+  <p>{{ $rank->auto_promote }}</p>
 </div>
 
 <!-- Created At Field -->
 <div class="form-group">
-    {{ Form::label('created_at', 'Created At:') }}
-    <p>{{ show_datetime($rank->created_at) }}</p>
+  {{ Form::label('created_at', 'Created At:') }}
+  <p>{{ show_datetime($rank->created_at) }}</p>
 </div>
 
 <!-- Updated At Field -->
 <div class="form-group">
-    {{ Form::label('updated_at', 'Updated At:') }}
-    <p>{{ show_datetime($rank->updated_at) }}</p>
+  {{ Form::label('updated_at', 'Updated At:') }}
+  <p>{{ show_datetime($rank->updated_at) }}</p>
 </div>
 
diff --git a/resources/views/admin/ranks/subfleets.blade.php b/resources/views/admin/ranks/subfleets.blade.php
index c97b409f..b12472f8 100644
--- a/resources/views/admin/ranks/subfleets.blade.php
+++ b/resources/views/admin/ranks/subfleets.blade.php
@@ -1,65 +1,65 @@
 <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'])
+  @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>
+      <th>Airline</th>
+      <th>Name</th>
+      <th style="text-align: center;">ACARS Pay</th>
+      <th style="text-align: center;">Manual Pay</th>
+      <th style="text-align: center;">Actions</th>
+      </thead>
     @endif
+    <tbody>
+    @foreach($rank->subfleets as $sf)
+      <tr>
+        <td>{{ $sf->airline->name }}</td>
+        <td>{{ $sf->name }} ({{ $sf->type }})</td>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $sf->id }}"
+             data-name="acars_pay">{{ $sf->pivot->acars_pay }}</a>
+        </td>
 
-    <table class="table table-responsive" id="subfleets-table">
-        @if(count($rank->subfleets))
-        <thead>
-        <th>Airline</th>
-        <th>Name</th>
-        <th style="text-align: center;">ACARS Pay</th>
-        <th style="text-align: center;">Manual Pay</th>
-        <th style="text-align: center;">Actions</th>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($rank->subfleets as $sf)
-            <tr>
-                <td>{{ $sf->airline->name }}</td>
-                <td>{{ $sf->name }} ({{ $sf->type }})</td>
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $sf->id }}"
-                       data-name="acars_pay">{{ $sf->pivot->acars_pay }}</a>
-                </td>
-
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $sf->id }}"
-                       data-name="manual_pay">{{ $sf->pivot->manual_pay }}</a>
-                </td>
-                <td style="width: 10%; text-align: center;" class="form-inline">
-                    {{ Form::open(['url' => '/admin/ranks/'.$rank->id.'/subfleets', 'method' => 'delete', 'class' => 'pjax_form']) }}
-                    {{ Form::hidden('subfleet_id', $sf->id) }}
-                    <div class='btn-group'>
-                        {{ Form::button('<i class="fa fa-times"></i>',
-                                         ['type' => 'submit',
-                                          'class' => 'btn btn-sm btn-danger btn-icon'])
-                          }}
-                    </div>
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr />
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="input-group input-group-lg pull-right">
-                {{ Form::open(['url' => url('/admin/ranks/'.$rank->id.'/subfleets'),
-                                'method' => 'post',
-                                'class' => 'pjax_form form-inline'
-                                ])
-                }}
-                {{ Form::select('subfleet_id', $avail_subfleets, null, [
-                        'placeholder' => 'Select Subfleet',
-                        'class' => 'select2 form-control input-lg'])
-                }}
-                {{ Form::button('<i class="fa fa-plus"></i> Add',
-                                 ['type' => 'submit',
-                                  'class' => 'btn btn-success btn-small']) }}
-                {{ Form::close() }}
-            </div>
-        </div>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $sf->id }}"
+             data-name="manual_pay">{{ $sf->pivot->manual_pay }}</a>
+        </td>
+        <td style="width: 10%; text-align: center;" class="form-inline">
+          {{ Form::open(['url' => '/admin/ranks/'.$rank->id.'/subfleets', 'method' => 'delete', 'class' => 'pjax_form']) }}
+          {{ Form::hidden('subfleet_id', $sf->id) }}
+          <div class='btn-group'>
+            {{ Form::button('<i class="fa fa-times"></i>',
+                             ['type' => 'submit',
+                              'class' => 'btn btn-sm btn-danger btn-icon'])
+              }}
+          </div>
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-lg-12">
+      <div class="input-group input-group-lg pull-right">
+        {{ Form::open(['url' => url('/admin/ranks/'.$rank->id.'/subfleets'),
+                        'method' => 'post',
+                        'class' => 'pjax_form form-inline'
+                        ])
+        }}
+        {{ Form::select('subfleet_id', $avail_subfleets, null, [
+                'placeholder' => 'Select Subfleet',
+                'class' => 'select2 form-control input-lg'])
+        }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/ranks/table.blade.php b/resources/views/admin/ranks/table.blade.php
index f02dd14c..5049aaf2 100644
--- a/resources/views/admin/ranks/table.blade.php
+++ b/resources/views/admin/ranks/table.blade.php
@@ -1,48 +1,48 @@
 <div id="ranks_table_wrapper">
-    <table class="table table-hover table-responsive">
-        <thead>
-        <th>Name</th>
-        <th class="text-center">Hours</th>
-        <th class="text-center">Auto Approve Acars</th>
-        <th class="text-center">Auto Approve Manual</th>
-        <th class="text-center">Auto Promote</th>
-        <th></th>
-        </thead>
-        <tbody>
-        @foreach($ranks as $rank)
-            <tr>
-                <td><a href="{{ route('admin.ranks.edit', [$rank->id]) }}">{{ $rank->name }}</a></td>
-                <td class="text-center">{{ $rank->hours }}</td>
-                <td class="text-center">
-                    @if($rank->auto_approve_acars)
-                        <span class="label label-success">Yes</span>
-                    @else
-                        <span class="label label-default">No</span>
-                    @endif
-                </td>
-                <td class="text-center">
-                    @if($rank->auto_approve_manual)
-                        <span class="label label-success">Yes</span>
-                    @else
-                        <span class="label label-default">No</span>
-                    @endif
-                </td>
-                <td class="text-center">
-                    @if($rank->auto_promote)
-                        <span class="label label-success">Yes</span>
-                    @else
-                        <span class="label label-default">No</span>
-                    @endif
-                </td>
-                <td class="text-right">
-                    {{ Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) }}
-                    <a href="{{ route('admin.ranks.edit', [$rank->id]) }}" class='btn btn-sm btn-success btn-icon'>
-                        <i class="fas fa-pencil-alt"></i></a>
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
+  <table class="table table-hover table-responsive">
+    <thead>
+    <th>Name</th>
+    <th class="text-center">Hours</th>
+    <th class="text-center">Auto Approve Acars</th>
+    <th class="text-center">Auto Approve Manual</th>
+    <th class="text-center">Auto Promote</th>
+    <th></th>
+    </thead>
+    <tbody>
+    @foreach($ranks as $rank)
+      <tr>
+        <td><a href="{{ route('admin.ranks.edit', [$rank->id]) }}">{{ $rank->name }}</a></td>
+        <td class="text-center">{{ $rank->hours }}</td>
+        <td class="text-center">
+          @if($rank->auto_approve_acars)
+            <span class="label label-success">Yes</span>
+          @else
+            <span class="label label-default">No</span>
+          @endif
+        </td>
+        <td class="text-center">
+          @if($rank->auto_approve_manual)
+            <span class="label label-success">Yes</span>
+          @else
+            <span class="label label-default">No</span>
+          @endif
+        </td>
+        <td class="text-center">
+          @if($rank->auto_promote)
+            <span class="label label-success">Yes</span>
+          @else
+            <span class="label label-default">No</span>
+          @endif
+        </td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.ranks.destroy', $rank->id], 'method' => 'delete']) }}
+          <a href="{{ route('admin.ranks.edit', [$rank->id]) }}" class='btn btn-sm btn-success btn-icon'>
+            <i class="fas fa-pencil-alt"></i></a>
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
 </div>
diff --git a/resources/views/admin/roles/create.blade.php b/resources/views/admin/roles/create.blade.php
index 8a4682b8..92e1eb58 100644
--- a/resources/views/admin/roles/create.blade.php
+++ b/resources/views/admin/roles/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add Role')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.roles.store']) }}
-             @include('admin.roles.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.roles.store']) }}
+      @include('admin.roles.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/roles/edit.blade.php b/resources/views/admin/roles/edit.blade.php
index 10fb640a..046388aa 100644
--- a/resources/views/admin/roles/edit.blade.php
+++ b/resources/views/admin/roles/edit.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 @section('title', "Edit \"$role->display_name\"")
 @section('content')
-<div class="card border-blue-bottom">
-   <div class="content">
-       {{ Form::model($role, ['route' => ['admin.roles.update', $role->id], 'method' => 'patch']) }}
-            @include('admin.roles.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($role, ['route' => ['admin.roles.update', $role->id], 'method' => 'patch']) }}
+      @include('admin.roles.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-<div class="card border-blue-bottom">
-   <div class="content">
+  <div class="card border-blue-bottom">
+    <div class="content">
       @include('admin.roles.users')
-   </div>
-</div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/roles/fields.blade.php b/resources/views/admin/roles/fields.blade.php
index 5336f468..929c6598 100644
--- a/resources/views/admin/roles/fields.blade.php
+++ b/resources/views/admin/roles/fields.blade.php
@@ -1,51 +1,52 @@
 <div class="row">
-    <!-- Code Field -->
-    <div class="form-group col-sm-4">
-        <div class="form-container">
-            <h6><i class="fas fa-keyboard"></i>
-                &nbsp;Name
-            </h6>
-            <div class="form-container-body">
-                <div class="row">
-                    <div class="form-group col-sm-12">
-                        {{ Form::text('display_name', null, ['class' => 'form-control']) }}
-                        <p class="text-danger">{{ $errors->first('display_name') }}</p>
-                    </div>
-                </div>
-            </div>
+  <!-- Code Field -->
+  <div class="form-group col-sm-4">
+    <div class="form-container">
+      <h6><i class="fas fa-keyboard"></i>
+        &nbsp;Name
+      </h6>
+      <div class="form-container-body">
+        <div class="row">
+          <div class="form-group col-sm-12">
+            {{ Form::text('display_name', null, ['class' => 'form-control']) }}
+            <p class="text-danger">{{ $errors->first('display_name') }}</p>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 
-    <!-- Permissions Field -->
-    <div class="form-group col-sm-8">
-        <div class="form-container">
-            <h6><i class="fas fa-check-square"></i>
-                &nbsp;Permissions
-            </h6>
-            <div class="form-container-body">
-                <div class="row">
-                        <div class="form-group col-sm-12">
-                            @foreach($permissions as $p)
-                            <div class="checkbox">
-                                <label class="checkbox-inline">
-                                    {{ Form::hidden('permissions[]', false) }}
-                                    {{ Form::checkbox('permissions[]', $p->id) }}
-                                    {{ Form::label('permissions[]', $p->display_name) }} - <span class="description">{{$p->description}}</span>
-                                </label>
-                            </div>
-                            @endforeach
-                        </div>
-                </div>
-            </div>
+  <!-- Permissions Field -->
+  <div class="form-group col-sm-8">
+    <div class="form-container">
+      <h6><i class="fas fa-check-square"></i>
+        &nbsp;Permissions
+      </h6>
+      <div class="form-container-body">
+        <div class="row">
+          <div class="form-group col-sm-12">
+            @foreach($permissions as $p)
+              <div class="checkbox">
+                <label class="checkbox-inline">
+                  {{ Form::hidden('permissions[]', false) }}
+                  {{ Form::checkbox('permissions[]', $p->id) }}
+                  {{ Form::label('permissions[]', $p->display_name) }} - <span
+                    class="description">{{$p->description}}</span>
+                </label>
+              </div>
+            @endforeach
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 <div class="row">
-    <!-- Submit Field -->
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.roles.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  <!-- Submit Field -->
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.roles.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/roles/index.blade.php b/resources/views/admin/roles/index.blade.php
index 88933c82..819e0c2e 100644
--- a/resources/views/admin/roles/index.blade.php
+++ b/resources/views/admin/roles/index.blade.php
@@ -2,18 +2,18 @@
 
 @section('title', 'Roles')
 @section('actions')
-    <li>
-        <a href="{{ route('admin.roles.create') }}">
-            <i class="ti-plus"></i>
-            Add New</a>
-    </li>
+  <li>
+    <a href="{{ route('admin.roles.create') }}">
+      <i class="ti-plus"></i>
+      Add New</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-        @include('admin.roles.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.roles.table')
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/roles/table.blade.php b/resources/views/admin/roles/table.blade.php
index ccfbb406..c7f997d6 100644
--- a/resources/views/admin/roles/table.blade.php
+++ b/resources/views/admin/roles/table.blade.php
@@ -1,20 +1,20 @@
 <table class="table table-hover table-responsive" id="roles-table">
-    <thead>
-        <th>Name</th>
-        <th></th>
-    </thead>
-    <tbody>
-    @foreach($roles as $role)
-        <tr>
-            <td>{{ $role->display_name }}</td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.roles.destroy', $role->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.roles.edit', [$role->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+  <thead>
+  <th>Name</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach($roles as $role)
+    <tr>
+      <td>{{ $role->display_name }}</td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.roles.destroy', $role->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.roles.edit', [$role->id]) }}"
+           class='btn btn-sm btn-success btn-icon'><i class="fas fa-pencil-alt"></i></a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/admin/roles/users.blade.php b/resources/views/admin/roles/users.blade.php
index 6ca62dd2..8b201011 100644
--- a/resources/views/admin/roles/users.blade.php
+++ b/resources/views/admin/roles/users.blade.php
@@ -1,17 +1,17 @@
 <div class="row">
-    <!-- Code Field -->
-    <div class="form-group col-sm-12">
-        <div class="form-container">
-            <h6><i class="fas fa-users"></i>
-                &nbsp;Users
-            </h6>
-            <div class="form-container-body">
-                <div class="row">
-                    <div class="col-sm-12">
-                        TO DO
-                    </div>
-                </div>
-            </div>
+  <!-- Code Field -->
+  <div class="form-group col-sm-12">
+    <div class="form-container">
+      <h6><i class="fas fa-users"></i>
+        &nbsp;Users
+      </h6>
+      <div class="form-container-body">
+        <div class="row">
+          <div class="col-sm-12">
+            TO DO
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/settings/index.blade.php b/resources/views/admin/settings/index.blade.php
index 5c61972b..eb6d0fbd 100644
--- a/resources/views/admin/settings/index.blade.php
+++ b/resources/views/admin/settings/index.blade.php
@@ -2,8 +2,8 @@
 
 @section('title', 'Settings')
 @section('content')
-    @include('flash::message')
-    @include('admin.settings.table')
+  @include('flash::message')
+  @include('admin.settings.table')
 @endsection
 
 @include('admin.settings.script')
diff --git a/resources/views/admin/settings/script.blade.php b/resources/views/admin/settings/script.blade.php
index b3dd7242..6be592e7 100644
--- a/resources/views/admin/settings/script.blade.php
+++ b/resources/views/admin/settings/script.blade.php
@@ -1,30 +1,30 @@
 @section('scripts')
-<script>
-$(document).ready(function() {
-    $('#settings a').editable({
+  <script>
+    $(document).ready(function () {
+      $('#settings a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'default',
         url: '/admin/settings/update',
         title: 'Enter override value',
-        ajaxOptions: { 'type': 'put'},
-        params: function(params) {
-            return {
-                fare_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+        ajaxOptions: {'type': 'put'},
+        params: function (params) {
+          return {
+            fare_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $(document).on('submit', 'form.rm_fare', function(event) {
+      $(document).on('submit', 'form.rm_fare', function (event) {
         event.preventDefault();
         $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function() {
-      initPlugins();
+      $(document).on('pjax:complete', function () {
+        initPlugins();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/sidebar.blade.php b/resources/views/admin/sidebar.blade.php
index e319defd..e6da680d 100644
--- a/resources/views/admin/sidebar.blade.php
+++ b/resources/views/admin/sidebar.blade.php
@@ -1,28 +1,28 @@
 <div class="sidebar" data-background-color="white" data-active-color="info">
 
-    <!--
-        Tip 1: you can change the color of the sidebar's background using: data-background-color="white | black"
-        Tip 2: you can change the color of the active button using the data-active-color="primary | info | success | warning | danger"
-    -->
+  <!--
+      Tip 1: you can change the color of the sidebar's background using: data-background-color="white | black"
+      Tip 2: you can change the color of the active button using the data-active-color="primary | info | success | warning | danger"
+  -->
 
 
-    <div class="sidebar-wrapper">
-        <div class="logo" style="background: #067ec1; margin: 0px; text-align: center; min-height: 74px;">
-            <a href="{{ url('/dashboard') }}">
-                <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="110px" style="">
-            </a>
-        </div>
-
-        <ul class="nav">
-            @include('admin.menu')
-        </ul>
-
-        <br />
-
-        <div class="row">
-            <div class="col-xs-12 text-center">
-                <p class="small">@version</p>
-            </div>
-        </div>
+  <div class="sidebar-wrapper">
+    <div class="logo" style="background: #067ec1; margin: 0px; text-align: center; min-height: 74px;">
+      <a href="{{ url('/dashboard') }}">
+        <img src="{{ public_asset('/assets/img/logo_blue_bg.svg') }}" width="110px" style="">
+      </a>
     </div>
+
+    <ul class="nav">
+      @include('admin.menu')
+    </ul>
+
+    <br/>
+
+    <div class="row">
+      <div class="col-xs-12 text-center">
+        <p class="small">@version</p>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/resources/views/admin/subfleets/create.blade.php b/resources/views/admin/subfleets/create.blade.php
index 934bf57f..55bad82c 100644
--- a/resources/views/admin/subfleets/create.blade.php
+++ b/resources/views/admin/subfleets/create.blade.php
@@ -1,17 +1,17 @@
 @extends('admin.app')
 @section('title', 'Add Subfleet')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @if(!filled($airlines))
-                <p class="text-center">
-                    You must add an airline before you can add a subfleet!
-                </p>
-            @else
-                {{ Form::open(['route' => 'admin.subfleets.store']) }}
-                    @include('admin.subfleets.fields')
-                {{ Form::close() }}
-            @endif
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @if(!filled($airlines))
+        <p class="text-center">
+          You must add an airline before you can add a subfleet!
+        </p>
+      @else
+        {{ Form::open(['route' => 'admin.subfleets.store']) }}
+        @include('admin.subfleets.fields')
+        {{ Form::close() }}
+      @endif
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/subfleets/edit.blade.php b/resources/views/admin/subfleets/edit.blade.php
index 484a2e64..ea4267e4 100644
--- a/resources/views/admin/subfleets/edit.blade.php
+++ b/resources/views/admin/subfleets/edit.blade.php
@@ -2,36 +2,36 @@
 
 @section('title', "Edit $subfleet->name")
 @section('content')
-   <div class="card border-blue-bottom">
-       <div class="content">
-           {{ Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) }}
-            @include('admin.subfleets.fields')
-           {{ Form::close() }}
-       </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($subfleet, ['route' => ['admin.subfleets.update', $subfleet->id], 'method' => 'patch']) }}
+      @include('admin.subfleets.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-       <div class="content">
-           @include('admin.subfleets.ranks')
-       </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.subfleets.ranks')
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-       <div class="content">
-           @include('admin.subfleets.fares')
-       </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.subfleets.fares')
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-       <div class="content">
-           @include('admin.subfleets.expenses')
-       </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.subfleets.expenses')
+    </div>
+  </div>
 
-   <div class="card border-blue-bottom">
-       <div class="content">
-           @include('admin.common.file_upload', ['model' => $subfleet])
-       </div>
-   </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.common.file_upload', ['model' => $subfleet])
+    </div>
+  </div>
 @endsection
 @include('admin.subfleets.script')
diff --git a/resources/views/admin/subfleets/expenses.blade.php b/resources/views/admin/subfleets/expenses.blade.php
index d8c22e43..9a889eb0 100644
--- a/resources/views/admin/subfleets/expenses.blade.php
+++ b/resources/views/admin/subfleets/expenses.blade.php
@@ -1,73 +1,73 @@
 <div id="subfleet-expenses-wrapper" class="col-12">
-    <div class="header">
-        <h3>expenses</h3>
-        @component('admin.components.info')
-            These expenses are only applied to this subfleet
-        @endcomponent
-    </div>
-    <br/>
-    <table class="table table-responsive" id="subfleet-expenses">
-        @if(count($subfleet->expenses))
-        <thead>
-        <th>Name</th>
-        <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
-        <th>Type</th>
-        <th></th>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($subfleet->expenses as $expense)
-            <tr>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="name">{{ $expense->name }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a class="text" href="#" data-pk="{{ $expense->id }}"
-                           data-name="amount">{{ $expense->amount }}</a>
-                    </p>
-                </td>
-                <td>
-                    <p>
-                        <a href="#"
-                           class="dropdown"
-                           data-pk="{{ $expense->id }}"
-                           data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
-                    </p>
-                </td>
-                <td align="right">
-                    {{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
-                                'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
-                    {{ Form::hidden('expense_id', $expense->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
-                                     'class' => 'btn btn-sm btn-danger btn-icon',
-                                     'onclick' => "return confirm('Are you sure?')",
-                                     ]) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr/>
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                {{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
-                                'method' => 'post', 'class' => 'modify_expense form-inline']) }}
-                {{ Form::text('name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
-                {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
-                {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
-                {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
-                                 'class' => 'btn btn-success btn-small']) }}
-                {{ Form::close() }}
+  <div class="header">
+    <h3>expenses</h3>
+    @component('admin.components.info')
+      These expenses are only applied to this subfleet
+    @endcomponent
+  </div>
+  <br/>
+  <table class="table table-responsive" id="subfleet-expenses">
+    @if(count($subfleet->expenses))
+      <thead>
+      <th>Name</th>
+      <th>Cost&nbsp;<span class="small">{{ currency(config('phpvms.currency')) }}</span></th>
+      <th>Type</th>
+      <th></th>
+      </thead>
+    @endif
+    <tbody>
+    @foreach($subfleet->expenses as $expense)
+      <tr>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="name">{{ $expense->name }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a class="text" href="#" data-pk="{{ $expense->id }}"
+               data-name="amount">{{ $expense->amount }}</a>
+          </p>
+        </td>
+        <td>
+          <p>
+            <a href="#"
+               class="dropdown"
+               data-pk="{{ $expense->id }}"
+               data-name="type">{{ \App\Models\Enums\ExpenseType::label($expense->type) }}</a>
+          </p>
+        </td>
+        <td align="right">
+          {{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
+                      'method' => 'delete', 'class' => 'modify_expense form-inline']) }}
+          {{ Form::hidden('expense_id', $expense->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit',
+                           'class' => 'btn btn-sm btn-danger btn-icon',
+                           'onclick' => "return confirm('Are you sure?')",
+                           ]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="text-right">
+        {{ Form::open(['url' => url('/admin/subfleets/'.$subfleet->id.'/expenses'),
+                        'method' => 'post', 'class' => 'modify_expense form-inline']) }}
+        {{ Form::text('name', null, ['class' => 'form-control input-sm', 'placeholder' => 'Name']) }}
+        {{ Form::number('amount', null, ['class' => 'form-control input-sm', 'placeholder' => 'Amount', 'step' => '0.01']) }}
+        {{ Form::select('type', \App\Models\Enums\ExpenseType::select(), null, ['class' => 'select2']) }}
+        {{ Form::button('<i class="fa fa-plus"></i> Add', ['type' => 'submit',
+                         'class' => 'btn btn-success btn-small']) }}
+        {{ Form::close() }}
 
-                <p class="text-danger">{{ $errors->first('name') }}</p>
-                <p class="text-danger">{{ $errors->first('amount') }}</p>
-            </div>
-        </div>
+        <p class="text-danger">{{ $errors->first('name') }}</p>
+        <p class="text-danger">{{ $errors->first('amount') }}</p>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/subfleets/fares.blade.php b/resources/views/admin/subfleets/fares.blade.php
index 725ca581..6594e83f 100644
--- a/resources/views/admin/subfleets/fares.blade.php
+++ b/resources/views/admin/subfleets/fares.blade.php
@@ -1,76 +1,76 @@
 <div id="aircraft_fares_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
-    <div class="header">
-        <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.
-            The pay can be set as a fixed amount, or a percentage of the default rate
-        @endcomponent
-    </div>
-    <br />
-    <table id="aircraft_fares" class="table table-hover">
-        @if(count($subfleet->fares))
-        <thead>
-        <tr>
-            <th>Name</th>
-            <th style="text-align: center;">Code</th>
-            <th style="text-align: center;">Capacity (default)</th>
-            <th style="text-align: center;">Price (default)</th>
-            <th style="text-align: center;">Cost (default)</th>
-            <th></th>
-        </tr>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($subfleet->fares as $atf)
-            <tr>
-                <td class="sorting_1">{{ $atf->name }}</td>
-                <td style="text-align: center;">{{ $atf->code }}</td>
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
-                    <span class="small background-color-grey-light">({{ $atf->capacity }})</span>
-                </td>
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
-                    <span class="small background-color-grey-light">({{ $atf->price }})</span></td>
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
-                    <span class="small background-color-grey-light">({{ $atf->cost}})</span></td>
-                <td style="text-align: right; width:3%;">
-                    {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
-                                    'method' => 'delete',
-                                    'class' => 'rm_fare'
-                                    ])
-                    }}
-                    {{ Form::hidden('fare_id', $atf->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>',
-                                     ['type' => 'submit',
-                                      'class' => 'btn btn-sm btn-danger btn-icon']) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr />
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="text-right">
-            {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
-                            'method' => 'post',
-                            'class' => 'rm_fare form-inline'
-                            ])
-            }}
-            {{ 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',
-                             ['type' => 'submit',
-                              'class' => 'btn btn-success btn-s']) }}
-            {{ Form::close() }}
-            </div>
-        </div>
+  <div class="header">
+    <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.
+      The pay can be set as a fixed amount, or a percentage of the default rate
+    @endcomponent
+  </div>
+  <br/>
+  <table id="aircraft_fares" class="table table-hover">
+    @if(count($subfleet->fares))
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th style="text-align: center;">Code</th>
+        <th style="text-align: center;">Capacity (default)</th>
+        <th style="text-align: center;">Price (default)</th>
+        <th style="text-align: center;">Cost (default)</th>
+        <th></th>
+      </tr>
+      </thead>
+    @endif
+    <tbody>
+    @foreach($subfleet->fares as $atf)
+      <tr>
+        <td class="sorting_1">{{ $atf->name }}</td>
+        <td style="text-align: center;">{{ $atf->code }}</td>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $atf->id }}" data-name="capacity">{{ $atf->pivot->capacity }}</a>
+          <span class="small background-color-grey-light">({{ $atf->capacity }})</span>
+        </td>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $atf->id }}" data-name="price">{{ $atf->pivot->price }}</a>
+          <span class="small background-color-grey-light">({{ $atf->price }})</span></td>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $atf->id }}" data-name="cost">{{ $atf->pivot->cost }}</a>
+          <span class="small background-color-grey-light">({{ $atf->cost}})</span></td>
+        <td style="text-align: right; width:3%;">
+          {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
+                          'method' => 'delete',
+                          'class' => 'rm_fare'
+                          ])
+          }}
+          {{ Form::hidden('fare_id', $atf->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>',
+                           ['type' => 'submit',
+                            'class' => 'btn btn-sm btn-danger btn-icon']) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/fares',
+                        'method' => 'post',
+                        'class' => 'rm_fare form-inline'
+                        ])
+        }}
+        {{ 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',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-s']) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/subfleets/fields.blade.php b/resources/views/admin/subfleets/fields.blade.php
index ce1ebd33..0a635b8c 100644
--- a/resources/views/admin/subfleets/fields.blade.php
+++ b/resources/views/admin/subfleets/fields.blade.php
@@ -1,73 +1,73 @@
 <div class="row">
-    <div class="col-sm-12">
-        @component('admin.components.info')
-            Subfleets are aircraft groups. The "type" is a short name. Airlines always
-            group aircraft together by feature, so 737s with winglets might have a type of
-            "B.738-WL". You can create as many as you want, you need at least one, though.
+  <div class="col-sm-12">
+    @component('admin.components.info')
+      Subfleets are aircraft groups. The "type" is a short name. Airlines always
+      group aircraft together by feature, so 737s with winglets might have a type of
+      "B.738-WL". You can create as many as you want, you need at least one, though.
 
-            Read more about subfleets <a
-                    href="http://docs.phpvms.net/concepts/basics#subfleets-and-aircraft"
-                    target="_new">here</a>.
+      Read more about subfleets <a
+        href="http://docs.phpvms.net/concepts/basics#subfleets-and-aircraft"
+        target="_new">here</a>.
 
-        @endcomponent
-    </div>
+    @endcomponent
+  </div>
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('airline_id', 'Airline:') }}
-        {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-    </div>
+  <div class="form-group col-sm-4">
+    {{ Form::label('airline_id', 'Airline:') }}
+    {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+  </div>
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('type', 'Type:') }}
-        {{ Form::text('type', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('type') }}</p>
-    </div>
+  <div class="form-group col-sm-4">
+    {{ Form::label('type', 'Type:') }}
+    {{ Form::text('type', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('type') }}</p>
+  </div>
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('name', 'Name:') }}
-        {{ Form::text('name', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
-    </div>
+  <div class="form-group col-sm-4">
+    {{ Form::label('name', 'Name:') }}
+    {{ 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-3">
-        {{ Form::label('cost_block_hour', 'Cost Per Hour:') }}
-        {{ Form::number('cost_block_hour', null , ['class' => 'form-control', 'step' => '0.01']) }}
-        <p class="text-danger">{{ $errors->first('cost_block_hour') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('cost_block_hour', 'Cost Per Hour:') }}
+    {{ Form::number('cost_block_hour', null , ['class' => 'form-control', 'step' => '0.01']) }}
+    <p class="text-danger">{{ $errors->first('cost_block_hour') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('cost_delay_minute', 'Cost Delay Per Minute:') }}
-        {{ Form::number('cost_delay_minute', null , ['class' => 'form-control', 'step' => '0.01']) }}
-        <p class="text-danger">{{ $errors->first('cost_delay_minute') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('cost_delay_minute', 'Cost Delay Per Minute:') }}
+    {{ Form::number('cost_delay_minute', null , ['class' => 'form-control', 'step' => '0.01']) }}
+    <p class="text-danger">{{ $errors->first('cost_delay_minute') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('fuel_type', 'Fuel Type:') }}
-        {{ Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('fuel_type') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('fuel_type', 'Fuel Type:') }}
+    {{ Form::select('fuel_type', $fuel_types, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('fuel_type') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('ground_handling_multiplier', 'Ground Handling Multiplier:') }}
-        {{ Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
+  <div class="form-group col-sm-3">
+    {{ Form::label('ground_handling_multiplier', 'Ground Handling Multiplier:') }}
+    {{ Form::text('ground_handling_multiplier', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('ground_handling_multiplier') }}</p>
 
-        @component('admin.components.info')
-            This is the multiplier of the airport ground-handling cost to charge for
-            aircraft in this subfleet, as a percentage. Defaults to 100.
-        @endcomponent
-    </div>
+    @component('admin.components.info')
+      This is the multiplier of the airport ground-handling cost to charge for
+      aircraft in this subfleet, as a percentage. Defaults to 100.
+    @endcomponent
+  </div>
 </div>
 <div class="row">
 
-    <div class="form-group col-sm-12">
-        <div class="pull-right">
-            {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-            <a href="{{ route('admin.subfleets.index') }}" class="btn btn-default">Cancel</a>
-        </div>
+  <div class="form-group col-sm-12">
+    <div class="pull-right">
+      {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+      <a href="{{ route('admin.subfleets.index') }}" class="btn btn-default">Cancel</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/subfleets/import.blade.php b/resources/views/admin/subfleets/import.blade.php
index d153f88e..c5b830c4 100644
--- a/resources/views/admin/subfleets/import.blade.php
+++ b/resources/views/admin/subfleets/import.blade.php
@@ -1,5 +1,5 @@
 @extends('admin.app')
 @section('title', 'Import Subfleets')
 @section('content')
-    @include('admin.common.import', ['route' => 'admin.subfleets.import'])
+  @include('admin.common.import', ['route' => 'admin.subfleets.import'])
 @endsection
diff --git a/resources/views/admin/subfleets/index.blade.php b/resources/views/admin/subfleets/index.blade.php
index 5134c070..3c2ec2aa 100644
--- a/resources/views/admin/subfleets/index.blade.php
+++ b/resources/views/admin/subfleets/index.blade.php
@@ -2,16 +2,16 @@
 @section('title', 'Subfleets')
 
 @section('actions')
-    <li><a href="{{ route('admin.subfleets.export') }}"><i class="ti-plus"></i>Export to CSV</a>
-    <li><a href="{{ route('admin.subfleets.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
-    <li><a href="{{ route('admin.subfleets.create') }}"><i class="ti-plus"></i>Add New Subfleet</a></li>
+  <li><a href="{{ route('admin.subfleets.export') }}"><i class="ti-plus"></i>Export to CSV</a>
+  <li><a href="{{ route('admin.subfleets.import') }}"><i class="ti-plus"></i>Import from CSV</a></li>
+  <li><a href="{{ route('admin.subfleets.create') }}"><i class="ti-plus"></i>Add New Subfleet</a></li>
 @endsection
 
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.flash.message')
-            @include('admin.subfleets.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.flash.message')
+      @include('admin.subfleets.table')
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/subfleets/ranks.blade.php b/resources/views/admin/subfleets/ranks.blade.php
index c6994b7f..2aeba78c 100644
--- a/resources/views/admin/subfleets/ranks.blade.php
+++ b/resources/views/admin/subfleets/ranks.blade.php
@@ -1,74 +1,74 @@
 <div id="subfleet_ranks_wrapper" class="dataTables_wrapper form-inline dt-bootstrap">
-    <div class="header">
-        <h3>ranks</h3>
-        @component('admin.components.info')
-            These ranks are allowed to fly aircraft in this subfleet. The pay can be
-            set as a fixed amount, or a percentage of the rank's base payrate
-        @endcomponent
-    </div>
-    <br />
-    <table id="subfleet_ranks" class="table table-hover">
-        @if(count($subfleet->ranks))
-        <thead>
-        <tr>
-            <th>Name</th>
-            <th style="text-align: center;">Base rate</th>
-            <th style="text-align: center;">ACARS pay</th>
-            <th style="text-align: center;">Manual pay</th>
-            <th></th>
-        </tr>
-        </thead>
-        @endif
-        <tbody>
-        @foreach($subfleet->ranks as $rank)
-            <tr>
-                <td class="sorting_1">{{ $rank->name }}</td>
-                <td style="text-align: center;">{{ $rank->base_pay_rate ?: '-' }}</td>
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $rank->id }}"
-                       data-name="acars_pay">{{ $rank->pivot->acars_pay }}</a>
-                </td>
-
-                <td style="text-align: center;">
-                    <a href="#" data-pk="{{ $rank->id }}"
-                       data-name="manual_pay">{{ $rank->pivot->manual_pay }}</a>
-                </td>
-
-                <td style="text-align: right; width:3%;">
-                    {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
-                                    'method' => 'delete',
-                                    'class' => 'modify_rank'])
-                    }}
-                    {{ Form::hidden('rank_id', $rank->id) }}
-                    {{ Form::button('<i class="fa fa-times"></i>',
-                                     ['type' => 'submit',
-                                      'class' => 'btn btn-sm btn-danger btn-icon']) }}
-                    {{ Form::close() }}
-                </td>
-            </tr>
-        @endforeach
-        </tbody>
-    </table>
-    <hr />
-    <div class="row">
-        <div class="col-xs-12">
-            <div class="text-right">
-            {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
-                            'method' => 'post',
-                            'class' => 'modify_rank form-inline'])
-            }}
-            {{ Form::select('rank_id', $avail_ranks, null, [
-                    'placeholder' => 'Select Rank',
-                    'class' => 'ac-fare-dropdown form-control input-lg select2',
-
-                ])
-            }}
-            {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
-                             ['type' => 'submit',
-                              'class' => 'btn btn-success btn-s']) }}
-            {{ Form::close() }}
-            </div>
-        </div>
+  <div class="header">
+    <h3>ranks</h3>
+    @component('admin.components.info')
+      These ranks are allowed to fly aircraft in this subfleet. The pay can be
+      set as a fixed amount, or a percentage of the rank's base payrate
+    @endcomponent
+  </div>
+  <br/>
+  <table id="subfleet_ranks" class="table table-hover">
+    @if(count($subfleet->ranks))
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th style="text-align: center;">Base rate</th>
+        <th style="text-align: center;">ACARS pay</th>
+        <th style="text-align: center;">Manual pay</th>
+        <th></th>
+      </tr>
+      </thead>
+    @endif
+    <tbody>
+    @foreach($subfleet->ranks as $rank)
+      <tr>
+        <td class="sorting_1">{{ $rank->name }}</td>
+        <td style="text-align: center;">{{ $rank->base_pay_rate ?: '-' }}</td>
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $rank->id }}"
+             data-name="acars_pay">{{ $rank->pivot->acars_pay }}</a>
+        </td>
+
+        <td style="text-align: center;">
+          <a href="#" data-pk="{{ $rank->id }}"
+             data-name="manual_pay">{{ $rank->pivot->manual_pay }}</a>
+        </td>
+
+        <td style="text-align: right; width:3%;">
+          {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
+                          'method' => 'delete',
+                          'class' => 'modify_rank'])
+          }}
+          {{ Form::hidden('rank_id', $rank->id) }}
+          {{ Form::button('<i class="fa fa-times"></i>',
+                           ['type' => 'submit',
+                            'class' => 'btn btn-sm btn-danger btn-icon']) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
+    @endforeach
+    </tbody>
+  </table>
+  <hr/>
+  <div class="row">
+    <div class="col-xs-12">
+      <div class="text-right">
+        {{ Form::open(['url' => '/admin/subfleets/'.$subfleet->id.'/ranks',
+                        'method' => 'post',
+                        'class' => 'modify_rank form-inline'])
+        }}
+        {{ Form::select('rank_id', $avail_ranks, null, [
+                'placeholder' => 'Select Rank',
+                'class' => 'ac-fare-dropdown form-control input-lg select2',
+
+            ])
+        }}
+        {{ Form::button('<i class="glyphicon glyphicon-plus"></i> add',
+                         ['type' => 'submit',
+                          'class' => 'btn btn-success btn-s']) }}
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
 {{--</div></div>--}}
diff --git a/resources/views/admin/subfleets/script.blade.php b/resources/views/admin/subfleets/script.blade.php
index 981d6856..01fcfe95 100644
--- a/resources/views/admin/subfleets/script.blade.php
+++ b/resources/views/admin/subfleets/script.blade.php
@@ -1,129 +1,129 @@
 @section('scripts')
-<script>
-function setEditable() {
+  <script>
+    function setEditable() {
 
-    const token = $('meta[name="csrf-token"]').attr('content');
-    const api_key = $('meta[name="api-key"]').attr('content');
+      const token = $('meta[name="csrf-token"]').attr('content');
+      const api_key = $('meta[name="api-key"]').attr('content');
 
-    $('#aircraft_fares a').editable({
+      $('#aircraft_fares a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'inherited',
         url: '{{ url('/admin/subfleets/'.$subfleet->id.'/fares') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                fare_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            fare_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('#subfleet_ranks a').editable({
+      $('#subfleet_ranks a').editable({
         type: 'text',
         mode: 'inline',
         emptytext: 'inherited',
         url: '{{ url('/admin/subfleets/'.$subfleet->id.'/ranks') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                rank_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            rank_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('#subfleet-expenses a.text').editable({
+      $('#subfleet-expenses a.text').editable({
         emptytext: '0',
         url: '{{ url('/admin/subfleets/'.$subfleet->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
+      });
 
-    $('#subfleet-expenses a.dropdown').editable({
+      $('#subfleet-expenses a.dropdown').editable({
         type: 'select',
         emptytext: '0',
         source: {!! json_encode(list_to_editable(\App\Models\Enums\ExpenseType::select())) !!},
         url: '{{ url('/admin/subfleets/'.$subfleet->id.'/expenses') }}',
         title: 'Enter override value',
         ajaxOptions: {
-            type: 'post',
-            headers: {
-                'x-api-key': api_key,
-                'X-CSRF-TOKEN': token,
-            }
+          type: 'post',
+          headers: {
+            'x-api-key': api_key,
+            'X-CSRF-TOKEN': token,
+          }
         },
         params: function (params) {
-            console.log(params);
-            return {
-                _method: 'put',
-                expense_id: params.pk,
-                name: params.name,
-                value: params.value
-            }
+          console.log(params);
+          return {
+            _method: 'put',
+            expense_id: params.pk,
+            name: params.name,
+            value: params.value
+          }
         }
-    });
-}
+      });
+    }
 
-$(document).ready(function() {
+    $(document).ready(function () {
 
-    setEditable();
+      setEditable();
 
-    $(document).on('submit', 'form.rm_fare', function(event) {
+      $(document).on('submit', 'form.rm_fare', function (event) {
         event.preventDefault();
         console.log(event);
         $.pjax.submit(event, '#aircraft_fares_wrapper', {push: false});
         setEditable();
-    });
+      });
 
-    $(document).on('submit', 'form.modify_rank', function (event) {
+      $(document).on('submit', 'form.modify_rank', function (event) {
         event.preventDefault();
         console.log(event);
         $.pjax.submit(event, '#subfleet_ranks_wrapper', {push: false});
-    });
+      });
 
-    $(document).on('submit', 'form.modify_expense', function (event) {
+      $(document).on('submit', 'form.modify_expense', function (event) {
         event.preventDefault();
         console.log(event);
         $.pjax.submit(event, '#subfleet-expenses-wrapper', {push: false});
-    });
+      });
 
-    $(document).on('pjax:complete', function() {
+      $(document).on('pjax:complete', function () {
         initPlugins();
         setEditable();
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/admin/subfleets/show.blade.php b/resources/views/admin/subfleets/show.blade.php
index 391a3e99..cbcab226 100644
--- a/resources/views/admin/subfleets/show.blade.php
+++ b/resources/views/admin/subfleets/show.blade.php
@@ -2,22 +2,22 @@
 
 @section('title', "$subfleet->name")
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.subfleets.show_fields')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.subfleets.show_fields')
     </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
+  <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>
+      @include('admin.subfleets.fares')
     </div>
+  </div>
 @endsection
 @include('admin.subfleets.script')
diff --git a/resources/views/admin/subfleets/show_fields.blade.php b/resources/views/admin/subfleets/show_fields.blade.php
index 0549c4aa..f7fe43e6 100644
--- a/resources/views/admin/subfleets/show_fields.blade.php
+++ b/resources/views/admin/subfleets/show_fields.blade.php
@@ -1,31 +1,31 @@
 <!-- Id Field -->
 <!-- Airline Id Field -->
 <div class="form-group">
-    {{ Form::label('airline_id', 'Airline Id:') }}
-    <p>{{ $subfleet->airline->name }}</p>
+  {{ Form::label('airline_id', 'Airline Id:') }}
+  <p>{{ $subfleet->airline->name }}</p>
 </div>
 
 <!-- Name Field -->
 <div class="form-group">
-    {{ Form::label('name', 'Name:') }}
-    <p>{{ $subfleet->name }}</p>
+  {{ Form::label('name', 'Name:') }}
+  <p>{{ $subfleet->name }}</p>
 </div>
 
 <!-- Type Field -->
 <div class="form-group">
-    {{ Form::label('type', 'Type:') }}
-    <p>{{ $subfleet->type }}</p>
+  {{ Form::label('type', 'Type:') }}
+  <p>{{ $subfleet->type }}</p>
 </div>
 
 <!-- Created At Field -->
 <div class="form-group">
-    {{ Form::label('created_at', 'Created At:') }}
-    <p>{{ show_datetime($subfleet->created_at) }}</p>
+  {{ Form::label('created_at', 'Created At:') }}
+  <p>{{ show_datetime($subfleet->created_at) }}</p>
 </div>
 
 <!-- Updated At Field -->
 <div class="form-group">
-    {{ Form::label('updated_at', 'Updated At:') }}
-    <p>{{ show_datetime($subfleet->updated_at) }}</p>
+  {{ Form::label('updated_at', 'Updated At:') }}
+  <p>{{ show_datetime($subfleet->updated_at) }}</p>
 </div>
 
diff --git a/resources/views/admin/subfleets/table.blade.php b/resources/views/admin/subfleets/table.blade.php
index b4bb41a7..359fe56d 100644
--- a/resources/views/admin/subfleets/table.blade.php
+++ b/resources/views/admin/subfleets/table.blade.php
@@ -1,36 +1,36 @@
 <div class="content table-responsive table-full-width">
-<table class="table table-hover table-responsive" id="subfleets-table">
+  <table class="table table-hover table-responsive" id="subfleets-table">
     <thead>
-        <th>Name</th>
-        <th>Airline</th>
-        <th>Type</th>
-        <th>Aircraft</th>
-        <th></th>
+    <th>Name</th>
+    <th>Airline</th>
+    <th>Type</th>
+    <th>Aircraft</th>
+    <th></th>
     </thead>
     <tbody>
     @foreach($subfleets as $subfleet)
-        <tr>
-            <td>
-                <a href="{{ route('admin.aircraft.index') }}?subfleet={{$subfleet->id}}">
-                {{ $subfleet->name }}
-                </a>
-            </td>
-            <td>{{ optional($subfleet->airline)->name }}</td>
-            <td>{{ $subfleet->type }}</td>
-            <td>{{ $subfleet->aircraft->count() }}</td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}
+      <tr>
+        <td>
+          <a href="{{ route('admin.aircraft.index') }}?subfleet={{$subfleet->id}}">
+            {{ $subfleet->name }}
+          </a>
+        </td>
+        <td>{{ optional($subfleet->airline)->name }}</td>
+        <td>{{ $subfleet->type }}</td>
+        <td>{{ $subfleet->aircraft->count() }}</td>
+        <td class="text-right">
+          {{ Form::open(['route' => ['admin.subfleets.destroy', $subfleet->id], 'method' => 'delete']) }}
 
-                <a href="{{ route('admin.subfleets.edit', [$subfleet->id]) }}" class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
+          <a href="{{ route('admin.subfleets.edit', [$subfleet->id]) }}" class='btn btn-sm btn-success btn-icon'>
+            <i class="fas fa-pencil-alt"></i></a>
 
-                {{ Form::button('<i class="fa fa-times"></i>',
-                                 ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
-                                  'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
+          {{ Form::button('<i class="fa fa-times"></i>',
+                           ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon',
+                            'onclick' => "return confirm('Are you sure?')"]) }}
+          {{ Form::close() }}
+        </td>
+      </tr>
     @endforeach
     </tbody>
-</table>
+  </table>
 </div>
diff --git a/resources/views/admin/users/create.blade.php b/resources/views/admin/users/create.blade.php
index fea30934..bd2dc215 100644
--- a/resources/views/admin/users/create.blade.php
+++ b/resources/views/admin/users/create.blade.php
@@ -1,11 +1,11 @@
 @extends('admin.app')
 @section('title', 'Add User')
 @section('content')
-    <div class="card border-blue-bottom">
-        <div class="content">
-            {{ Form::open(['route' => 'admin.airlines.store']) }}
-                @include('admin.airlines.fields')
-            {{ Form::close() }}
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::open(['route' => 'admin.airlines.store']) }}
+      @include('admin.airlines.fields')
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/users/edit.blade.php b/resources/views/admin/users/edit.blade.php
index 993d0436..cd2f9e1b 100644
--- a/resources/views/admin/users/edit.blade.php
+++ b/resources/views/admin/users/edit.blade.php
@@ -1,27 +1,27 @@
 @extends('admin.app')
 @section('title', 'Edit '. $user->name)
 @section('content')
-<div class="card border-blue-bottom">
-   <div class="content">
-       {{ Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) }}
-            @include('admin.users.fields')
-       {{ Form::close() }}
-   </div>
-</div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      {{ Form::model($user, ['route' => ['admin.users.update', $user->id], 'method' => 'patch']) }}
+      @include('admin.users.fields')
+      {{ Form::close() }}
+    </div>
+  </div>
 
-<div class="card border-blue-bottom">
-   <div class="content">
+  <div class="card border-blue-bottom">
+    <div class="content">
       <div class="header">
-         <h3>PIREPs</h3>
+        <h3>PIREPs</h3>
       </div>
 
       @include('admin.pireps.table')
 
       <div class="row">
-         <div class="col-12 text-center">
-            {{ $pireps->links('admin.pagination.default') }}
-         </div>
+        <div class="col-12 text-center">
+          {{ $pireps->links('admin.pagination.default') }}
+        </div>
       </div>
-   </div>
-</div>
+    </div>
+  </div>
 @endsection
diff --git a/resources/views/admin/users/fields.blade.php b/resources/views/admin/users/fields.blade.php
index fb613f2c..40273463 100644
--- a/resources/views/admin/users/fields.blade.php
+++ b/resources/views/admin/users/fields.blade.php
@@ -1,131 +1,131 @@
 <div class="row">
-    {{ Form::hidden('id') }}
-    <div class="form-group col-sm-3">
-        {{ Form::label('pilot_id', 'Pilot ID:') }}
-        {{ Form::number('pilot_id', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('pilot_id') }}</p>
-    </div>
+  {{ Form::hidden('id') }}
+  <div class="form-group col-sm-3">
+    {{ Form::label('pilot_id', 'Pilot ID:') }}
+    {{ Form::number('pilot_id', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('pilot_id') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('name', 'Name:') }}
-        {{ Form::text('name', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('name', 'Name:') }}
+    {{ Form::text('name', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('name') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('email', 'Email:') }}
-        {{ Form::text('email', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('email') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('email', 'Email:') }}
+    {{ Form::text('email', null, ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('email') }}</p>
+  </div>
 
-    <div class="form-group col-sm-3">
-        {{ Form::label('password', 'Password:') }}
-        {{ Form::password('password', ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('password') }}</p>
-    </div>
+  <div class="form-group col-sm-3">
+    {{ Form::label('password', 'Password:') }}
+    {{ Form::password('password', ['class' => 'form-control']) }}
+    <p class="text-danger">{{ $errors->first('password') }}</p>
+  </div>
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-6">
-        <div class="form-group">
-            {{ Form::label('country', 'Country:') }} <br />
-            {{ Form::select('country', $countries, null, ['class' => 'select2' ]) }}
-            <p class="text-danger">{{ $errors->first('country') }}</p>
-        </div>
-        <div class="form-group">
-            {{ Form::label('timezone', 'Timezone:') }} <br/>
-            {{ Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2' ]) }}
-            <p class="text-danger">{{ $errors->first('timezone') }}</p>
-        </div>
-        <div class="form-group col-sm-4">
-            {{ Form::label('transfer_time', 'Transferred Hours:') }}
-            {{ Form::text('transfer_time', \App\Facades\Utils::minutesToHours($user->transfer_time), ['class' => 'form-control']) }}
-            <p class="text-danger">{{ $errors->first('transfer_time') }}</p>
-        </div>
+  <div class="form-group col-sm-6">
+    <div class="form-group">
+      {{ Form::label('country', 'Country:') }} <br/>
+      {{ Form::select('country', $countries, null, ['class' => 'select2' ]) }}
+      <p class="text-danger">{{ $errors->first('country') }}</p>
     </div>
-    <div class="form-group col-sm-6">
-        {{ Form::label('home_airport_id', 'Home Airport:') }}
-        {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
-        <br /><br />
-        {{ Form::label('curr_airport_id', 'Current Airport:') }}
-        {{ Form::select('curr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
-        <p class="text-danger">{{ $errors->first('curr_airport_id') }}</p>
+    <div class="form-group">
+      {{ Form::label('timezone', 'Timezone:') }} <br/>
+      {{ Form::select('timezone', $timezones, null, ['id' => 'timezone', 'class' => 'select2' ]) }}
+      <p class="text-danger">{{ $errors->first('timezone') }}</p>
     </div>
-
-</div>
-
-<div class="row">
     <div class="form-group col-sm-4">
-        {{ Form::label('airline_id', 'Airline:') }}
-        {{ Form::select('airline_id', $airlines, null, ['class' => 'form-control select2', 'placeholder' => 'Select Airline']) }}
+      {{ Form::label('transfer_time', 'Transferred Hours:') }}
+      {{ Form::text('transfer_time', \App\Facades\Utils::minutesToHours($user->transfer_time), ['class' => 'form-control']) }}
+      <p class="text-danger">{{ $errors->first('transfer_time') }}</p>
     </div>
+  </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('home_airport_id', 'Home Airport:') }}
+    {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
+    <br/><br/>
+    {{ Form::label('curr_airport_id', 'Current Airport:') }}
+    {{ Form::select('curr_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+    <p class="text-danger">{{ $errors->first('curr_airport_id') }}</p>
+  </div>
 
-    <div class="form-group col-sm-4">
-        {{ Form::label('rank_id', 'Rank:') }}
-        {{ Form::select('rank_id', $ranks, null, ['class' => 'form-control select2', 'placeholder' => 'Select Rank']) }}
-    </div>
-
-    <div class="form-group col-sm-4">
-        {{ Form::label('roles', 'Roles:') }}
-        {{ Form::select('roles[]', $roles, $user->roles->pluck('id'),
-            ['class' => 'form-control select2', 'placeholder' => 'Select Roles', 'multiple']) }}
-    </div>
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-6">
-        {{ Form::label('state', 'State:') }}
-        <label class="checkbox-inline">
-            {{ Form::select('state', UserState::labels(), null, ['class' => 'form-control select2']) }}
-        </label>
-    </div>
+  <div class="form-group col-sm-4">
+    {{ Form::label('airline_id', 'Airline:') }}
+    {{ Form::select('airline_id', $airlines, null, ['class' => 'form-control select2', 'placeholder' => 'Select Airline']) }}
+  </div>
 
-    <!-- Submit Field -->
-    <div class="form-group col-sm-6 text-right">
-        {{--<a href="{{ route('admin.users.regen_apikey', [$user->id]) }}" class="btn btn-warning"
-           onclick="return confirm('Are you sure? This will reset this user\'s API key.')">new api key</a>--}}
-        &nbsp;
-        {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
-        <a href="{{ route('admin.users.index') }}" class="btn btn-default">Cancel</a>
-    </div>
+  <div class="form-group col-sm-4">
+    {{ Form::label('rank_id', 'Rank:') }}
+    {{ Form::select('rank_id', $ranks, null, ['class' => 'form-control select2', 'placeholder' => 'Select Rank']) }}
+  </div>
+
+  <div class="form-group col-sm-4">
+    {{ Form::label('roles', 'Roles:') }}
+    {{ Form::select('roles[]', $roles, $user->roles->pluck('id'),
+        ['class' => 'form-control select2', 'placeholder' => 'Select Roles', 'multiple']) }}
+  </div>
 </div>
 
 <div class="row">
-    <div class="form-group col-sm-12">
-        <table class="table table-hover">
-            {{--<tr>
-                <td>API Key</td>
-                <td>{{ $user->api_key }}</td>
-            </tr>--}}
-            <tr>
-                <td>Total Flights</td>
-                <td>{{ $user->flights }}</td>
-            </tr>
-            <tr>
-                <td>Flight Time</td>
-                <td>{{ Utils::minutesToTimeString($user->flight_time) }}</td>
-            </tr>
-            <tr>
-                <td>IP Address</td>
-                <td>{{ $user->last_ip }}</td>
-            </tr>
-            <tr>
-                <td>Registered On</td>
-                <td>{{ show_datetime($user->created_at) }}</td>
-            </tr>
-            <tr>
-                <td>Last Login</td>
-                <td>{{ show_datetime($user->updated_at) }}</td>
-            </tr>
-            <tr>
-                <td>@lang('toc.title')</td>
-                <td>{{ $user->toc_accepted ? __('common.yes') : __('common.no') }}</td>
-            </tr>
-            <tr>
-                <td>@lang('profile.opt-in')</td>
-                <td>{{ $user->opt_in ? __('common.yes') : __('common.no') }}</td>
-            </tr>
-        </table>
-    </div>
+  <div class="form-group col-sm-6">
+    {{ Form::label('state', 'State:') }}
+    <label class="checkbox-inline">
+      {{ Form::select('state', UserState::labels(), null, ['class' => 'form-control select2']) }}
+    </label>
+  </div>
+
+  <!-- Submit Field -->
+  <div class="form-group col-sm-6 text-right">
+    {{--<a href="{{ route('admin.users.regen_apikey', [$user->id]) }}" class="btn btn-warning"
+       onclick="return confirm('Are you sure? This will reset this user\'s API key.')">new api key</a>--}}
+    &nbsp;
+    {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
+    <a href="{{ route('admin.users.index') }}" class="btn btn-default">Cancel</a>
+  </div>
+</div>
+
+<div class="row">
+  <div class="form-group col-sm-12">
+    <table class="table table-hover">
+      {{--<tr>
+          <td>API Key</td>
+          <td>{{ $user->api_key }}</td>
+      </tr>--}}
+      <tr>
+        <td>Total Flights</td>
+        <td>{{ $user->flights }}</td>
+      </tr>
+      <tr>
+        <td>Flight Time</td>
+        <td>{{ Utils::minutesToTimeString($user->flight_time) }}</td>
+      </tr>
+      <tr>
+        <td>IP Address</td>
+        <td>{{ $user->last_ip }}</td>
+      </tr>
+      <tr>
+        <td>Registered On</td>
+        <td>{{ show_datetime($user->created_at) }}</td>
+      </tr>
+      <tr>
+        <td>Last Login</td>
+        <td>{{ show_datetime($user->updated_at) }}</td>
+      </tr>
+      <tr>
+        <td>@lang('toc.title')</td>
+        <td>{{ $user->toc_accepted ? __('common.yes') : __('common.no') }}</td>
+      </tr>
+      <tr>
+        <td>@lang('profile.opt-in')</td>
+        <td>{{ $user->opt_in ? __('common.yes') : __('common.no') }}</td>
+      </tr>
+    </table>
+  </div>
 </div>
diff --git a/resources/views/admin/users/index.blade.php b/resources/views/admin/users/index.blade.php
index 7b06bb13..fb6793ab 100644
--- a/resources/views/admin/users/index.blade.php
+++ b/resources/views/admin/users/index.blade.php
@@ -2,26 +2,26 @@
 
 @section('title', 'Users')
 @section('actions')
-    <li><a href="{{ route('admin.users.index') }}?search=state:0">
-            <i class="ti-user"></i>@lang(UserState::label(UserState::PENDING))</a>
-    </li>
+  <li><a href="{{ route('admin.users.index') }}?search=state:0">
+      <i class="ti-user"></i>@lang(UserState::label(UserState::PENDING))</a>
+  </li>
 @endsection
 
 @section('content')
-    <div class="card">
-        @include('admin.users.search')
-    </div>
+  <div class="card">
+    @include('admin.users.search')
+  </div>
 
-    <div class="card border-blue-bottom">
-        <div class="content">
-            @include('admin.users.table')
-        </div>
+  <div class="card border-blue-bottom">
+    <div class="content">
+      @include('admin.users.table')
     </div>
+  </div>
 
-    <div class="row">
-        <div class="col-12 text-center">
-            {{ $users->links('admin.pagination.default') }}
-        </div>
+  <div class="row">
+    <div class="col-12 text-center">
+      {{ $users->links('admin.pagination.default') }}
     </div>
+  </div>
 @endsection
 
diff --git a/resources/views/admin/users/search.blade.php b/resources/views/admin/users/search.blade.php
index 62934575..38b5f6f7 100644
--- a/resources/views/admin/users/search.blade.php
+++ b/resources/views/admin/users/search.blade.php
@@ -1,26 +1,26 @@
 <div class="content">
-    <div class="row">
-        <div class="col-sm-12">
-            <div class="form-group">
-                {{ Form::open(['route' => 'admin.users.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
+  <div class="row">
+    <div class="col-sm-12">
+      <div class="form-group">
+        {{ Form::open(['route' => 'admin.users.index', 'method' => 'GET', 'class'=>'form-inline pull-right']) }}
 
-                {{ Form::label('name', 'Name:') }}
-                {{ Form::text('name', null, ['class' => 'form-control']) }}
+        {{ Form::label('name', 'Name:') }}
+        {{ Form::text('name', null, ['class' => 'form-control']) }}
 
-                {{ Form::label('email', 'Email:') }}
-                {{ Form::text('email', null, ['class' => 'form-control']) }}
-                &nbsp;
-                {{--{{ Form::label('dep_icao', 'Departure:') }}
-                {{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
-                &nbsp;
-                {{ Form::label('arr_icao', 'Arrival:') }}
-                {{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
-                &nbsp;--}}
-                {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
-                &nbsp;
-                <a href="{{ route('admin.users.index') }}">clear</a>
-                {{ Form::close() }}
-            </div>
-        </div>
+        {{ Form::label('email', 'Email:') }}
+        {{ Form::text('email', null, ['class' => 'form-control']) }}
+        &nbsp;
+        {{--{{ Form::label('dep_icao', 'Departure:') }}
+        {{ Form::select('dep_icao', $airports, null , ['class' => 'form-control']) }}
+        &nbsp;
+        {{ Form::label('arr_icao', 'Arrival:') }}
+        {{ Form::select('arr_icao', $airports, null , ['class' => 'form-control']) }}
+        &nbsp;--}}
+        {{ Form::submit('find', ['class' => 'btn btn-primary']) }}
+        &nbsp;
+        <a href="{{ route('admin.users.index') }}">clear</a>
+        {{ Form::close() }}
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/admin/users/show.blade.php b/resources/views/admin/users/show.blade.php
index 281add2d..de172373 100644
--- a/resources/views/admin/users/show.blade.php
+++ b/resources/views/admin/users/show.blade.php
@@ -1,10 +1,10 @@
 @extends('admin.app')
 @section('title', 'Edit '. $user->name)
 @section('content')
-<div class="card">
+  <div class="card">
     <div class="content">
-        @include('admin.users.fields')
+      @include('admin.users.fields')
     </div>
-</div>
+  </div>
 
 @endsection
diff --git a/resources/views/admin/users/table.blade.php b/resources/views/admin/users/table.blade.php
index ecac353f..b235514a 100644
--- a/resources/views/admin/users/table.blade.php
+++ b/resources/views/admin/users/table.blade.php
@@ -1,45 +1,45 @@
 <table class="table table-hover table-responsive" id="users-table">
-    <thead>
-        <th>ID</th>
-        <th>Name</th>
-        <th>Email</th>
-        <th>Registered</th>
-        <th class="text-center">Active</th>
-        <th></th>
-    </thead>
-    <tbody>
-    @foreach($users as $user)
-        <tr>
-            <td>{{ $user->ident }}</td>
-            <td>
-                @if(filled($user->country))
-                    <span class="flag-icon flag-icon-{{ $user->country }}"
-                          title="{{ $country->alpha2($user->country)['name'] }}"></span>
-                    &nbsp;
-                @endif
-                <a href="{{ route('admin.users.edit', [$user->id]) }}">{{ $user->name }}</a>
-            </td>
-            <td>{{ $user->email }}</td>
-            <td>{{ show_date($user->created_at) }}</td>
-            <td class="text-center">
-                @if($user->state === UserState::ACTIVE)
-                    <span class="label label-success">
+  <thead>
+  <th>ID</th>
+  <th>Name</th>
+  <th>Email</th>
+  <th>Registered</th>
+  <th class="text-center">Active</th>
+  <th></th>
+  </thead>
+  <tbody>
+  @foreach($users as $user)
+    <tr>
+      <td>{{ $user->ident }}</td>
+      <td>
+        @if(filled($user->country))
+          <span class="flag-icon flag-icon-{{ $user->country }}"
+                title="{{ $country->alpha2($user->country)['name'] }}"></span>
+          &nbsp;
+        @endif
+        <a href="{{ route('admin.users.edit', [$user->id]) }}">{{ $user->name }}</a>
+      </td>
+      <td>{{ $user->email }}</td>
+      <td>{{ show_date($user->created_at) }}</td>
+      <td class="text-center">
+        @if($user->state === UserState::ACTIVE)
+          <span class="label label-success">
                 @elseif($user->state === UserState::PENDING)
-                    <span class="label label-warning">
+              <span class="label label-warning">
                 @else
-                    <span class="label label-default">
+                  <span class="label label-default">
                 @endif
-                {{ UserState::label($user->state) }}</span>
-            </td>
-            <td class="text-right">
-                {{ Form::open(['route' => ['admin.users.destroy', $user->id], 'method' => 'delete']) }}
-                <a href="{{ route('admin.users.edit', [$user->id]) }}"
-                   class='btn btn-sm btn-success btn-icon'>
-                    <i class="fas fa-pencil-alt"></i></a>
-                {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
-                {{ Form::close() }}
-            </td>
-        </tr>
-    @endforeach
-    </tbody>
+                    {{ UserState::label($user->state) }}</span>
+      </td>
+      <td class="text-right">
+        {{ Form::open(['route' => ['admin.users.destroy', $user->id], 'method' => 'delete']) }}
+        <a href="{{ route('admin.users.edit', [$user->id]) }}"
+           class='btn btn-sm btn-success btn-icon'>
+          <i class="fas fa-pencil-alt"></i></a>
+        {{ Form::button('<i class="fa fa-times"></i>', ['type' => 'submit', 'class' => 'btn btn-sm btn-danger btn-icon', 'onclick' => "return confirm('Are you sure?')"]) }}
+        {{ Form::close() }}
+      </td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/layouts/default/airports/show.blade.php b/resources/views/layouts/default/airports/show.blade.php
index 63777a44..59dba4ba 100644
--- a/resources/views/layouts/default/airports/show.blade.php
+++ b/resources/views/layouts/default/airports/show.blade.php
@@ -2,107 +2,107 @@
 @section('title', $airport->full_name)
 
 @section('content')
-<div class="row" style="margin-bottom: 30px;">
+  <div class="row" style="margin-bottom: 30px;">
     <div class="col-12">
-        <h2>{{ $airport->full_name }}</h2>
+      <h2>{{ $airport->full_name }}</h2>
     </div>
 
     {{-- Show the weather widget in one column --}}
     <div class="col-5">
-        {{ Widget::Weather([
-            'icao' => $airport->icao,
-          ]) }}
+      {{ Widget::Weather([
+          'icao' => $airport->icao,
+        ]) }}
     </div>
 
     {{-- Show the airspace map in the other column --}}
     <div class="col-7">
-        {{ Widget::AirspaceMap([
-            'width' => '100%',
-            'height' => '400px',
-            'lat' => $airport->lat,
-            'lon' => $airport->lon,
-          ]) }}
+      {{ Widget::AirspaceMap([
+          'width' => '100%',
+          'height' => '400px',
+          'lat' => $airport->lat,
+          'lon' => $airport->lon,
+        ]) }}
     </div>
-</div>
-<div class="row">
+  </div>
+  <div class="row">
     {{-- There are files uploaded and a user is logged in--}}
     @if(count($airport->files) > 0 && Auth::check())
-        <div class="col-12">
-            <h3>{{ trans_choice('common.download', 2) }}</h3>
-            @include('downloads.table', ['files' => $airport->files])
-        </div>
+      <div class="col-12">
+        <h3>{{ trans_choice('common.download', 2) }}</h3>
+        @include('downloads.table', ['files' => $airport->files])
+      </div>
     @endif
-</div>
+  </div>
 
-<div class="row">
+  <div class="row">
     <div class="col-6">
-        <h5>@lang('flights.inbound')</h5>
-        @if(!$inbound_flights)
-            <div class="jumbotron text-center">
-            @lang('flights.none')
-            </div>
-        @else
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th class="text-left">@lang('airports.ident')</th>
-                    <th class="text-left">@lang('airports.departure')</th>
-                    <th>@lang('flights.dep')</th>
-                    <th>@lang('flights.arr')</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',
+      <h5>@lang('flights.inbound')</h5>
+      @if(!$inbound_flights)
+        <div class="jumbotron text-center">
+          @lang('flights.none')
+        </div>
+      @else
+        <table class="table table-striped">
+          <thead>
+          <tr>
+            <th class="text-left">@lang('airports.ident')</th>
+            <th class="text-left">@lang('airports.departure')</th>
+            <th>@lang('flights.dep')</th>
+            <th>@lang('flights.arr')</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
+              </td>
+              <td>{{ $flight->dpt_time }}</td>
+              <td>{{ $flight->arr_time }}</td>
+            </tr>
+          @endforeach
+        </table>
+      @endif
     </div>
 
     <div class="col-6">
-        <h5>@lang('flights.outbound')</h5>
-        @if(!$outbound_flights)
-            <div class="jumbotron text-center">
-            @lang('flights.none')
-            </div>
-        @else
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th class="text-left">@lang('airports.ident')</th>
-                    <th class="text-left">@lang('airports.arrival')</th>
-                    <th>@lang('flights.dep')</th>
-                    <th>@lang('flights.arr')</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',
+      <h5>@lang('flights.outbound')</h5>
+      @if(!$outbound_flights)
+        <div class="jumbotron text-center">
+          @lang('flights.none')
+        </div>
+      @else
+        <table class="table table-striped">
+          <thead>
+          <tr>
+            <th class="text-left">@lang('airports.ident')</th>
+            <th class="text-left">@lang('airports.arrival')</th>
+            <th>@lang('flights.dep')</th>
+            <th>@lang('flights.arr')</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
+              </td>
+              <td>{{ $flight->dpt_time }}</td>
+              <td>{{ $flight->arr_time }}</td>
+            </tr>
+          @endforeach
+        </table>
+      @endif
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/emails/password.blade.php b/resources/views/layouts/default/auth/emails/password.blade.php
index 7ebae94b..b796b47b 100644
--- a/resources/views/layouts/default/auth/emails/password.blade.php
+++ b/resources/views/layouts/default/auth/emails/password.blade.php
@@ -1 +1,2 @@
-{{ __('Click here to reset your password') }}: <a href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a>
+{{ __('Click here to reset your password') }}: <a
+  href="{{ $link = url('password/reset', $token).'?email='.urlencode($user->getEmailForPasswordReset()) }}"> {{ $link }} </a>
diff --git a/resources/views/layouts/default/auth/login_layout.blade.php b/resources/views/layouts/default/auth/login_layout.blade.php
index 08eafd5f..1786b82f 100644
--- a/resources/views/layouts/default/auth/login_layout.blade.php
+++ b/resources/views/layouts/default/auth/login_layout.blade.php
@@ -1,20 +1,20 @@
-
 <!DOCTYPE html>
 <html lang="en">
 
 <head>
-    <meta charset="utf-8" />
-    <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
-    <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-    <title>@yield('title') - {{ config('app.name') }}</title>
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet" />
-    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css" />
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
-    @yield('css')
+  <meta charset="utf-8"/>
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
+  <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <title>@yield('title') - {{ config('app.name') }}</title>
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_mix('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  @yield('css')
 </head>
 
 <body class="login-page" style="background: #067ec1;">
@@ -23,21 +23,22 @@
 <!-- End Navbar -->
 <div class="page-header">
 
+  <div class="container">
+    @yield('content')
+  </div>
+  <footer class="footer">
     <div class="container">
-        @yield('content')
+      <div class="copyright">
+        &copy;
+        <script>
+          document.write(new Date().getFullYear())
+        </script>
+        , powered by
+        <a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by
+        <a href="https://www.creative-tim.com" target="_blank">Creative Tim</a>
+      </div>
     </div>
-    <footer class="footer">
-        <div class="container">
-            <div class="copyright">
-                &copy;
-                <script>
-                    document.write(new Date().getFullYear())
-                </script>, powered by
-                <a href="http://www.phpvms.net" target="_blank">phpvms</a>. Now-UI by
-                <a href="https://www.creative-tim.com" target="_blank">Creative Tim</a>
-            </div>
-        </div>
-    </footer>
+  </footer>
 </div>
 </body>
 
diff --git a/resources/views/layouts/default/auth/passwords/email.blade.php b/resources/views/layouts/default/auth/passwords/email.blade.php
index 625c2416..07b73572 100644
--- a/resources/views/layouts/default/auth/passwords/email.blade.php
+++ b/resources/views/layouts/default/auth/passwords/email.blade.php
@@ -3,46 +3,46 @@
 
 <!-- Main Content -->
 @section('content')
-<div class="container">
+  <div class="container">
     <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">{{ __('Reset Password') }}</div>
-                <div class="panel-body">
-                    @if (session('status'))
-                        <div class="alert alert-success">
-                            {{ session('status') }}
-                        </div>
-                    @endif
+      <div class="col-md-8 col-md-offset-2">
+        <div class="panel panel-default">
+          <div class="panel-heading">{{ __('Reset Password') }}</div>
+          <div class="panel-body">
+            @if (session('status'))
+              <div class="alert alert-success">
+                {{ session('status') }}
+              </div>
+            @endif
 
-                    <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
-                        {{ csrf_field() }}
+            <form class="form-horizontal" role="form" method="POST" action="{{ url('/password/email') }}">
+              {{ csrf_field() }}
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
+              <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+                <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
 
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
+                <div class="col-md-6">
+                  <input id="email" type="email" class="form-control" name="email" value="{{ old('email') }}" required>
 
-                                @if ($errors->has('email'))
-                                    <span class="help-block">
+                  @if ($errors->has('email'))
+                    <span class="help-block">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-									{{ __('Send Password Reset Link') }}
-                                </button>
-                            </div>
-                        </div>
-                    </form>
+                  @endif
                 </div>
-            </div>
+              </div>
+
+              <div class="form-group">
+                <div class="col-md-6 col-md-offset-4">
+                  <button type="submit" class="btn btn-primary">
+                    {{ __('Send Password Reset Link') }}
+                  </button>
+                </div>
+              </div>
+            </form>
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/passwords/reset.blade.php b/resources/views/layouts/default/auth/passwords/reset.blade.php
index 9a563a7e..8c4c9b40 100644
--- a/resources/views/layouts/default/auth/passwords/reset.blade.php
+++ b/resources/views/layouts/default/auth/passwords/reset.blade.php
@@ -2,73 +2,74 @@
 @section('title', __('Reset Password'))
 
 @section('content')
-<div class="container">
+  <div class="container">
     <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="panel panel-default">
-                <div class="panel-heading">{{ __('Reset Password') }}</div>
-                <div class="panel-body">
-                    {{ Form::open([
-                        'url' => url('/password/reset'),
-                        'method' => 'post',
-                        'role' => 'form',
-                        'class' => 'form-horizontal',
-                        ])
-                    }}
-                        <input type="hidden" name="token" value="{{ $token }}">
+      <div class="col-md-8 col-md-offset-2">
+        <div class="panel panel-default">
+          <div class="panel-heading">{{ __('Reset Password') }}</div>
+          <div class="panel-body">
+            {{ Form::open([
+                'url' => url('/password/reset'),
+                'method' => 'post',
+                'role' => 'form',
+                'class' => 'form-horizontal',
+                ])
+            }}
+            <input type="hidden" name="token" value="{{ $token }}">
 
-                        <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
-                            <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
+            <div class="form-group{{ $errors->has('email') ? ' has-error' : '' }}">
+              <label for="email" class="col-md-4 control-label">{{ __('Email Address') }}</label>
 
-                            <div class="col-md-6">
-                                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}" required autofocus>
+              <div class="col-md-6">
+                <input id="email" type="email" class="form-control" name="email" value="{{ $email or old('email') }}"
+                       required autofocus>
 
-                                @if ($errors->has('email'))
-                                    <span class="help-block">
+                @if ($errors->has('email'))
+                  <span class="help-block">
                                         <strong>{{ $errors->first('email') }}</strong>
                                     </span>
-                                @endif
-                            </div>
-                        </div>
+                @endif
+              </div>
+            </div>
 
-                        <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label for="password" class="col-md-4 control-label">{{ __('Password') }}</label>
+            <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
+              <label for="password" class="col-md-4 control-label">{{ __('Password') }}</label>
 
-                            <div class="col-md-6">
-                                <input id="password" type="password" class="form-control" name="password" required>
+              <div class="col-md-6">
+                <input id="password" type="password" class="form-control" name="password" required>
 
-                                @if ($errors->has('password'))
-                                    <span class="help-block">
+                @if ($errors->has('password'))
+                  <span class="help-block">
                                         <strong>{{ $errors->first('password') }}</strong>
                                     </span>
-                                @endif
-                            </div>
-                        </div>
+                @endif
+              </div>
+            </div>
 
-                        <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-                            <label for="password-confirm" class="col-md-4 control-label">{{ __('Confirm Password') }}</label>
-                            <div class="col-md-6">
-                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
+            <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
+              <label for="password-confirm" class="col-md-4 control-label">{{ __('Confirm Password') }}</label>
+              <div class="col-md-6">
+                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" required>
 
-                                @if ($errors->has('password_confirmation'))
-                                    <span class="help-block">
+                @if ($errors->has('password_confirmation'))
+                  <span class="help-block">
                                         <strong>{{ $errors->first('password_confirmation') }}</strong>
                                     </span>
-                                @endif
-                            </div>
-                        </div>
-
-                        <div class="form-group">
-                            <div class="col-md-6 col-md-offset-4">
-                                <button type="submit" class="btn btn-primary">
-								{{ __('Reset Password') }}
-                                </button>
-                            </div>
-                        </div>
-                    {{ Form::close() }}
-                </div>
+                @endif
+              </div>
             </div>
+
+            <div class="form-group">
+              <div class="col-md-6 col-md-offset-4">
+                <button type="submit" class="btn btn-primary">
+                  {{ __('Reset Password') }}
+                </button>
+              </div>
+            </div>
+            {{ Form::close() }}
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/pending.blade.php b/resources/views/layouts/default/auth/pending.blade.php
index cc29d2b3..c0088516 100644
--- a/resources/views/layouts/default/auth/pending.blade.php
+++ b/resources/views/layouts/default/auth/pending.blade.php
@@ -2,13 +2,13 @@
 @section('title', __('auth.registrationpending'))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12 " style="text-align: center;">
-        <div class="flex-center position-ref full-height">
-            <div class="title m-b-md">
-                <h2 class="description">@lang('auth.pendingmessage')</h2>
-            </div>
+      <div class="flex-center position-ref full-height">
+        <div class="title m-b-md">
+          <h2 class="description">@lang('auth.pendingmessage')</h2>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection()
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index 06e011f0..6e50b105 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -2,160 +2,161 @@
 @section('title', __('auth.register'))
 
 @section('content')
-<div class="row">
-<div class="col-sm-3"></div>
-<div class="col-sm-6">
+  <div class="row">
+    <div class="col-sm-3"></div>
+    <div class="col-sm-6">
 
-{{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
+      {{ Form::open(['url' => '/register', 'class' => 'form-signin']) }}
 
-    <div class="panel periodic-login">
+      <div class="panel periodic-login">
         <div class="panel-body">
-            <h2>@lang('common.register')</h2>
-            <label for="name" class="control-label">@lang('auth.fullname')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
-                {{ Form::text('name', null, ['class' => 'form-control']) }}
-            </div>
-            @if ($errors->has('name'))
+          <h2>@lang('common.register')</h2>
+          <label for="name" class="control-label">@lang('auth.fullname')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
+            {{ Form::text('name', null, ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('name'))
             <p class="text-danger">{{ $errors->first('name') }}</p>
-            @endif
+          @endif
 
-            <label for="email" class="control-label">@lang('auth.emailaddress')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
-                {{ Form::text('email', null, ['class' => 'form-control']) }}
-            </div>
-            @if ($errors->has('email'))
-                <p class="text-danger">{{ $errors->first('email') }}</p>
-            @endif
+          <label for="email" class="control-label">@lang('auth.emailaddress')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
+            {{ Form::text('email', null, ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('email'))
+            <p class="text-danger">{{ $errors->first('email') }}</p>
+          @endif
 
-            <label for="airline" class="control-label">@lang('common.airline')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('airline') ? 'has-danger' : '' }}">
-                {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-            </div>
-            @if ($errors->has('airline_id'))
+          <label for="airline" class="control-label">@lang('common.airline')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('airline') ? 'has-danger' : '' }}">
+            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+          </div>
+          @if ($errors->has('airline_id'))
             <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-            @endif
+          @endif
 
-            <label for="home_airport" class="control-label">@lang('airports.home')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('home_airport') ? 'has-danger' : '' }}">
-                {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
-            </div>
-            @if ($errors->has('home_airport_id'))
+          <label for="home_airport" class="control-label">@lang('airports.home')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('home_airport') ? 'has-danger' : '' }}">
+            {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+          </div>
+          @if ($errors->has('home_airport_id'))
             <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
-            @endif
+          @endif
 
-            <label for="country" class="control-label">@lang('common.country')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
-                {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+          <label for="country" class="control-label">@lang('common.country')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('country') ? 'has-danger' : '' }}">
+            {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+          </div>
+          @if ($errors->has('country'))
+            <p class="text-danger">{{ $errors->first('country') }}</p>
+          @endif
+
+          <label for="timezone" class="control-label">@lang('common.timezone')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('timezone') ? 'has-danger' : '' }}">
+            {{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
+          </div>
+          @if ($errors->has('timezone'))
+            <p class="text-danger">{{ $errors->first('timezone') }}</p>
+          @endif
+
+          @if (setting('pilots.allow_transfer_hours') === true)
+            <label for="transfer_time" class="control-label">@lang('auth.transferhours')</label>
+            <div class="input-group form-group-no-border {{ $errors->has('transfer_time') ? 'has-danger' : '' }}">
+              {{ Form::number('transfer_time', 0, ['class' => 'form-control']) }}
             </div>
-            @if ($errors->has('country'))
-                <p class="text-danger">{{ $errors->first('country') }}</p>
+            @if ($errors->has('transfer_time'))
+              <p class="text-danger">{{ $errors->first('transfer_time') }}</p>
             @endif
+          @endif
 
-            <label for="timezone" class="control-label">@lang('common.timezone')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('timezone') ? 'has-danger' : '' }}">
-                {{ Form::select('timezone', $timezones, null, ['id'=>'timezone', 'class' => 'form-control select2' ]) }}
-            </div>
-            @if ($errors->has('timezone'))
-                <p class="text-danger">{{ $errors->first('timezone') }}</p>
-            @endif
-
-            @if (setting('pilots.allow_transfer_hours') === true)
-                <label for="transfer_time" class="control-label">@lang('auth.transferhours')</label>
-                <div class="input-group form-group-no-border {{ $errors->has('transfer_time') ? 'has-danger' : '' }}">
-                    {{ Form::number('transfer_time', 0, ['class' => 'form-control']) }}
-                </div>
-                @if ($errors->has('transfer_time'))
-                    <p class="text-danger">{{ $errors->first('transfer_time') }}</p>
-                @endif
-            @endif
-
-            <label for="password" class="control-label">@lang('auth.password')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
-                {{ Form::password('password', ['class' => 'form-control']) }}
-            </div>
-            @if ($errors->has('password'))
+          <label for="password" class="control-label">@lang('auth.password')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
+            {{ Form::password('password', ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('password'))
             <p class="text-danger">{{ $errors->first('password') }}</p>
-            @endif
+          @endif
 
-            <label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
-            <div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
-                {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+          <label for="password_confirmation" class="control-label">@lang('passwords.confirm')</label>
+          <div class="input-group form-group-no-border {{ $errors->has('password_confirmation') ? 'has-danger' : '' }}">
+            {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('password_confirmation'))
+            <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
+          @endif
+
+          @if(config('captcha.enabled'))
+            <label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
+            <div
+              class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
+              {!! NoCaptcha::display(config('captcha.attributes')) !!}
             </div>
-            @if ($errors->has('password_confirmation'))
-                <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
+            @if ($errors->has('g-recaptcha-response'))
+              <p class="text-danger">{{ $errors->first('g-recaptcha-response') }}</p>
             @endif
+          @endif
 
-            @if(config('captcha.enabled'))
-                <label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
-                <div class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
-                    {!! NoCaptcha::display(config('captcha.attributes')) !!}
+          <div>
+            @include('auth.toc')
+            <br/>
+          </div>
+
+          <table>
+            <tr>
+              <td style="vertical-align: top; padding: 5px 10px 0 0">
+                <div class="input-group form-group-no-border">
+                  {{ Form::hidden('toc_accepted', 0, false) }}
+                  {{ Form::checkbox('toc_accepted', 1, null, ['id' => 'toc_accepted']) }}
                 </div>
-                @if ($errors->has('g-recaptcha-response'))
-                    <p class="text-danger">{{ $errors->first('g-recaptcha-response') }}</p>
+              </td>
+              <td style="vertical-align: top;">
+                <label for="toc_accepted" class="control-label">@lang('auth.tocaccept')</label>
+                @if ($errors->has('toc_accepted'))
+                  <p class="text-danger">{{ $errors->first('toc_accepted') }}</p>
                 @endif
-            @endif
+              </td>
+            </tr>
+            <tr>
+              <td>
+                <div class="input-group form-group-no-border">
+                  {{ Form::hidden('opt_in', 0, false) }}
+                  {{ Form::checkbox('opt_in', 1, null) }}
+                </div>
+              </td>
+              <td>
+                <label for="opt_in" class="control-label">@lang('profile.opt-in-descrip')</label>
+              </td>
+            </tr>
+          </table>
 
-            <div>
-                @include('auth.toc')
-                <br />
-            </div>
-
-            <table>
-                <tr>
-                    <td style="vertical-align: top; padding: 5px 10px 0 0">
-                        <div class="input-group form-group-no-border">
-                            {{ Form::hidden('toc_accepted', 0, false) }}
-                            {{ Form::checkbox('toc_accepted', 1, null, ['id' => 'toc_accepted']) }}
-                        </div>
-                    </td>
-                    <td style="vertical-align: top;">
-                        <label for="toc_accepted" class="control-label">@lang('auth.tocaccept')</label>
-                        @if ($errors->has('toc_accepted'))
-                            <p class="text-danger">{{ $errors->first('toc_accepted') }}</p>
-                        @endif
-                    </td>
-                </tr>
-                <tr>
-                    <td>
-                        <div class="input-group form-group-no-border">
-                            {{ Form::hidden('opt_in', 0, false) }}
-                            {{ Form::checkbox('opt_in', 1, null) }}
-                        </div>
-                    </td>
-                    <td>
-                        <label for="opt_in" class="control-label">@lang('profile.opt-in-descrip')</label>
-                    </td>
-                </tr>
-            </table>
-
-            <div style="width: 100%; text-align: right; padding-top: 20px;">
-                {{ Form::submit(__('auth.register'), [
-                    'id' => 'register_button',
-                    'class' => 'btn btn-primary',
-                    'disabled' => true,
-                   ]) }}
-            </div>
+          <div style="width: 100%; text-align: right; padding-top: 20px;">
+            {{ Form::submit(__('auth.register'), [
+                'id' => 'register_button',
+                'class' => 'btn btn-primary',
+                'disabled' => true,
+               ]) }}
+          </div>
 
         </div>
+      </div>
+      {{ Form::close() }}
     </div>
-{{ Form::close() }}
-</div>
-<div class="col-sm-4"></div>
-</div>
+    <div class="col-sm-4"></div>
+  </div>
 @endsection
 
 @section('scripts')
-{!! NoCaptcha::renderJs(config('app.locale')) !!}
+  {!! NoCaptcha::renderJs(config('app.locale')) !!}
 
-<script>
-$('#toc_accepted').click(function () {
-  if ($(this).is(':checked')) {
-    console.log('toc accepted');
-    $('#register_button').removeAttr('disabled');
-  } else {
-    console.log('toc not accepted');
-    $('#register_button').attr('disabled', 'true');
-  }
-});
-</script>
+  <script>
+    $('#toc_accepted').click(function () {
+      if ($(this).is(':checked')) {
+        console.log('toc accepted');
+        $('#register_button').removeAttr('disabled');
+      } else {
+        console.log('toc not accepted');
+        $('#register_button').attr('disabled', 'true');
+      }
+    });
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/auth/registered.blade.php b/resources/views/layouts/default/auth/registered.blade.php
index 17c68ae1..ea4d7486 100644
--- a/resources/views/layouts/default/auth/registered.blade.php
+++ b/resources/views/layouts/default/auth/registered.blade.php
@@ -2,10 +2,10 @@
 @section('title', __('auth.registrationsubmitted'))
 
 @section('content')
-<div class="container registered-page">
+  <div class="container registered-page">
     <h3>@lang('auth.registrationconfirmation')</h3>
     <p>
-        @lang('auth.confirmationmessage')
+      @lang('auth.confirmationmessage')
     </p>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/rejected.blade.php b/resources/views/layouts/default/auth/rejected.blade.php
index f3bd198f..d138d35d 100644
--- a/resources/views/layouts/default/auth/rejected.blade.php
+++ b/resources/views/layouts/default/auth/rejected.blade.php
@@ -2,15 +2,15 @@
 @section('title', __('auth.registrationdenied'))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12 " style="text-align: center;">
-        <div class="flex-center position-ref full-height">
-            <div class="title m-b-md">
-                <h2 class="description">
-                @lang('auth.deniedmessage')
-                </h2>
-            </div>
+      <div class="flex-center position-ref full-height">
+        <div class="title m-b-md">
+          <h2 class="description">
+            @lang('auth.deniedmessage')
+          </h2>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/suspended.blade.php b/resources/views/layouts/default/auth/suspended.blade.php
index 7a187007..0409c050 100644
--- a/resources/views/layouts/default/auth/suspended.blade.php
+++ b/resources/views/layouts/default/auth/suspended.blade.php
@@ -2,15 +2,15 @@
 @section('title', __('auth.accountsuspended'))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12 " style="text-align: center;">
-        <div class="flex-center position-ref full-height">
-            <div class="title m-b-md">
-                <h2 class="description">
-                @lang('auth.suspendedmessage')
-                </h2>
-            </div>
+      <div class="flex-center position-ref full-height">
+        <div class="title m-b-md">
+          <h2 class="description">
+            @lang('auth.suspendedmessage')
+          </h2>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/verify.blade.php b/resources/views/layouts/default/auth/verify.blade.php
index 1b266428..a6b7af9e 100644
--- a/resources/views/layouts/default/auth/verify.blade.php
+++ b/resources/views/layouts/default/auth/verify.blade.php
@@ -1,31 +1,32 @@
 @extends('layouts.app')
 
 @section('content')
-<div class="container">
+  <div class="container">
     <div class="row justify-content-center">
-        <div class="col-md-8">
-            <div class="card">
-                <div class="card-header">{{ __('Verify Your Email Address') }}</div>
+      <div class="col-md-8">
+        <div class="card">
+          <div class="card-header">{{ __('Verify Your Email Address') }}</div>
 
-                <div class="card-body">
-                    @if (session('resent'))
-                        <div class="alert alert-success" role="alert">
-                            {{ __('A fresh verification link has been sent to your email address.') }}
-                        </div>
-                    @endif
+          <div class="card-body">
+            @if (session('resent'))
+              <div class="alert alert-success" role="alert">
+                {{ __('A fresh verification link has been sent to your email address.') }}
+              </div>
+            @endif
 
-                    {{ __('Before proceeding, please check your email for a verification link.') }}
-                    {{ __('If you did not receive the email') }},
+            {{ __('Before proceeding, please check your email for a verification link.') }}
+            {{ __('If you did not receive the email') }},
 
-                        <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
-                            @csrf
-                            <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
-                                {{ __('click here to request another') }}
-                            </button>.
-                        </form>
-                </div>
-            </div>
+            <form class="d-inline" method="POST" action="{{ route('verification.resend') }}">
+              @csrf
+              <button type="submit" class="btn btn-link p-0 m-0 align-baseline">
+                {{ __('click here to request another') }}
+              </button>
+              .
+            </form>
+          </div>
         </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/components/info.blade.php b/resources/views/layouts/default/components/info.blade.php
index a2d219ee..69f13ba9 100644
--- a/resources/views/layouts/default/components/info.blade.php
+++ b/resources/views/layouts/default/components/info.blade.php
@@ -1,10 +1,10 @@
 <div>
-    <p style="float:left; margin-right: 10px; margin-left: 2px;">
+  <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>
-        {{ $slot }}
-    </p>
+  </p>
+  <p>
+    {{ $slot }}
+  </p>
 </div>
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index 07e24d22..d8875612 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -2,118 +2,119 @@
 @section('title', __('common.dashboard'))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-sm-8">
 
-        {{-- TOP BAR WITH BOXES --}}
-        <div class="row">
-            <div class="col-sm-3">
-                <div class="card card-primary text-white dashboard-box">
-                    <div class="card-body text-center">
-                        <div class="icon-background">
-                            <i class="fas fa-plane icon"></i>
-                        </div>
-                        <h3 class="header">{{ $user->flights }}</h3>
-                        <h5 class="description">{{ trans_choice('common.flight', $user->flights) }}</h5>
-                    </div>
-                </div>
+      {{-- TOP BAR WITH BOXES --}}
+      <div class="row">
+        <div class="col-sm-3">
+          <div class="card card-primary text-white dashboard-box">
+            <div class="card-body text-center">
+              <div class="icon-background">
+                <i class="fas fa-plane icon"></i>
+              </div>
+              <h3 class="header">{{ $user->flights }}</h3>
+              <h5 class="description">{{ trans_choice('common.flight', $user->flights) }}</h5>
             </div>
-
-            <div class="col-sm-3">
-                <div class="card card-primary text-white dashboard-box">
-                    <div class="card-body text-center">
-                        <div class="icon-background">
-                            <i class="far fa-clock icon"></i>
-                        </div>
-                        <h3 class="header">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false)}}</h3>
-                        <h5 class="description">@lang('dashboard.totalhours')</h5>
-                    </div>
-                </div>
-            </div>
-            <div class="col-sm-3">
-                <div class="card card-primary text-white dashboard-box">
-                    <div class="card-body text-center">
-                        <div class="icon-background"> {{--110px font-size--}}
-                            <i class="fas fa-money-bill-alt icon"></i>
-                        </div>
-                        <h3 class="header">{{ optional($user->journal)->balance ?? 0 }}</h3>
-                        <h5 class="description">@lang('dashboard.yourbalance')</h5>
-                    </div>
-                </div>
-            </div>
-
-            <div class="col-sm-3">
-                <div class="card card-primary text-white dashboard-box">
-                    <div class="card-body text-center">
-                        <div class="icon-background">
-                            <i class="fas fa-map-marker icon"></i>
-                        </div>
-                        @if($user->current_airport)
-                            <h3 class="header">{{ $user->curr_airport_id }}</h3>
-                        @else
-                            <h3 class="header">{{ $user->home_airport_id }}</h3>
-                        @endif
-                        <h5 class="description">@lang('airports.current')</h5>
-                    </div>
-                </div>
-            </div>
-
+          </div>
         </div>
 
-        <div class="card">
-            <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-            @lang('dashboard.yourlastreport')
+        <div class="col-sm-3">
+          <div class="card card-primary text-white dashboard-box">
+            <div class="card-body text-center">
+              <div class="icon-background">
+                <i class="far fa-clock icon"></i>
+              </div>
+              <h3 class="header">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false)}}</h3>
+              <h5 class="description">@lang('dashboard.totalhours')</h5>
             </div>
+          </div>
+        </div>
+        <div class="col-sm-3">
+          <div class="card card-primary text-white dashboard-box">
+            <div class="card-body text-center">
+              <div class="icon-background"> {{--110px font-size--}}
+                <i class="fas fa-money-bill-alt icon"></i>
+              </div>
+              <h3 class="header">{{ optional($user->journal)->balance ?? 0 }}</h3>
+              <h5 class="description">@lang('dashboard.yourbalance')</h5>
+            </div>
+          </div>
+        </div>
+
+        <div class="col-sm-3">
+          <div class="card card-primary text-white dashboard-box">
+            <div class="card-body text-center">
+              <div class="icon-background">
+                <i class="fas fa-map-marker icon"></i>
+              </div>
+              @if($user->current_airport)
+                <h3 class="header">{{ $user->curr_airport_id }}</h3>
+              @else
+                <h3 class="header">{{ $user->home_airport_id }}</h3>
+              @endif
+              <h5 class="description">@lang('airports.current')</h5>
+            </div>
+          </div>
+        </div>
+
+      </div>
+
+      <div class="card">
+        <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
+          @lang('dashboard.yourlastreport')
+        </div>
         @if($last_pirep === null)
-            <div class="card-body" style="text-align:center;">
-                @lang('dashboard.noreportsyet') <a href="{{ route('frontend.pireps.create') }}">@lang('dashboard.fileonenow')</a>
-            </div>
+          <div class="card-body" style="text-align:center;">
+            @lang('dashboard.noreportsyet') <a
+              href="{{ route('frontend.pireps.create') }}">@lang('dashboard.fileonenow')</a>
+          </div>
         @else
-            @include('pireps.pirep_card', ['pirep' => $last_pirep])
+          @include('pireps.pirep_card', ['pirep' => $last_pirep])
         @endif
-        </div>
+      </div>
 
-        {{ Widget::latestNews(['count' => 1]) }}
+      {{ Widget::latestNews(['count' => 1]) }}
 
     </div>
 
     {{-- Sidebar --}}
     <div class="col-sm-4">
-        <div class="card">
-            <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-                @lang('dashboard.weatherat', ['ICAO' => $current_airport])
-            </div>
-            <div class="card-body">
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    {{ Widget::Weather(['icao' => $current_airport]) }}
-                </div>
-            </div>
+      <div class="card">
+        <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
+          @lang('dashboard.weatherat', ['ICAO' => $current_airport])
         </div>
+        <div class="card-body">
+          <!-- Tab panes -->
+          <div class="tab-content">
+            {{ Widget::Weather(['icao' => $current_airport]) }}
+          </div>
+        </div>
+      </div>
 
-        <div class="card">
-            <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-                @lang('dashboard.recentreports')
-            </div>
-            <div class="card-body">
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    {{ Widget::latestPireps(['count' => 5]) }}
-                </div>
-            </div>
+      <div class="card">
+        <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
+          @lang('dashboard.recentreports')
         </div>
+        <div class="card-body">
+          <!-- Tab panes -->
+          <div class="tab-content">
+            {{ Widget::latestPireps(['count' => 5]) }}
+          </div>
+        </div>
+      </div>
 
-        <div class="card">
-            <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-                @lang('common.newestpilots')
-            </div>
-            <div class="card-body">
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    {{ Widget::latestPilots(['count' => 5]) }}
-                </div>
-            </div>
+      <div class="card">
+        <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
+          @lang('common.newestpilots')
         </div>
+        <div class="card-body">
+          <!-- Tab panes -->
+          <div class="tab-content">
+            {{ Widget::latestPilots(['count' => 5]) }}
+          </div>
+        </div>
+      </div>
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/downloads/index.blade.php b/resources/views/layouts/default/downloads/index.blade.php
index 525ddd42..5ac40b31 100644
--- a/resources/views/layouts/default/downloads/index.blade.php
+++ b/resources/views/layouts/default/downloads/index.blade.php
@@ -2,26 +2,26 @@
 @section('title', trans_choice('common.download', 2))
 
 @section('content')
-    @include('flash::message')
-    <div class="row">
-        <div class="row-sm-12">
-            <h2>{{ trans_choice('common.download', 2) }}</h2>
-        </div>
+  @include('flash::message')
+  <div class="row">
+    <div class="row-sm-12">
+      <h2>{{ trans_choice('common.download', 2) }}</h2>
     </div>
-    @if(!$grouped_files || \count($grouped_files) === 0)
-        <div class="jumbotron text-center">@lang('downloads.none')</div>
-    @else
-        @foreach($grouped_files as $group => $files)
-        <div class="row" style="margin-bottom: 40px;">
-            <div class="col-12">
-                <h4 class="description">{{ $group }}</h4>
-            </div>
-
-            <div class="col-12">
-                @include('downloads.table', ['files' => $files])
-            </div>
+  </div>
+  @if(!$grouped_files || \count($grouped_files) === 0)
+    <div class="jumbotron text-center">@lang('downloads.none')</div>
+  @else
+    @foreach($grouped_files as $group => $files)
+      <div class="row" style="margin-bottom: 40px;">
+        <div class="col-12">
+          <h4 class="description">{{ $group }}</h4>
         </div>
-        @endforeach
-    @endif
+
+        <div class="col-12">
+          @include('downloads.table', ['files' => $files])
+        </div>
+      </div>
+    @endforeach
+  @endif
 @endsection
 
diff --git a/resources/views/layouts/default/downloads/table.blade.php b/resources/views/layouts/default/downloads/table.blade.php
index 8aee4891..a6151e5e 100644
--- a/resources/views/layouts/default/downloads/table.blade.php
+++ b/resources/views/layouts/default/downloads/table.blade.php
@@ -1,15 +1,16 @@
 <ul class="list-group">
-    @foreach($files as $file)
-        <li class="list-group-item">
-            <a href="{{route('frontend.downloads.download', [$file->id])}}" target="_blank">
-                {{ $file->name }}
-            </a>
+  @foreach($files as $file)
+    <li class="list-group-item">
+      <a href="{{route('frontend.downloads.download', [$file->id])}}" target="_blank">
+        {{ $file->name }}
+      </a>
 
-            {{-- only show description is one is provided --}}
-            @if($file->description)
-                - {{$file->description}}
-            @endif
-            <span style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
-        </li>
-    @endforeach
+      {{-- only show description is one is provided --}}
+      @if($file->description)
+        - {{$file->description}}
+      @endif
+      <span
+        style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
+    </li>
+  @endforeach
 </ul>
diff --git a/resources/views/layouts/default/errors/401.blade.php b/resources/views/layouts/default/errors/401.blade.php
index 47998572..0252c381 100644
--- a/resources/views/layouts/default/errors/401.blade.php
+++ b/resources/views/layouts/default/errors/401.blade.php
@@ -2,10 +2,10 @@
 @section('title', __('errors.401.title'))
 
 @section('content')
-    <div class="container registered-page">
-        <h3>@lang('errors.401.title')</h3>
-        <p>
-            {!! str_replace(':link', config('app.url'), __('errors.401.message')).'<br />' !!}
-        </p>
-    </div>
+  <div class="container registered-page">
+    <h3>@lang('errors.401.title')</h3>
+    <p>
+      {!! str_replace(':link', config('app.url'), __('errors.401.message')).'<br />' !!}
+    </p>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/errors/404.blade.php b/resources/views/layouts/default/errors/404.blade.php
index f4d14681..954b2823 100644
--- a/resources/views/layouts/default/errors/404.blade.php
+++ b/resources/views/layouts/default/errors/404.blade.php
@@ -2,11 +2,11 @@
 @section('title', __('errors.404.title'))
 
 @section('content')
-    <div class="container registered-page">
-        <h3>@lang('errors.404.title')</h3>
-        <p>
-            {!! str_replace(':link', config('app.url'), __('errors.404.message')).'<br />' !!}
-            {{ $exception->getMessage() }}
-        </p>
-    </div>
+  <div class="container registered-page">
+    <h3>@lang('errors.404.title')</h3>
+    <p>
+      {!! str_replace(':link', config('app.url'), __('errors.404.message')).'<br />' !!}
+      {{ $exception->getMessage() }}
+    </p>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/errors/503.blade.php b/resources/views/layouts/default/errors/503.blade.php
index 00ac3415..49d2622d 100755
--- a/resources/views/layouts/default/errors/503.blade.php
+++ b/resources/views/layouts/default/errors/503.blade.php
@@ -1,47 +1,47 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>@lang('errors.503.title')</title>
+  <title>@lang('errors.503.title')</title>
 
-    <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
+  <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
 
-    <style>
-        html, body {
-            height: 100%;
-        }
+  <style>
+    html, body {
+      height: 100%;
+    }
 
-        body {
-            margin: 0;
-            padding: 0;
-            width: 100%;
-            color: #B0BEC5;
-            display: table;
-            font-weight: 100;
-            font-family: 'Lato', sans-serif;
-        }
+    body {
+      margin: 0;
+      padding: 0;
+      width: 100%;
+      color: #B0BEC5;
+      display: table;
+      font-weight: 100;
+      font-family: 'Lato', sans-serif;
+    }
 
-        .container {
-            text-align: center;
-            display: table-cell;
-            vertical-align: middle;
-        }
+    .container {
+      text-align: center;
+      display: table-cell;
+      vertical-align: middle;
+    }
 
-        .content {
-            text-align: center;
-            display: inline-block;
-        }
+    .content {
+      text-align: center;
+      display: inline-block;
+    }
 
-        .title {
-            font-size: 72px;
-            margin-bottom: 40px;
-        }
-    </style>
+    .title {
+      font-size: 72px;
+      margin-bottom: 40px;
+    }
+  </style>
 </head>
 <body>
 <div class="container">
-    <div class="content">
-        <div class="title">@lang('errors.503.message')</div>
-    </div>
+  <div class="content">
+    <div class="title">@lang('errors.503.message')</div>
+  </div>
 </div>
 </body>
 </html>
diff --git a/resources/views/layouts/default/flash/message.blade.php b/resources/views/layouts/default/flash/message.blade.php
index 68f85f8f..9e47c4fd 100644
--- a/resources/views/layouts/default/flash/message.blade.php
+++ b/resources/views/layouts/default/flash/message.blade.php
@@ -1,19 +1,19 @@
 @if (session()->has('flash_notification.message'))
-    @if (session()->has('flash_notification.overlay'))
-        @include('flash::modal', [
-            'modalClass' => 'flash-modal',
-            'title'      => session('flash_notification.title'),
-            'body'       => session('flash_notification.message')
-        ])
-    @else
-        <div class="alert
+  @if (session()->has('flash_notification.overlay'))
+    @include('flash::modal', [
+        'modalClass' => 'flash-modal',
+        'title'      => session('flash_notification.title'),
+        'body'       => session('flash_notification.message')
+    ])
+  @else
+    <div class="alert
                     alert-{{ session('flash_notification.level') }}
-                    {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
-            @if(session()->has('flash_notification.important'))
-                <button type="button" class="close" data-dismiss="alert">&times;</button>
-            @endif
+    {{ session()->has('flash_notification.important') ? 'alert-important' : '' }}">
+      @if(session()->has('flash_notification.important'))
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+      @endif
 
-            {{ session('flash_notification.message') }}
-        </div>
-    @endif
+      {{ session('flash_notification.message') }}
+    </div>
+  @endif
 @endif
diff --git a/resources/views/layouts/default/flash/modal.blade.php b/resources/views/layouts/default/flash/modal.blade.php
index 09262233..04023991 100644
--- a/resources/views/layouts/default/flash/modal.blade.php
+++ b/resources/views/layouts/default/flash/modal.blade.php
@@ -1,19 +1,19 @@
 <div id="flash-overlay-modal" class="modal fade {{ $modalClass or '' }}">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-                <h4 class="modal-title">{{ $title }}</h4>
-            </div>
+        <h4 class="modal-title">{{ $title }}</h4>
+      </div>
 
-            <div class="modal-body">
-                <p>{{ $body }}</p>
-            </div>
+      <div class="modal-body">
+        <p>{{ $body }}</p>
+      </div>
 
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">@lang('common.close')</button>
-            </div>
-        </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">@lang('common.close')</button>
+      </div>
     </div>
+  </div>
 </div>
diff --git a/resources/views/layouts/default/flights/index.blade.php b/resources/views/layouts/default/flights/index.blade.php
index 2b2e142b..c93b9ba5 100644
--- a/resources/views/layouts/default/flights/index.blade.php
+++ b/resources/views/layouts/default/flights/index.blade.php
@@ -2,22 +2,22 @@
 @section('title', trans_choice('common.flight', 2))
 
 @section('content')
-<div class="row">
+  <div class="row">
     @include('flash::message')
     <div class="col-md-9">
-        <h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2>
-        @include('flights.table')
+      <h2>{{ $title ?? trans_choice('common.flight', 2) }}</h2>
+      @include('flights.table')
     </div>
     <div class="col-md-3">
-        @include('flights.nav')
-        @include('flights.search')
+      @include('flights.nav')
+      @include('flights.search')
     </div>
-</div>
-<div class="row">
+  </div>
+  <div class="row">
     <div class="col-12 text-center">
-        {{ $flights->links('pagination.default') }}
+      {{ $flights->links('pagination.default') }}
     </div>
-</div>
+  </div>
 @endsection
 
 @include('flights.scripts')
diff --git a/resources/views/layouts/default/flights/map.blade.php b/resources/views/layouts/default/flights/map.blade.php
index 2458e37e..f7150c33 100644
--- a/resources/views/layouts/default/flights/map.blade.php
+++ b/resources/views/layouts/default/flights/map.blade.php
@@ -1,17 +1,17 @@
 <div class="row">
-    <div class="col-12">
-        <div class="box-body">
-            <div id="map" style="width: 100%; height: 600px"></div>
-        </div>
+  <div class="col-12">
+    <div class="box-body">
+      <div id="map" style="width: 100%; height: 600px"></div>
     </div>
+  </div>
 </div>
 
 @section('scripts')
-<script type="text/javascript">
-phpvms.map.render_route_map({
-    route_points: {!! json_encode($map_features['route_points']) !!},
-    planned_route_line: {!! json_encode($map_features['planned_route_line']) !!},
-    metar_wms: {!! json_encode(config('map.metar_wms')) !!},
-});
-</script>
+  <script type="text/javascript">
+    phpvms.map.render_route_map({
+      route_points: {!! json_encode($map_features['route_points']) !!},
+      planned_route_line: {!! json_encode($map_features['planned_route_line']) !!},
+      metar_wms: {!! json_encode(config('map.metar_wms')) !!},
+    });
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/flights/nav.blade.php b/resources/views/layouts/default/flights/nav.blade.php
index f056325b..94bc6515 100644
--- a/resources/views/layouts/default/flights/nav.blade.php
+++ b/resources/views/layouts/default/flights/nav.blade.php
@@ -1,7 +1,7 @@
 <div class="card">
-    <div class="card-block" style="min-height: 0px; display: flex; justify-content: center; align-items: center;">
-        <div class="form-group text-right btn-primary my-bids">
-            <a href="{{ route('frontend.flights.bids') }}">{{ trans_choice('flights.mybid', 2) }}</a>
-        </div>
+  <div class="card-block" style="min-height: 0px; display: flex; justify-content: center; align-items: center;">
+    <div class="form-group text-right btn-primary my-bids">
+      <a href="{{ route('frontend.flights.bids') }}">{{ trans_choice('flights.mybid', 2) }}</a>
     </div>
+  </div>
 </div>
diff --git a/resources/views/layouts/default/flights/scripts.blade.php b/resources/views/layouts/default/flights/scripts.blade.php
index 18b1efda..68b13015 100644
--- a/resources/views/layouts/default/flights/scripts.blade.php
+++ b/resources/views/layouts/default/flights/scripts.blade.php
@@ -1,7 +1,7 @@
 @section('scripts')
-<script>
-$(document).ready(function () {
-    $("button.save_flight").click(async function (e) {
+  <script>
+    $(document).ready(function () {
+      $("button.save_flight").click(async function (e) {
         e.preventDefault();
 
         const btn = $(this);
@@ -9,19 +9,19 @@ $(document).ready(function () {
         const flight_id = btn.attr('x-id');
 
         if (!btn.hasClass(class_name)) {
-            await phpvms.bids.addBid(flight_id);
+          await phpvms.bids.addBid(flight_id);
 
-            console.log('successfully saved flight');
-            btn.addClass(class_name);
-            alert('@lang("flights.bidadded")');
+          console.log('successfully saved flight');
+          btn.addClass(class_name);
+          alert('@lang("flights.bidadded")');
         } else {
-            await phpvms.bids.removeBid(flight_id);
+          await phpvms.bids.removeBid(flight_id);
 
-            console.log('successfully removed flight');
-            btn.removeClass(class_name);
-            alert('@lang("flights.bidremoved")');
+          console.log('successfully removed flight');
+          btn.removeClass(class_name);
+          alert('@lang("flights.bidremoved")');
         }
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/flights/show.blade.php b/resources/views/layouts/default/flights/show.blade.php
index 222a73d5..0677e062 100644
--- a/resources/views/layouts/default/flights/show.blade.php
+++ b/resources/views/layouts/default/flights/show.blade.php
@@ -2,85 +2,85 @@
 @section('title', trans_choice('common.flight', 1).' '.$flight->ident)
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-8">
-        <div class="row">
-            <div class="col-12">
-                <h2>{{ $flight->ident }}</h2>
-            </div>
+      <div class="row">
+        <div class="col-12">
+          <h2>{{ $flight->ident }}</h2>
         </div>
-        <div class="row">
-            <div class="col-12">
-                <table class="table">
-                    <tr>
-                        <td>@lang('common.departure')</td>
-                        <td>
-                            {{ $flight->dpt_airport->name }}
-                            (<a href="{{route('frontend.airports.show', [
+      </div>
+      <div class="row">
+        <div class="col-12">
+          <table class="table">
+            <tr>
+              <td>@lang('common.departure')</td>
+              <td>
+                {{ $flight->dpt_airport->name }}
+                (<a href="{{route('frontend.airports.show', [
                             'id' => $flight->dpt_airport->icao
                             ])}}">{{$flight->dpt_airport->icao}}</a>)
-                            @ {{ $flight->dpt_time }}
-                        </td>
-                    </tr>
+                @ {{ $flight->dpt_time }}
+              </td>
+            </tr>
 
-                    <tr>
-                        <td>@lang('common.arrival')</td>
-                        <td>
-                            {{ $flight->arr_airport->name }}
-                            (<a href="{{route('frontend.airports.show', [
+            <tr>
+              <td>@lang('common.arrival')</td>
+              <td>
+                {{ $flight->arr_airport->name }}
+                (<a href="{{route('frontend.airports.show', [
                             'id' => $flight->arr_airport->icao
                             ])}}">{{$flight->arr_airport->icao}}</a>)
-                            @ {{ $flight->arr_time }}</td>
-                    </tr>
-                    @if($flight->alt_airport_id)
-                    <tr>
-                        <td>@lang('flights.alternateairport')</td>
-                        <td>
-                            {{ $flight->alt_airport->name }}
-                            (<a href="{{route('frontend.airports.show', [
+                @ {{ $flight->arr_time }}</td>
+            </tr>
+            @if($flight->alt_airport_id)
+              <tr>
+                <td>@lang('flights.alternateairport')</td>
+                <td>
+                  {{ $flight->alt_airport->name }}
+                  (<a href="{{route('frontend.airports.show', [
                             'id' => $flight->alt_airport->icao
                             ])}}">{{$flight->alt_airport->icao}}</a>)
-                        </td>
-                    </tr>
-                    @endif
+                </td>
+              </tr>
+            @endif
 
-                    <tr>
-                        <td>@lang('flights.route')</td>
-                        <td>{{ $flight->route }}</td>
-                    </tr>
+            <tr>
+              <td>@lang('flights.route')</td>
+              <td>{{ $flight->route }}</td>
+            </tr>
 
-                    @if(filled($flight->notes))
-                        <tr>
-                            <td>{{ trans_choice('common.note', 2) }}</td>
-                            <td>{{ $flight->notes }}</td>
-                        </tr>
-                    @endif
-                </table>
-            </div>
+            @if(filled($flight->notes))
+              <tr>
+                <td>{{ trans_choice('common.note', 2) }}</td>
+                <td>{{ $flight->notes }}</td>
+              </tr>
+            @endif
+          </table>
         </div>
-        <div class="row">
-            <div class="col-12">
-                @include('flights.map')
-            </div>
+      </div>
+      <div class="row">
+        <div class="col-12">
+          @include('flights.map')
         </div>
+      </div>
     </div>
     <div class="col-4">
-        <h5>{{$flight->dpt_airport_id}} @lang('common.metar')</h5>
-        {{ Widget::Weather([
-            'icao' => $flight->dpt_airport_id,
-          ]) }}
-        <br />
-        <h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5>
-        {{ Widget::Weather([
-            'icao' => $flight->arr_airport_id,
-          ]) }}
-        @if ($flight->alt_airport_id)
-        <br />
+      <h5>{{$flight->dpt_airport_id}} @lang('common.metar')</h5>
+      {{ Widget::Weather([
+          'icao' => $flight->dpt_airport_id,
+        ]) }}
+      <br/>
+      <h5>{{$flight->arr_airport_id}} @lang('common.metar')</h5>
+      {{ Widget::Weather([
+          'icao' => $flight->arr_airport_id,
+        ]) }}
+      @if ($flight->alt_airport_id)
+        <br/>
         <h5>{{$flight->alt_airport_id}} @lang('common.metar')</h5>
         {{ Widget::Weather([
             'icao' => $flight->alt_airport_id,
           ]) }}
-        @endif
+      @endif
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/home.blade.php b/resources/views/layouts/default/home.blade.php
index ac621249..129b1add 100644
--- a/resources/views/layouts/default/home.blade.php
+++ b/resources/views/layouts/default/home.blade.php
@@ -2,45 +2,46 @@
 @section('title', __('home.welcome.title'))
 
 @section('content')
-    <div class="row">
-        <div class="col-sm-12">
-        </div>
+  <div class="row">
+    <div class="col-sm-12">
     </div>
-    <div class="row">
-        <div class="col-sm-12">
-            <h2 class="description">@lang('common.newestpilots')</h2>
-            @foreach($users as $user)
-            <div class="card card-signup blue-bg">
-                {{--<div class="card-bg">--}}
-                    {{--<i class="fa fa-user-o" style="opacity: .1;"></i>--}}
-                {{--</div>--}}
-                <div class="header header-primary text-center blue-bg">
-                    <h3 class="title title-up text-white">
-                        <a href="{{ route('frontend.profile.show', [$user->id]) }}" class="text-white">{{ $user->name }}</a>
-                    </h3>
-                    <div class="photo-container">
-                    @if ($user->avatar == null)
-                        <img class="rounded-circle"
-                             src="{{ $user->gravatar(123) }}">
-                    @else
-                        <img src="{{ $user->avatar->url }}" style="width: 123px;">
-                    @endif
-                    </div>
-                </div>
-                <div class="content content-center">
-                    <div class="social-description text-center text-white">
-                        <h2 class="description text-white">
-                            @if(filled($user->home_airport))
-                            {{ $user->home_airport->icao }}
-                            @endif
-                        </h2>
-                    </div>
-                </div>
-                <div class="footer text-center">
-                    <a href="{{ route('frontend.profile.show', [$user->id]) }}" class="btn btn-neutral btn-sm">@lang('common.profile')</a>
-                </div>
+  </div>
+  <div class="row">
+    <div class="col-sm-12">
+      <h2 class="description">@lang('common.newestpilots')</h2>
+      @foreach($users as $user)
+        <div class="card card-signup blue-bg">
+          {{--<div class="card-bg">--}}
+          {{--<i class="fa fa-user-o" style="opacity: .1;"></i>--}}
+          {{--</div>--}}
+          <div class="header header-primary text-center blue-bg">
+            <h3 class="title title-up text-white">
+              <a href="{{ route('frontend.profile.show', [$user->id]) }}" class="text-white">{{ $user->name }}</a>
+            </h3>
+            <div class="photo-container">
+              @if ($user->avatar == null)
+                <img class="rounded-circle"
+                     src="{{ $user->gravatar(123) }}">
+              @else
+                <img src="{{ $user->avatar->url }}" style="width: 123px;">
+              @endif
             </div>
-            @endforeach
+          </div>
+          <div class="content content-center">
+            <div class="social-description text-center text-white">
+              <h2 class="description text-white">
+                @if(filled($user->home_airport))
+                  {{ $user->home_airport->icao }}
+                @endif
+              </h2>
+            </div>
+          </div>
+          <div class="footer text-center">
+            <a href="{{ route('frontend.profile.show', [$user->id]) }}"
+               class="btn btn-neutral btn-sm">@lang('common.profile')</a>
+          </div>
         </div>
+      @endforeach
     </div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/livemap/index.blade.php b/resources/views/layouts/default/livemap/index.blade.php
index 5474abb3..ae2f4487 100644
--- a/resources/views/layouts/default/livemap/index.blade.php
+++ b/resources/views/layouts/default/livemap/index.blade.php
@@ -2,6 +2,6 @@
 @section('title', __('common.livemap'))
 
 @section('content')
-    {{ Widget::liveMap() }}
+  {{ Widget::liveMap() }}
 @endsection
 
diff --git a/resources/views/layouts/default/notifications/email-plain.blade.php b/resources/views/layouts/default/notifications/email-plain.blade.php
index 9ef9dad3..c85c2f08 100644
--- a/resources/views/layouts/default/notifications/email-plain.blade.php
+++ b/resources/views/layouts/default/notifications/email-plain.blade.php
@@ -1,22 +1,22 @@
 <?php
 
-if (! empty($greeting)) {
-    echo $greeting, "\n\n";
+if(!empty($greeting)) {
+  echo $greeting, "\n\n";
 } else {
-    echo $level == 'error' ? __('common.whoops').'!' : __('common.hello').',', "\n\n";
+  echo $level == 'error' ? __('common.whoops').'!' : __('common.hello').',', "\n\n";
 }
 
-if (! empty($introLines)) {
-    echo implode("\n", $introLines), "\n\n";
+if(!empty($introLines)) {
+  echo implode("\n", $introLines), "\n\n";
 }
 
-if (isset($actionText)) {
-    echo "{$actionText}: {$actionUrl}", "\n\n";
+if(isset($actionText)) {
+  echo "{$actionText}: {$actionUrl}", "\n\n";
 }
 
-if (! empty($outroLines)) {
-    echo implode("\n", $outroLines), "\n\n";
+if(!empty($outroLines)) {
+  echo implode("\n", $outroLines), "\n\n";
 }
 
-echo __('common.regards).',', "\n";
+echo __('common.regards).', ', "\n";
 echo config('app.name'), "\n";
diff --git a/resources/views/layouts/default/notifications/email.blade.php b/resources/views/layouts/default/notifications/email.blade.php
index 2eec10e8..5a2d4502 100644
--- a/resources/views/layouts/default/notifications/email.blade.php
+++ b/resources/views/layouts/default/notifications/email.blade.php
@@ -2,61 +2,61 @@
 <html>
 
 <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 
-    <style type="text/css" rel="stylesheet" media="all">
-        /* Media Queries */
-        @media only screen and (max-width: 500px) {
-            .button {
-                width: 100% !important;
-            }
-        }
-    </style>
+  <style type="text/css" rel="stylesheet" media="all">
+    /* Media Queries */
+    @media only screen and (max-width: 500px) {
+      .button {
+        width: 100% !important;
+      }
+    }
+  </style>
 </head>
 
 <?php
 
 $style = [
-    /* Layout ------------------------------ */
+  /* Layout ------------------------------ */
 
-    'body'          => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
-    'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;',
+  'body'          => 'margin: 0; padding: 0; width: 100%; background-color: #F2F4F6;',
+  'email-wrapper' => 'width: 100%; margin: 0; padding: 0; background-color: #F2F4F6;',
 
-    /* Masthead ----------------------- */
+  /* Masthead ----------------------- */
 
-    'email-masthead'      => 'padding: 25px 0; text-align: center;',
-    'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
+  'email-masthead'      => 'padding: 25px 0; text-align: center;',
+  'email-masthead_name' => 'font-size: 16px; font-weight: bold; color: #2F3133; text-decoration: none; text-shadow: 0 1px 0 white;',
 
-    'email-body'       => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
-    'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;',
-    'email-body_cell'  => 'padding: 35px;',
+  'email-body'       => 'width: 100%; margin: 0; padding: 0; border-top: 1px solid #EDEFF2; border-bottom: 1px solid #EDEFF2; background-color: #FFF;',
+  'email-body_inner' => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0;',
+  'email-body_cell'  => 'padding: 35px;',
 
-    'email-footer'      => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
-    'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;',
+  'email-footer'      => 'width: auto; max-width: 570px; margin: 0 auto; padding: 0; text-align: center;',
+  'email-footer_cell' => 'color: #AEAEAE; padding: 35px; text-align: center;',
 
-    /* Body ------------------------------ */
+  /* Body ------------------------------ */
 
-    'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;',
-    'body_sub'    => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
+  'body_action' => 'width: 100%; margin: 30px auto; padding: 0; text-align: center;',
+  'body_sub'    => 'margin-top: 25px; padding-top: 25px; border-top: 1px solid #EDEFF2;',
 
-    /* Type ------------------------------ */
+  /* Type ------------------------------ */
 
-    'anchor'           => 'color: #3869D4;',
-    'header-1'         => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
-    'paragraph'        => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
-    'paragraph-sub'    => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
-    'paragraph-center' => 'text-align: center;',
+  'anchor'           => 'color: #3869D4;',
+  'header-1'         => 'margin-top: 0; color: #2F3133; font-size: 19px; font-weight: bold; text-align: left;',
+  'paragraph'        => 'margin-top: 0; color: #74787E; font-size: 16px; line-height: 1.5em;',
+  'paragraph-sub'    => 'margin-top: 0; color: #74787E; font-size: 12px; line-height: 1.5em;',
+  'paragraph-center' => 'text-align: center;',
 
-    /* Buttons ------------------------------ */
+  /* Buttons ------------------------------ */
 
-    'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px;
+  'button' => 'display: block; display: inline-block; width: 200px; min-height: 20px; padding: 10px;
                  background-color: #3869D4; border-radius: 3px; color: #ffffff; font-size: 15px; line-height: 25px;
                  text-align: center; text-decoration: none; -webkit-text-size-adjust: none;',
 
-    'button--green' => 'background-color: #22BC66;',
-    'button--red'   => 'background-color: #dc4d2f;',
-    'button--blue'  => 'background-color: #3869D4;',
+  'button--green' => 'background-color: #22BC66;',
+  'button--red'   => 'background-color: #dc4d2f;',
+  'button--blue'  => 'background-color: #3869D4;',
 ];
 ?>
 
@@ -64,130 +64,130 @@ $style = [
 
 <body style="{{ $style['body'] }}">
 <table width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-        <td style="{{ $style['email-wrapper'] }}" align="center">
-            <table width="100%" cellpadding="0" cellspacing="0">
-                <!-- Logo -->
-                <tr>
-                    <td style="{{ $style['email-masthead'] }}">
-                        <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}"
-                           href="{{ url('/') }}" target="_blank">
-                            {{ config('app.name') }}
-                        </a>
-                    </td>
-                </tr>
+  <tr>
+    <td style="{{ $style['email-wrapper'] }}" align="center">
+      <table width="100%" cellpadding="0" cellspacing="0">
+        <!-- Logo -->
+        <tr>
+          <td style="{{ $style['email-masthead'] }}">
+            <a style="{{ $fontFamily }} {{ $style['email-masthead_name'] }}"
+               href="{{ url('/') }}" target="_blank">
+              {{ config('app.name') }}
+            </a>
+          </td>
+        </tr>
 
-                <!-- Email Body -->
-                <tr>
-                    <td style="{{ $style['email-body'] }}" width="100%">
-                        <table style="{{ $style['email-body_inner'] }}" align="center" width="570"
-                               cellpadding="0" cellspacing="0">
-                            <tr>
-                                <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
-                                    <!-- Greeting -->
-                                    <h1 style="{{ $style['header-1'] }}">
-                                        @if ($level === 'error')
-                                            @lang('common.whoops')!
-                                        @else
-                                            @lang('common.hello'),
-                                        @endif
-                                    </h1>
+        <!-- Email Body -->
+        <tr>
+          <td style="{{ $style['email-body'] }}" width="100%">
+            <table style="{{ $style['email-body_inner'] }}" align="center" width="570"
+                   cellpadding="0" cellspacing="0">
+              <tr>
+                <td style="{{ $fontFamily }} {{ $style['email-body_cell'] }}">
+                  <!-- Greeting -->
+                  <h1 style="{{ $style['header-1'] }}">
+                    @if ($level === 'error')
+                      @lang('common.whoops')!
+                    @else
+                      @lang('common.hello'),
+                    @endif
+                  </h1>
 
-                                    <!-- Intro -->
-                                    @foreach ($introLines as $line)
-                                        <p style="{{ $style['paragraph'] }}">
-                                            {{ $line }}
-                                        </p>
-                                    @endforeach
+                  <!-- Intro -->
+                  @foreach ($introLines as $line)
+                    <p style="{{ $style['paragraph'] }}">
+                      {{ $line }}
+                    </p>
+                  @endforeach
 
-                                <!-- Action Button -->
-                                    @if (isset($actionText))
-                                        <table style="{{ $style['body_action'] }}" align="center"
-                                               width="100%" cellpadding="0" cellspacing="0">
-                                            <tr>
-                                                <td align="center">
-                                                    <?php
-                                                    switch ($level) {
-                                                        case 'success':
-                                                            $actionColor = 'button--green';
-                                                            break;
-                                                        case 'error':
-                                                            $actionColor = 'button--red';
-                                                            break;
-                                                        default:
-                                                            $actionColor = 'button--blue';
-                                                    }
-                                                    ?>
+                <!-- Action Button -->
+                  @if (isset($actionText))
+                    <table style="{{ $style['body_action'] }}" align="center"
+                           width="100%" cellpadding="0" cellspacing="0">
+                      <tr>
+                        <td align="center">
+                          <?php
+                          switch ($level) {
+                            case 'success':
+                              $actionColor = 'button--green';
+                              break;
+                            case 'error':
+                              $actionColor = 'button--red';
+                              break;
+                            default:
+                              $actionColor = 'button--blue';
+                          }
+                          ?>
 
-                                                    <a href="{{ $actionUrl }}"
-                                                       style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
-                                                       class="button"
-                                                       target="_blank">
-                                                        {{ $actionText }}
-                                                    </a>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    @endif
+                          <a href="{{ $actionUrl }}"
+                             style="{{ $fontFamily }} {{ $style['button'] }} {{ $style[$actionColor] }}"
+                             class="button"
+                             target="_blank">
+                            {{ $actionText }}
+                          </a>
+                        </td>
+                      </tr>
+                    </table>
+                  @endif
 
-                                <!-- Outro -->
-                                    @foreach ($outroLines as $line)
-                                        <p style="{{ $style['paragraph'] }}">
-                                            {{ $line }}
-                                        </p>
-                                    @endforeach
+                <!-- Outro -->
+                  @foreach ($outroLines as $line)
+                    <p style="{{ $style['paragraph'] }}">
+                      {{ $line }}
+                    </p>
+                  @endforeach
 
-                                <!-- Salutation -->
-                                    <p style="{{ $style['paragraph'] }}">
-                                        @lang('common.regards')
-                                        ,<br>{{ config('app.name') }}
-                                    </p>
+                <!-- Salutation -->
+                  <p style="{{ $style['paragraph'] }}">
+                    @lang('common.regards')
+                    ,<br>{{ config('app.name') }}
+                  </p>
 
-                                    <!-- Sub Copy -->
-                                    @if (isset($actionText))
-                                        <table style="{{ $style['body_sub'] }}">
-                                            <tr>
-                                                <td style="{{ $fontFamily }}">
-                                                    <p style="{{ $style['paragraph-sub'] }}">
-                                                        @lang('email.buttontroubles')
-                                                    </p>
-                                                    <p style="{{ $style['paragraph-sub'] }}">
-                                                        <a style="{{ $style['anchor'] }}"
-                                                           href="{{ $actionUrl }}" target="_blank">
-                                                            {{ $actionUrl }}
-                                                        </a>
-                                                    </p>
-                                                </td>
-                                            </tr>
-                                        </table>
-                                    @endif
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
-
-                <!-- Footer -->
-                <tr>
-                    <td>
-                        <table style="{{ $style['email-footer'] }}" align="center" width="570"
-                               cellpadding="0" cellspacing="0">
-                            <tr>
-                                <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
-                                    <p style="{{ $style['paragraph-sub'] }}">
-                                        &copy; {{ date('Y') }}
-                                        <a style="{{ $style['anchor'] }}" href="{{ url('/') }}"
-                                           target="_blank">{{ config('app.name') }}</a>.
-                                        @lang('common.rightsreserved')
-                                    </p>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
+                  <!-- Sub Copy -->
+                  @if (isset($actionText))
+                    <table style="{{ $style['body_sub'] }}">
+                      <tr>
+                        <td style="{{ $fontFamily }}">
+                          <p style="{{ $style['paragraph-sub'] }}">
+                            @lang('email.buttontroubles')
+                          </p>
+                          <p style="{{ $style['paragraph-sub'] }}">
+                            <a style="{{ $style['anchor'] }}"
+                               href="{{ $actionUrl }}" target="_blank">
+                              {{ $actionUrl }}
+                            </a>
+                          </p>
+                        </td>
+                      </tr>
+                    </table>
+                  @endif
+                </td>
+              </tr>
             </table>
-        </td>
-    </tr>
+          </td>
+        </tr>
+
+        <!-- Footer -->
+        <tr>
+          <td>
+            <table style="{{ $style['email-footer'] }}" align="center" width="570"
+                   cellpadding="0" cellspacing="0">
+              <tr>
+                <td style="{{ $fontFamily }} {{ $style['email-footer_cell'] }}">
+                  <p style="{{ $style['paragraph-sub'] }}">
+                    &copy; {{ date('Y') }}
+                    <a style="{{ $style['anchor'] }}" href="{{ url('/') }}"
+                       target="_blank">{{ config('app.name') }}</a>.
+                    @lang('common.rightsreserved')
+                  </p>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
 </body>
 </html>
diff --git a/resources/views/layouts/default/pagination/bootstrap-4.blade.php b/resources/views/layouts/default/pagination/bootstrap-4.blade.php
index 3fe813a1..346b2252 100644
--- a/resources/views/layouts/default/pagination/bootstrap-4.blade.php
+++ b/resources/views/layouts/default/pagination/bootstrap-4.blade.php
@@ -1,34 +1,34 @@
 <ul class="pagination">
-    <!-- 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>
+  <!-- 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="page-item disabled"><span class="page-link">{{ $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>
+  <!-- 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
-
-        <!-- 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
-
-    <!-- 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>
+      @endforeach
     @endif
+  @endforeach
+
+<!-- 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>
diff --git a/resources/views/layouts/default/pagination/default.blade.php b/resources/views/layouts/default/pagination/default.blade.php
index ade56f73..1d19a079 100644
--- a/resources/views/layouts/default/pagination/default.blade.php
+++ b/resources/views/layouts/default/pagination/default.blade.php
@@ -1,46 +1,46 @@
 <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>
+  <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="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="page-item active"><span
+                  class="page-link">{{ $page }}</span></li>
             @else
-                <li class="page-item"><a class="page-link"
-                                         href="{{ $paginator->previousPageUrl() }}"
-                                         rel="prev">&laquo;</a></li>
+              <li class="page-item"><a class="page-link"
+                                       href="{{ $url }}">{{ $page }}</a>
+              </li>
             @endif
+          @endforeach
+        @endif
+      @endforeach
 
-        <!-- 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="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
-
-        <!-- 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>
+    <!-- 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/pagination/semantic-ui.blade.php b/resources/views/layouts/default/pagination/semantic-ui.blade.php
index c6e0d210..cd36853b 100644
--- a/resources/views/layouts/default/pagination/semantic-ui.blade.php
+++ b/resources/views/layouts/default/pagination/semantic-ui.blade.php
@@ -1,36 +1,36 @@
 @if ($paginator->hasPages())
-    <div class="ui pagination menu">
-        {{-- Previous Page Link --}}
-        @if ($paginator->onFirstPage())
-            <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
-        @else
-            <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
-        @endif
+  <div class="ui pagination menu">
+    {{-- Previous Page Link --}}
+    @if ($paginator->onFirstPage())
+      <a class="icon item disabled"> <i class="left chevron icon"></i> </a>
+    @else
+      <a class="icon item" href="{{ $paginator->previousPageUrl() }}" rel="prev"> <i class="left chevron icon"></i> </a>
+    @endif
 
-        {{-- Pagination Elements --}}
-        @foreach ($elements as $element)
-            {{-- "Three Dots" Separator --}}
-            @if (is_string($element))
-                <a class="icon item disabled">{{ $element }}</a>
-            @endif
+    {{-- Pagination Elements --}}
+    @foreach ($elements as $element)
+      {{-- "Three Dots" Separator --}}
+      @if (is_string($element))
+        <a class="icon item disabled">{{ $element }}</a>
+      @endif
 
-            {{-- Array Of Links --}}
-            @if (is_array($element))
-                @foreach ($element as $page => $url)
-                    @if ($page == $paginator->currentPage())
-                        <a class="item active" href="{{ $url }}">{{ $page }}</a>
-                    @else
-                        <a class="item" href="{{ $url }}">{{ $page }}</a>
-                    @endif
-                @endforeach
-            @endif
+      {{-- Array Of Links --}}
+      @if (is_array($element))
+        @foreach ($element as $page => $url)
+          @if ($page == $paginator->currentPage())
+            <a class="item active" href="{{ $url }}">{{ $page }}</a>
+          @else
+            <a class="item" href="{{ $url }}">{{ $page }}</a>
+          @endif
         @endforeach
+      @endif
+    @endforeach
 
-        {{-- Next Page Link --}}
-        @if ($paginator->hasMorePages())
-            <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
-        @else
-            <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
-        @endif
-    </div>
+    {{-- Next Page Link --}}
+    @if ($paginator->hasMorePages())
+      <a class="icon item" href="{{ $paginator->nextPageUrl() }}" rel="next"> <i class="right chevron icon"></i> </a>
+    @else
+      <a class="icon item disabled"> <i class="right chevron icon"></i> </a>
+    @endif
+  </div>
 @endif
diff --git a/resources/views/layouts/default/pagination/simple-bootstrap-4.blade.php b/resources/views/layouts/default/pagination/simple-bootstrap-4.blade.php
index 878fcf92..bd4c9a2a 100644
--- a/resources/views/layouts/default/pagination/simple-bootstrap-4.blade.php
+++ b/resources/views/layouts/default/pagination/simple-bootstrap-4.blade.php
@@ -1,15 +1,15 @@
 <ul class="pagination">
-    <!-- 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
+  <!-- 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
 
-    <!-- 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
+<!-- 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>
diff --git a/resources/views/layouts/default/pagination/simple-default.blade.php b/resources/views/layouts/default/pagination/simple-default.blade.php
index dce63ebd..04f89834 100644
--- a/resources/views/layouts/default/pagination/simple-default.blade.php
+++ b/resources/views/layouts/default/pagination/simple-default.blade.php
@@ -1,15 +1,15 @@
 <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
+  <!-- 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
 
-    <!-- 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
+<!-- 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>
diff --git a/resources/views/layouts/default/pireps/custom_fields.blade.php b/resources/views/layouts/default/pireps/custom_fields.blade.php
index 32a97313..577e3df0 100644
--- a/resources/views/layouts/default/pireps/custom_fields.blade.php
+++ b/resources/views/layouts/default/pireps/custom_fields.blade.php
@@ -1,21 +1,21 @@
 <tr>
-    <td>
-        {{ $field->name }}
-        @if($field->required === true)
-            <span class="text-danger">*</span>
-        @endif
-    </td>
-    <td>
-        <div class="input-group input-group-sm form-group">
-            @if(!$field->read_only)
-            {{ Form::text($field->slug, $field->value, [
-                'class' => 'form-control',
-                'readonly' => (!empty($pirep) && $pirep->read_only),
-                ]) }}
-            @else
-                {{ $field->value }}
-            @endif
-        </div>
-        <p class="text-danger">{{ $errors->first($field->slug) }}</p>
-    </td>
+  <td>
+    {{ $field->name }}
+    @if($field->required === true)
+      <span class="text-danger">*</span>
+    @endif
+  </td>
+  <td>
+    <div class="input-group input-group-sm form-group">
+      @if(!$field->read_only)
+        {{ Form::text($field->slug, $field->value, [
+            'class' => 'form-control',
+            'readonly' => (!empty($pirep) && $pirep->read_only),
+            ]) }}
+      @else
+        {{ $field->value }}
+      @endif
+    </div>
+    <p class="text-danger">{{ $errors->first($field->slug) }}</p>
+  </td>
 </tr>
diff --git a/resources/views/layouts/default/pireps/edit.blade.php b/resources/views/layouts/default/pireps/edit.blade.php
index aac9ff39..77369b82 100644
--- a/resources/views/layouts/default/pireps/edit.blade.php
+++ b/resources/views/layouts/default/pireps/edit.blade.php
@@ -1,19 +1,19 @@
 @extends('app')
 @section('title', __('pireps.editflightreport'))
 @section('content')
-    <div class="row">
-        <div class="col-md-12">
-            <h2>@lang('pireps.editflightreport')</h2>
-            @include('flash::message')
-            {{ Form::model($pirep, [
-                    'route' => ['frontend.pireps.update', $pirep->id],
-                    'class' => 'form-group',
-                    'method' => 'patch']) }}
+  <div class="row">
+    <div class="col-md-12">
+      <h2>@lang('pireps.editflightreport')</h2>
+      @include('flash::message')
+      {{ Form::model($pirep, [
+              'route' => ['frontend.pireps.update', $pirep->id],
+              'class' => 'form-group',
+              'method' => 'patch']) }}
 
-            @include('pireps.fields')
+      @include('pireps.fields')
 
-            {{ Form::close() }}
-        </div>
+      {{ Form::close() }}
     </div>
+  </div>
 @endsection
 @include('pireps.scripts')
diff --git a/resources/views/layouts/default/pireps/fares.blade.php b/resources/views/layouts/default/pireps/fares.blade.php
index 2a2cc196..ab2cf111 100644
--- a/resources/views/layouts/default/pireps/fares.blade.php
+++ b/resources/views/layouts/default/pireps/fares.blade.php
@@ -1,19 +1,19 @@
 @if($aircraft)
-    <div class="form-container">
-        <h6><i class="fas fa-ellipsis-h"></i>
-            &nbsp;{{ trans_choice('pireps.fare', 2) }}
-        </h6>
-        <div class="form-container-body">
-            @foreach($aircraft->subfleet->fares as $fare)
-                <div class="row">
-                    <div class="col">
-                        {{Form::label('fare_'.$fare->id, $fare->name.' ('.$fare->code.')')}}
-                        <div class="input-group form-group">
-                            {{ Form::number('fare_'.$fare->id, null, ['class' => 'form-control', 'min' => 0]) }}
-                        </div>
-                    </div>
-                </div>
-            @endforeach
+  <div class="form-container">
+    <h6><i class="fas fa-ellipsis-h"></i>
+      &nbsp;{{ trans_choice('pireps.fare', 2) }}
+    </h6>
+    <div class="form-container-body">
+      @foreach($aircraft->subfleet->fares as $fare)
+        <div class="row">
+          <div class="col">
+            {{Form::label('fare_'.$fare->id, $fare->name.' ('.$fare->code.')')}}
+            <div class="input-group form-group">
+              {{ Form::number('fare_'.$fare->id, null, ['class' => 'form-control', 'min' => 0]) }}
+            </div>
+          </div>
         </div>
+      @endforeach
     </div>
+  </div>
 @endif
diff --git a/resources/views/layouts/default/pireps/index.blade.php b/resources/views/layouts/default/pireps/index.blade.php
index 52919cc8..52d60d73 100644
--- a/resources/views/layouts/default/pireps/index.blade.php
+++ b/resources/views/layouts/default/pireps/index.blade.php
@@ -2,22 +2,22 @@
 @section('title', trans_choice('common.pirep', 2))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12">
-        <div style="float:right;">
-            <a class="btn btn-info pull-right btn-lg"
-               style="margin-top: -10px;margin-bottom: 5px"
-               href="{{ route('frontend.pireps.create') }}">@lang('pireps.filenewpirep')</a>
-        </div>
-        <h2>{{ trans_choice('pireps.pilotreport', 2) }}</h2>
-        @include('flash::message')
-        @include('pireps.table')
+      <div style="float:right;">
+        <a class="btn btn-info pull-right btn-lg"
+           style="margin-top: -10px;margin-bottom: 5px"
+           href="{{ route('frontend.pireps.create') }}">@lang('pireps.filenewpirep')</a>
+      </div>
+      <h2>{{ trans_choice('pireps.pilotreport', 2) }}</h2>
+      @include('flash::message')
+      @include('pireps.table')
     </div>
-</div>
-<div class="row">
+  </div>
+  <div class="row">
     <div class="col-12 text-center">
-        {{ $pireps->links('pagination.default') }}
+      {{ $pireps->links('pagination.default') }}
     </div>
-</div>
+  </div>
 @endsection
 
diff --git a/resources/views/layouts/default/pireps/map.blade.php b/resources/views/layouts/default/pireps/map.blade.php
index 9aa65731..c0f1a8d5 100644
--- a/resources/views/layouts/default/pireps/map.blade.php
+++ b/resources/views/layouts/default/pireps/map.blade.php
@@ -1,20 +1,20 @@
 <div class="row">
-    <div class="col-12">
-        <div class="box-body">
-            <div id="map" style="width: 100%; height: 800px"></div>
-        </div>
+  <div class="col-12">
+    <div class="box-body">
+      <div id="map" style="width: 100%; height: 800px"></div>
     </div>
+  </div>
 </div>
 
 @section('scripts')
-<script type="text/javascript">
-phpvms.map.render_route_map({
-    pirep_uri: '{!! url('/api/pireps/'.$pirep->id.'/acars/geojson') !!}',
-    route_points: {!! json_encode($map_features['planned_rte_points'])  !!},
-    planned_route_line: {!! json_encode($map_features['planned_rte_line']) !!},
-    actual_route_line: {!! json_encode($map_features['actual_route_line']) !!},
-    actual_route_points: {!! json_encode($map_features['actual_route_points']) !!},
-    aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
-});
-</script>
+  <script type="text/javascript">
+    phpvms.map.render_route_map({
+      pirep_uri: '{!! url('/api/pireps/'.$pirep->id.'/acars/geojson') !!}',
+      route_points: {!! json_encode($map_features['planned_rte_points'])  !!},
+      planned_route_line: {!! json_encode($map_features['planned_rte_line']) !!},
+      actual_route_line: {!! json_encode($map_features['actual_route_line']) !!},
+      actual_route_points: {!! json_encode($map_features['actual_route_points']) !!},
+      aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
+    });
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/pireps/pirep_card.blade.php b/resources/views/layouts/default/pireps/pirep_card.blade.php
index 3b2a127b..b9cb772c 100644
--- a/resources/views/layouts/default/pireps/pirep_card.blade.php
+++ b/resources/views/layouts/default/pireps/pirep_card.blade.php
@@ -1,66 +1,68 @@
 <div class="card border-blue-bottom">
-    <div class="card-block" style="min-height: 0px">
-        <div class="row">
-            <div class="col-12">
-                <p class="float-right">
-                    <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}" class="btn btn-sm btn-info">@lang('common.edit')</a>
-                </p>
-                <h5>
-                    <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">
-                    {{ $pirep->airline->code }}{{ $pirep->ident }}</a>
-                    -
-                    {{ $pirep->dpt_airport->name }}
-                    (<a href="{{route('frontend.airports.show', [
+  <div class="card-block" style="min-height: 0px">
+    <div class="row">
+      <div class="col-12">
+        <p class="float-right">
+          <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}"
+             class="btn btn-sm btn-info">@lang('common.edit')</a>
+        </p>
+        <h5>
+          <a href="{{ route('frontend.pireps.show', [$pirep->id]) }}">
+            {{ $pirep->airline->code }}{{ $pirep->ident }}</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', [
+          <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">
-                <div>
-                    @if($pirep->state === PirepState::PENDING)
-                        <div class="badge badge-warning">
-                    @elseif($pirep->state === PirepState::ACCEPTED)
-                        <div class="badge badge-success">
-                    @elseif($pirep->state === PirepState::REJECTED)
-                        <div class="badge badge-danger">
-                    @else
+        </h5>
+      </div>
+      <div class="col-sm-2 text-center">
+        <div>
+          @if($pirep->state === PirepState::PENDING)
+            <div class="badge badge-warning">
+              @elseif($pirep->state === PirepState::ACCEPTED)
+                <div class="badge badge-success">
+                  @elseif($pirep->state === PirepState::REJECTED)
+                    <div class="badge badge-danger">
+                      @else
                         <div class="badge badge-info">
-                    @endif
-                        {{ PirepState::label($pirep->state) }}</div>
-                </div>
-            </div>
-            <div class="col-sm-10">
-                <div class="row">
-                    <div class="col-sm-12">
-                        <table class="table-condensed" width="100%">
-                            <tr>
-                                <td nowrap><span class="title">@lang('pireps.flighttime')&nbsp;</span></td>
-                                <td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
-                            </tr>
-                            <tr>
-                                <td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>
-                                <td>{{ $pirep->aircraft->name }}
-                                    ({{ $pirep->aircraft->registration }})</td>
-                            </tr>
-                            @if($pirep->level)
-                            <tr>
-                                <td nowrap><span class="title">@lang('pireps.flightlevel')&nbsp;</span></td>
-                                <td>{{ $pirep->level }}</td>
-                            </tr>
-                            @endif
-                            <tr>
-                                <td nowrap><span class="title">@lang('pireps.filedon'):&nbsp;</span></td>
-                                <td>{{ show_datetime($pirep->created_at) }}</td>
-                            </tr>
-                        </table>
+                          @endif
+                          {{ PirepState::label($pirep->state) }}</div>
                     </div>
                 </div>
+                <div class="col-sm-10">
+                  <div class="row">
+                    <div class="col-sm-12">
+                      <table class="table-condensed" width="100%">
+                        <tr>
+                          <td nowrap><span class="title">@lang('pireps.flighttime')&nbsp;</span></td>
+                          <td>{{ Utils::minutesToTimeString($pirep->flight_time) }}</td>
+                        </tr>
+                        <tr>
+                          <td nowrap><span class="title">@lang('common.aircraft')&nbsp;</span></td>
+                          <td>{{ $pirep->aircraft->name }}
+                            ({{ $pirep->aircraft->registration }})
+                          </td>
+                        </tr>
+                        @if($pirep->level)
+                          <tr>
+                            <td nowrap><span class="title">@lang('pireps.flightlevel')&nbsp;</span></td>
+                            <td>{{ $pirep->level }}</td>
+                          </tr>
+                        @endif
+                        <tr>
+                          <td nowrap><span class="title">@lang('pireps.filedon'):&nbsp;</span></td>
+                          <td>{{ show_datetime($pirep->created_at) }}</td>
+                        </tr>
+                      </table>
+                    </div>
+                  </div>
+                </div>
             </div>
         </div>
-    </div>
-</div>
+      </div>
diff --git a/resources/views/layouts/default/pireps/scripts.blade.php b/resources/views/layouts/default/pireps/scripts.blade.php
index e7cb0db8..5fe16cde 100644
--- a/resources/views/layouts/default/pireps/scripts.blade.php
+++ b/resources/views/layouts/default/pireps/scripts.blade.php
@@ -1,16 +1,16 @@
 @section('scripts')
-<script>
-const select_id = "select#aircraft_select";
-const destContainer = $('#fares_container');
+  <script>
+    const select_id = "select#aircraft_select";
+    const destContainer = $('#fares_container');
 
-$(select_id).change(e => {
-    const aircraft_id = $(select_id + ' option:selected').val();
-    const url = '/pireps/fares?aircraft_id=' + aircraft_id;
-    console.log('aircraft select change: ', aircraft_id);
+    $(select_id).change(e => {
+      const aircraft_id = $(select_id + ' option:selected').val();
+      const url = '/pireps/fares?aircraft_id=' + aircraft_id;
+      console.log('aircraft select change: ', aircraft_id);
 
-    phpvms.request(url).then(response => {
+      phpvms.request(url).then(response => {
         destContainer.html(response.data);
+      });
     });
-});
-</script>
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/pireps/show.blade.php b/resources/views/layouts/default/pireps/show.blade.php
index 8421bb24..16637d03 100644
--- a/resources/views/layouts/default/pireps/show.blade.php
+++ b/resources/views/layouts/default/pireps/show.blade.php
@@ -2,220 +2,220 @@
 @section('title', trans_choice('common.pirep', 1).' '.$pirep->ident)
 
 @section('content')
-    <div class="row">
-        <div class="col-8">
-            <div class="row">
-                <div class="col-12">
-                    <h2 style="margin-bottom: 5px;">{{$pirep->airline->code}}{{ $pirep->ident }}</h2>
-                </div>
-            </div>
-            <div class="row">
-                {{--
-                    DEPARTURE INFO
-                --}}
-                <div class="col-6 text-left">
-                    <h4>
-                        {{$pirep->dpt_airport->location}}
-                    </h4>
-                    <p>
-                        <a href="{{route('frontend.airports.show', $pirep->dpt_airport_id)}}">
-                            {{ $pirep->dpt_airport->full_name }} ({{  $pirep->dpt_airport_id }})</a>
-                        <br/>
-                        @if($pirep->block_off_time)
-                            {{ $pirep->block_off_time->toDayDateTimeString() }}
-                        @endif
-                    </p>
-                </div>
-
-                {{--
-                    ARRIVAL INFO
-                --}}
-                <div class="col-6 text-right">
-                    <h4>
-                        {{$pirep->arr_airport->location}}
-                    </h4>
-                    <p>
-                        <a href="{{route('frontend.airports.show', $pirep->arr_airport_id)}}">
-                            {{ $pirep->arr_airport->full_name }} ({{  $pirep->arr_airport_id }})</a>
-                        <br/>
-                        @if($pirep->block_on_time)
-                            {{ $pirep->block_on_time->toDayDateTimeString() }}
-                        @endif
-                    </p>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-12">
-                    <div class="progress" style="margin: 20px 0;">
-                        <div class="progress-bar progress-bar-success" role="progressbar"
-                             aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"
-                             style="width: {{$pirep->progress_percent}}%;">
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row">
-                <div class="col-12">
-                    @include('pireps.map')
-                </div>
-            </div>
+  <div class="row">
+    <div class="col-8">
+      <div class="row">
+        <div class="col-12">
+          <h2 style="margin-bottom: 5px;">{{$pirep->airline->code}}{{ $pirep->ident }}</h2>
+        </div>
+      </div>
+      <div class="row">
+        {{--
+            DEPARTURE INFO
+        --}}
+        <div class="col-6 text-left">
+          <h4>
+            {{$pirep->dpt_airport->location}}
+          </h4>
+          <p>
+            <a href="{{route('frontend.airports.show', $pirep->dpt_airport_id)}}">
+              {{ $pirep->dpt_airport->full_name }} ({{  $pirep->dpt_airport_id }})</a>
+            <br/>
+            @if($pirep->block_off_time)
+              {{ $pirep->block_off_time->toDayDateTimeString() }}
+            @endif
+          </p>
         </div>
 
         {{--
-
-        RIGHT SIDEBAR
-
+            ARRIVAL INFO
         --}}
-
-        <div class="col-4">
-
-            <h2>&nbsp;</h2>
-
-            {{-- Show the link to edit if it can be edited --}}
-            @if(!$pirep->read_only)
-                <div class="float-right" style="margin-bottom: 10px;">
-                    <form method="get"
-                          action="{{ route('frontend.pireps.edit', $pirep->id) }}"
-                          style="display: inline">
-                        @csrf
-                        <button class="btn btn-info">@lang('common.edit')</button>
-                    </form>
-                    &nbsp;
-                    <form method="post"
-                          action="{{ route('frontend.pireps.submit', $pirep->id) }}"
-                          style="display: inline">
-                        @csrf
-                        <button class="btn btn-success">@lang('common.submit')</button>
-                    </form>
-                </div>
-            @endif
-            <table class="table table-striped">
-
-                <tr>
-                    <td width="30%">@lang('common.state')</td>
-                    <td>
-                        <div class="badge badge-info">
-                            {{ PirepState::label($pirep->state) }}
-                        </div>
-                    </td>
-                </tr>
-
-                <tr>
-                    <td width="30%">@lang('common.status')</td>
-                    <td>
-                        <div class="badge badge-info">
-                            {{ PirepStatus::label($pirep->status) }}
-                        </div>
-                    </td>
-                </tr>
-
-                <tr>
-                    <td>@lang('pireps.source')</td>
-                    <td>{{ PirepSource::label($pirep->source) }}</td>
-                </tr>
-
-                <tr>
-                    <td>@lang('flights.flighttype')</td>
-                    <td>{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}</td>
-                </tr>
-
-                <tr>
-                    <td>@lang('pireps.filedroute')</td>
-                    <td>
-                        {{ $pirep->route }}
-                    </td>
-                </tr>
-
-                <tr>
-                    <td>{{ trans_choice('common.note', 2) }}</td>
-                    <td>
-                        {{ $pirep->notes }}
-                    </td>
-                </tr>
-
-                <tr>
-                    <td>@lang('pireps.filedon')</td>
-                    <td>
-                        {{ show_datetime($pirep->created_at) }}
-                    </td>
-                </tr>
-
-            </table>
-
-            @if(count($pirep->fields) > 0 || count($pirep->fares) > 0)
-                <div class="separator"></div>
-            @endif
-
-            @if(count($pirep->fields) > 0)
-                <h5>{{ trans_choice('common.field', 2) }}</h5>
-                <table class="table table-hover table-condensed">
-                    <thead>
-                    <th>@lang('common.name')</th>
-                    <th>@lang('common.value')</th>
-                    </thead>
-                    <tbody>
-                    @foreach($pirep->fields as $field)
-                        <tr>
-                            <td>{{ $field->name }}</td>
-                            <td>{{ $field->value }}</td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            @endif
-
-            @if(count($pirep->fares) > 0)
-                <div class="separator"></div>
-            @endif
-
-            {{--
-                Show the fares that have been entered
-            --}}
-            @if(count($pirep->fares) > 0)
-                <div class="row">
-                    <div class="col-12">
-                        <h5>{{ trans_choice('pireps.fare', 2) }}</h5>
-                        <table class="table table-hover table-condensed">
-                            <thead>
-                            <th>@lang('pireps.class')</th>
-                            <th>@lang('pireps.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>
+        <div class="col-6 text-right">
+          <h4>
+            {{$pirep->arr_airport->location}}
+          </h4>
+          <p>
+            <a href="{{route('frontend.airports.show', $pirep->arr_airport_id)}}">
+              {{ $pirep->arr_airport->full_name }} ({{  $pirep->arr_airport_id }})</a>
+            <br/>
+            @if($pirep->block_on_time)
+              {{ $pirep->block_on_time->toDayDateTimeString() }}
             @endif
+          </p>
         </div>
+      </div>
+
+      <div class="row">
+        <div class="col-12">
+          <div class="progress" style="margin: 20px 0;">
+            <div class="progress-bar progress-bar-success" role="progressbar"
+                 aria-valuenow="40" aria-valuemin="0" aria-valuemax="100"
+                 style="width: {{$pirep->progress_percent}}%;">
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row">
+        <div class="col-12">
+          @include('pireps.map')
+        </div>
+      </div>
     </div>
 
-    @if(count($pirep->acars_logs) > 0)
-        <div class="separator"></div>
-        <div class="row">
-            <div class="col-12">
-                <h5>@lang('pireps.flightlog')</h5>
-            </div>
-            <div class="col-12">
-                <table class="table table-hover table-condensed" id="users-table">
-                    <tbody>
-                    @foreach($pirep->acars_logs as $log)
-                        <tr>
-                            <td nowrap="true">{{ show_datetime($log->created_at) }}</td>
-                            <td>{{ $log->log }}</td>
-                        </tr>
-                    @endforeach
-                    </tbody>
-                </table>
-            </div>
+    {{--
+
+    RIGHT SIDEBAR
+
+    --}}
+
+    <div class="col-4">
+
+      <h2>&nbsp;</h2>
+
+      {{-- Show the link to edit if it can be edited --}}
+      @if(!$pirep->read_only)
+        <div class="float-right" style="margin-bottom: 10px;">
+          <form method="get"
+                action="{{ route('frontend.pireps.edit', $pirep->id) }}"
+                style="display: inline">
+            @csrf
+            <button class="btn btn-info">@lang('common.edit')</button>
+          </form>
+          &nbsp;
+          <form method="post"
+                action="{{ route('frontend.pireps.submit', $pirep->id) }}"
+                style="display: inline">
+            @csrf
+            <button class="btn btn-success">@lang('common.submit')</button>
+          </form>
         </div>
-    @endif
+      @endif
+      <table class="table table-striped">
+
+        <tr>
+          <td width="30%">@lang('common.state')</td>
+          <td>
+            <div class="badge badge-info">
+              {{ PirepState::label($pirep->state) }}
+            </div>
+          </td>
+        </tr>
+
+        <tr>
+          <td width="30%">@lang('common.status')</td>
+          <td>
+            <div class="badge badge-info">
+              {{ PirepStatus::label($pirep->status) }}
+            </div>
+          </td>
+        </tr>
+
+        <tr>
+          <td>@lang('pireps.source')</td>
+          <td>{{ PirepSource::label($pirep->source) }}</td>
+        </tr>
+
+        <tr>
+          <td>@lang('flights.flighttype')</td>
+          <td>{{ \App\Models\Enums\FlightType::label($pirep->flight_type) }}</td>
+        </tr>
+
+        <tr>
+          <td>@lang('pireps.filedroute')</td>
+          <td>
+            {{ $pirep->route }}
+          </td>
+        </tr>
+
+        <tr>
+          <td>{{ trans_choice('common.note', 2) }}</td>
+          <td>
+            {{ $pirep->notes }}
+          </td>
+        </tr>
+
+        <tr>
+          <td>@lang('pireps.filedon')</td>
+          <td>
+            {{ show_datetime($pirep->created_at) }}
+          </td>
+        </tr>
+
+      </table>
+
+      @if(count($pirep->fields) > 0 || count($pirep->fares) > 0)
+        <div class="separator"></div>
+      @endif
+
+      @if(count($pirep->fields) > 0)
+        <h5>{{ trans_choice('common.field', 2) }}</h5>
+        <table class="table table-hover table-condensed">
+          <thead>
+          <th>@lang('common.name')</th>
+          <th>@lang('common.value')</th>
+          </thead>
+          <tbody>
+          @foreach($pirep->fields as $field)
+            <tr>
+              <td>{{ $field->name }}</td>
+              <td>{{ $field->value }}</td>
+            </tr>
+          @endforeach
+          </tbody>
+        </table>
+      @endif
+
+      @if(count($pirep->fares) > 0)
+        <div class="separator"></div>
+      @endif
+
+      {{--
+          Show the fares that have been entered
+      --}}
+      @if(count($pirep->fares) > 0)
+        <div class="row">
+          <div class="col-12">
+            <h5>{{ trans_choice('pireps.fare', 2) }}</h5>
+            <table class="table table-hover table-condensed">
+              <thead>
+              <th>@lang('pireps.class')</th>
+              <th>@lang('pireps.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>
+
+  @if(count($pirep->acars_logs) > 0)
+    <div class="separator"></div>
+    <div class="row">
+      <div class="col-12">
+        <h5>@lang('pireps.flightlog')</h5>
+      </div>
+      <div class="col-12">
+        <table class="table table-hover table-condensed" id="users-table">
+          <tbody>
+          @foreach($pirep->acars_logs as $log)
+            <tr>
+              <td nowrap="true">{{ show_datetime($log->created_at) }}</td>
+              <td>{{ $log->log }}</td>
+            </tr>
+          @endforeach
+          </tbody>
+        </table>
+      </div>
+    </div>
+  @endif
 @endsection
 
diff --git a/resources/views/layouts/default/pireps/table.blade.php b/resources/views/layouts/default/pireps/table.blade.php
index a8ce8712..4337d380 100644
--- a/resources/views/layouts/default/pireps/table.blade.php
+++ b/resources/views/layouts/default/pireps/table.blade.php
@@ -1,73 +1,73 @@
 <div class="table-responsive">
   <table class="table table-sm table-hover table-striped">
-      <thead>
-          <tr>
-              <th>{{ trans_choice('common.flight', 1) }}</th>
-              <th>@lang('common.departure')</th>
-              <th>@lang('common.arrival')</th>
-              <th>@lang('common.aircraft')</th>
-              <th class="text-center">@lang('flights.flighttime')</th>
-              <th class="text-center">@lang('common.status')</th>
-              <th>@lang('pireps.submitted')</th>
-              <th></th>
-          </tr>
-      </thead>
-      <tbody>
+    <thead>
+    <tr>
+      <th>{{ trans_choice('common.flight', 1) }}</th>
+      <th>@lang('common.departure')</th>
+      <th>@lang('common.arrival')</th>
+      <th>@lang('common.aircraft')</th>
+      <th class="text-center">@lang('flights.flighttime')</th>
+      <th class="text-center">@lang('common.status')</th>
+      <th>@lang('pireps.submitted')</th>
+      <th></th>
+    </tr>
+    </thead>
+    <tbody>
 
-      @foreach($pireps as $pirep)
-          <tr>
-              <td>
-                  <a href="{{ route('frontend.pireps.show', [
+    @foreach($pireps as $pirep)
+      <tr>
+        <td>
+          <a href="{{ route('frontend.pireps.show', [
                       $pirep->id]) }}">{{ $pirep->airline->code }}{{ $pirep->ident }}</a>
-              </td>
-              <td>
-                  @if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif
+        </td>
+        <td>
+          @if($pirep->dpt_airport){{ $pirep->dpt_airport->name }}@endif
                   (<a href="{{route('frontend.airports.show', [$pirep->dpt_airport_id])}}">{{$pirep->dpt_airport_id}}</a>)
-              </td>
-              <td>
-                  @if($pirep->arr_airport){{ $pirep->arr_airport->name }}@endif
+        </td>
+        <td>
+          @if($pirep->arr_airport){{ $pirep->arr_airport->name }}@endif
                   (<a href="{{route('frontend.airports.show', [$pirep->arr_airport_id])}}">{{$pirep->arr_airport_id}}</a>)
-              </td>
-              <td>
-                  @if($pirep->aircraft)
-                      {{ $pirep->aircraft->name }}
-                  @else
-                      -
-                  @endif
-              </td>
-              <td class="text-center">
-                  {{ (new \App\Support\Units\Time($pirep->flight_time)) }}
-              </td>
-              <td class="text-center">
-                  @if($pirep->state === PirepState::PENDING)
-                  <div class="badge badge-warning">
-                  @elseif($pirep->state === PirepState::ACCEPTED)
-                  <div class="badge badge-success">
+        </td>
+        <td>
+          @if($pirep->aircraft)
+            {{ $pirep->aircraft->name }}
+          @else
+            -
+          @endif
+        </td>
+        <td class="text-center">
+          {{ (new \App\Support\Units\Time($pirep->flight_time)) }}
+        </td>
+        <td class="text-center">
+          @if($pirep->state === PirepState::PENDING)
+            <div class="badge badge-warning">
+              @elseif($pirep->state === PirepState::ACCEPTED)
+                <div class="badge badge-success">
                   @elseif($pirep->state === PirepState::REJECTED)
-                  <div class="badge badge-danger">
-                  @else
-                  <div class="badge badge-info">
-                  @endif
-                  {{ PirepState::label($pirep->state) }}</div>
-              </td>
-              <td>
-                  @if(filled($pirep->submitted_at))
-                      {{ $pirep->submitted_at->diffForHumans() }}
-                  @endif
-              </td>
-              <td>
-                  @if(!$pirep->read_only)
-                  <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}"
-                    class="btn btn-info btn-sm"
-                    style="z-index: 9999"
-                    title="@lang('common.edit')">
-                    @lang('common.edit')
-                  </a>
-                  @endif
-              </td>
-          </tr>
-      @endforeach
+                    <div class="badge badge-danger">
+                      @else
+                        <div class="badge badge-info">
+                          @endif
+                          {{ PirepState::label($pirep->state) }}</div>
+        </td>
+        <td>
+          @if(filled($pirep->submitted_at))
+            {{ $pirep->submitted_at->diffForHumans() }}
+          @endif
+        </td>
+        <td>
+          @if(!$pirep->read_only)
+            <a href="{{ route('frontend.pireps.edit', [$pirep->id]) }}"
+               class="btn btn-info btn-sm"
+               style="z-index: 9999"
+               title="@lang('common.edit')">
+              @lang('common.edit')
+            </a>
+          @endif
+        </td>
+      </tr>
+    @endforeach
 
-      </tbody>
+    </tbody>
   </table>
 </div>
diff --git a/resources/views/layouts/default/profile/edit.blade.php b/resources/views/layouts/default/profile/edit.blade.php
index e60e8895..d97bc924 100644
--- a/resources/views/layouts/default/profile/edit.blade.php
+++ b/resources/views/layouts/default/profile/edit.blade.php
@@ -2,13 +2,13 @@
 @section('title', __('profile.editprofile'))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12">
-        <h2 class="description">@lang('profile.edityourprofile')</h2>
-          @include('flash::message')
-          {{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'files' => true, 'method' => 'patch']) }}
-             @include("profile.fields")
-          {{ Form::close() }}
+      <h2 class="description">@lang('profile.edityourprofile')</h2>
+      @include('flash::message')
+      {{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'files' => true, 'method' => 'patch']) }}
+      @include("profile.fields")
+      {{ Form::close() }}
     </div>
-</div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/profile/fields.blade.php b/resources/views/layouts/default/profile/fields.blade.php
index 50dac2c0..ae6ad93e 100644
--- a/resources/views/layouts/default/profile/fields.blade.php
+++ b/resources/views/layouts/default/profile/fields.blade.php
@@ -1,129 +1,129 @@
 <div class="row">
-    <div class="col-md-12">
-        <table class="table">
-            <tr>
-                <td>@lang('common.name')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
-                        {{ Form::text('name', null, ['class' => 'form-control']) }}
-                    </div>
-                    @if ($errors->has('name'))
-                        <p class="text-danger">{{ $errors->first('name') }}</p>
-                    @endif
-                </td>
-            </tr>
+  <div class="col-md-12">
+    <table class="table">
+      <tr>
+        <td>@lang('common.name')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
+            {{ Form::text('name', null, ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('name'))
+            <p class="text-danger">{{ $errors->first('name') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('common.email')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
-                        {{ Form::text('email', null, ['class' => 'form-control']) }}
-                    </div>
-                    @if ($errors->has('email'))
-                        <p class="text-danger">{{ $errors->first('email') }}</p>
-                    @endif
-                </td>
-            </tr>
+      <tr>
+        <td>@lang('common.email')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
+            {{ Form::text('email', null, ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('email'))
+            <p class="text-danger">{{ $errors->first('email') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('common.airline')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
-                        {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
-                    </div>
-                    @if ($errors->has('airline_id'))
-                        <p class="text-danger">{{ $errors->first('airline_id') }}</p>
-                    @endif
-                </td>
-            </tr>
+      <tr>
+        <td>@lang('common.airline')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
+            {{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
+          </div>
+          @if ($errors->has('airline_id'))
+            <p class="text-danger">{{ $errors->first('airline_id') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('airports.home')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
-                        {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
-                    </div>
-                    @if ($errors->has('home_airport_id'))
-                        <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
-                    @endif
-                </td>
-            </tr>
+      <tr>
+        <td>@lang('airports.home')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
+            {{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
+          </div>
+          @if ($errors->has('home_airport_id'))
+            <p class="text-danger">{{ $errors->first('home_airport_id') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('common.country')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
-                        {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
-                    </div>
-                    @if ($errors->has('country'))
-                        <p class="text-danger">{{ $errors->first('country') }}</p>
-                    @endif
-                </td>
-            </tr>
+      <tr>
+        <td>@lang('common.country')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
+            {{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
+          </div>
+          @if ($errors->has('country'))
+            <p class="text-danger">{{ $errors->first('country') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('common.timezone')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
-                        {{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
-                    </div>
-                    @if ($errors->has('timezone'))
-                        <p class="text-danger">{{ $errors->first('timezone') }}</p>
-                    @endif
-                </td>
-            </tr>
+      <tr>
+        <td>@lang('common.timezone')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
+            {{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
+          </div>
+          @if ($errors->has('timezone'))
+            <p class="text-danger">{{ $errors->first('timezone') }}</p>
+          @endif
+        </td>
+      </tr>
 
-            <tr>
-                <td>@lang('profile.changepassword')</td>
-                <td>
-                    <p>@lang('profile.newpassword'):</p>
-                    <div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-danger' : '' }}">
-                        {{ Form::password('password', ['class' => 'form-control']) }}
-                    </div>
-                    @if ($errors->has('password'))
-                        <p class="text-danger">{{ $errors->first('password') }}</p>
-                    @endif
+      <tr>
+        <td>@lang('profile.changepassword')</td>
+        <td>
+          <p>@lang('profile.newpassword'):</p>
+          <div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-danger' : '' }}">
+            {{ Form::password('password', ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('password'))
+            <p class="text-danger">{{ $errors->first('password') }}</p>
+          @endif
 
-                    <p>@lang('passwords.confirm'):</p>
-                    <div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
-                        {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
-                    </div>
-                    @if ($errors->has('password_confirmation'))
-                        <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
-                    @endif
-                </td>
-            </tr>
-            <tr>
-                <td>@lang('profile.avatar')</td>
-                <td>
-                    <div class="input-group form-group-no-border{{ $errors->has('avatar') ? ' has-danger' : '' }}">
-                        {{ Form::file('avatar', null) }}
-                    </div>
-                    <p class="small">@lang('profile.avatarresize', [
+          <p>@lang('passwords.confirm'):</p>
+          <div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
+            {{ Form::password('password_confirmation', ['class' => 'form-control']) }}
+          </div>
+          @if ($errors->has('password_confirmation'))
+            <p class="text-danger">{{ $errors->first('password_confirmation') }}</p>
+          @endif
+        </td>
+      </tr>
+      <tr>
+        <td>@lang('profile.avatar')</td>
+        <td>
+          <div class="input-group form-group-no-border{{ $errors->has('avatar') ? ' has-danger' : '' }}">
+            {{ Form::file('avatar', null) }}
+          </div>
+          <p class="small">@lang('profile.avatarresize', [
                         'width' => config('phpvms.avatar.width'),
                         'height' => config('phpvms.avatar.height')])
-                    </p>
-                    @if ($errors->has('avatar'))
-                        <p class="text-danger">{{ $errors->first('avatar') }}</p>
-                    @endif
-                </td>
-            </tr>
-            <tr>
-                <td>@lang('profile.opt-in')</td>
-                <td>
-                    <div class="input-group form-group-no-border">
-                        {{ Form::hidden('opt_in', 0, false) }}
-                        {{ Form::checkbox('opt_in', 1, null) }}
-                    </div>
-                    <p class="small">@lang('profile.opt-in-descrip')
-                    </p>
-                </td>
-            </tr>
+          </p>
+          @if ($errors->has('avatar'))
+            <p class="text-danger">{{ $errors->first('avatar') }}</p>
+          @endif
+        </td>
+      </tr>
+      <tr>
+        <td>@lang('profile.opt-in')</td>
+        <td>
+          <div class="input-group form-group-no-border">
+            {{ Form::hidden('opt_in', 0, false) }}
+            {{ Form::checkbox('opt_in', 1, null) }}
+          </div>
+          <p class="small">@lang('profile.opt-in-descrip')
+          </p>
+        </td>
+      </tr>
 
-       </table>
+    </table>
 
-        <div style="width: 100%; text-align: right; padding-top: 20px;">
-            {{ Form::submit(__('profile.updateprofile'), ['class' => 'btn btn-primary']) }}
-        </div>
+    <div style="width: 100%; text-align: right; padding-top: 20px;">
+      {{ Form::submit(__('profile.updateprofile'), ['class' => 'btn btn-primary']) }}
     </div>
+  </div>
 </div>
diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php
index a29d1f91..1164844b 100644
--- a/resources/views/layouts/default/profile/index.blade.php
+++ b/resources/views/layouts/default/profile/index.blade.php
@@ -2,125 +2,125 @@
 @section('title', __('common.profile'))
 
 @section('content')
-<div class="row profile-page content-center text-color-dark-beige">
+  <div class="row profile-page content-center text-color-dark-beige">
     <div class="col-md-4" style="text-align:center;">
-        <div class="photo-container">
-            @if ($user->avatar == null)
-                <img src="{{ $user->gravatar(512) }}" style="width: 123px;">
-            @else
-                <img src="{{ $user->avatar->url }}" style="width: 123px;">
-            @endif
-        </div>
-        <div><br /></div>
-        <div class="social-description">
-            <h2>{{ $user->name }}</h2>
-            <p>{{ $user->ident }}</p>
-        </div>
-        <p class="description" style="color: #9A9A9A;">
-            {{ $user->airline->name }}
-        </p>
-        <h6><span class="flag-icon flag-icon-{{ $user->country }}"></span></h6>
-        <div class="social-description">
-            <h2>{{ $user->rank->name }}</h2>
-            <p>Rank</p>
-        </div>
-        @if($user->home_airport)
-            <div class="social-description">
-                <h2>{{ $user->home_airport->icao }}</h2>
-                <p>@lang('airports.home')</p>
-            </div>
+      <div class="photo-container">
+        @if ($user->avatar == null)
+          <img src="{{ $user->gravatar(512) }}" style="width: 123px;">
+        @else
+          <img src="{{ $user->avatar->url }}" style="width: 123px;">
         @endif
+      </div>
+      <div><br/></div>
+      <div class="social-description">
+        <h2>{{ $user->name }}</h2>
+        <p>{{ $user->ident }}</p>
+      </div>
+      <p class="description" style="color: #9A9A9A;">
+        {{ $user->airline->name }}
+      </p>
+      <h6><span class="flag-icon flag-icon-{{ $user->country }}"></span></h6>
+      <div class="social-description">
+        <h2>{{ $user->rank->name }}</h2>
+        <p>Rank</p>
+      </div>
+      @if($user->home_airport)
+        <div class="social-description">
+          <h2>{{ $user->home_airport->icao }}</h2>
+          <p>@lang('airports.home')</p>
+        </div>
+      @endif
     </div>
     <div class="col-md-8  content-center">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-6">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <h2 class="card-title">{{ $user->flights}}</h2>
-                            <p class="card-text">Flights</p>
-                        </div>
-                    </div>
-                </div>
-
-                <div class="col-lg-6">
-                    <div class="card text-center">
-                        <div class="card-body">
-                            <div class="social-description">
-                                <h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
-                                <p>@lang('flights.flighthours')</p>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+      <div class="content">
+        <div class="row">
+          <div class="col-lg-6">
+            <div class="card text-center">
+              <div class="card-body">
+                <h2 class="card-title">{{ $user->flights}}</h2>
+                <p class="card-text">Flights</p>
+              </div>
             </div>
-            <div class="row">
-                @if($user->current_airport)
-                    <div class="col-lg-6">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                    <div class="social-description">
-                                        <h2>{{ $user->current_airport->icao }}</h2>
-                                        <p>@lang('airports.current')</p>
-                                    </div>
-                            </div>
-                        </div>
-                    </div>
-                @endif
+          </div>
 
-
-                @if(setting('pilots.allow_transfer_hours') === true)
-                    <div class="col-lg-6">
-                        <div class="card text-center">
-                            <div class="card-body">
-                                <div class="social-description">
-                                    <h2>{{ \App\Facades\Utils::minutesToHours($user->transfer_time) }}h</h2>
-                                    <p>@lang('profile.transferhours')</p>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                @endif
+          <div class="col-lg-6">
+            <div class="card text-center">
+              <div class="card-body">
+                <div class="social-description">
+                  <h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
+                  <p>@lang('flights.flighthours')</p>
+                </div>
+              </div>
             </div>
+          </div>
         </div>
-    </div>
-</div>
+        <div class="row">
+          @if($user->current_airport)
+            <div class="col-lg-6">
+              <div class="card text-center">
+                <div class="card-body">
+                  <div class="social-description">
+                    <h2>{{ $user->current_airport->icao }}</h2>
+                    <p>@lang('airports.current')</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          @endif
 
-{{--
-    show the details/edit fields only for the currently logged in user
---}}
-@if(Auth::check() && $user->id === Auth::user()->id)
+
+          @if(setting('pilots.allow_transfer_hours') === true)
+            <div class="col-lg-6">
+              <div class="card text-center">
+                <div class="card-body">
+                  <div class="social-description">
+                    <h2>{{ \App\Facades\Utils::minutesToHours($user->transfer_time) }}h</h2>
+                    <p>@lang('profile.transferhours')</p>
+                  </div>
+                </div>
+              </div>
+            </div>
+          @endif
+        </div>
+      </div>
+    </div>
+  </div>
+
+  {{--
+      show the details/edit fields only for the currently logged in user
+  --}}
+  @if(Auth::check() && $user->id === Auth::user()->id)
     <div class="clearfix" style="height: 50px;"></div>
     <div class="row">
-        <div class="col-sm-12">
-            <div class="text-right">
-                <a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
-                   onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('profile.newapikey')</a>
-                &nbsp;
-                <a href="{{ route('frontend.profile.edit', [$user->id]) }}"
-                   class="btn btn-primary">@lang('common.edit')</a>
-            </div>
-
-            <h3 class="description">@lang('profile.yourprofile')</h3>
-            <table class="table table-full-width">
-                <tr>
-                    <td>@lang('common.email')</td>
-                    <td>{{ $user->email }}</td>
-                </tr>
-                <tr>
-                    <td>@lang('profile.apikey')&nbsp;&nbsp;<span class="description">(@lang('profile.dontshare'))</span></td>
-                    <td>{{ $user->api_key }}</td>
-                </tr>
-                <tr>
-                    <td>@lang('common.timezone')</td>
-                    <td>{{ $user->timezone }}</td>
-                </tr>
-                <tr>
-                    <td>@lang('profile.opt-in')</td>
-                    <td>{{ $user->opt_in ? __('common.yes') : __('common.no') }}</td>
-                </tr>
-            </table>
+      <div class="col-sm-12">
+        <div class="text-right">
+          <a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
+             onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('profile.newapikey')</a>
+          &nbsp;
+          <a href="{{ route('frontend.profile.edit', [$user->id]) }}"
+             class="btn btn-primary">@lang('common.edit')</a>
         </div>
+
+        <h3 class="description">@lang('profile.yourprofile')</h3>
+        <table class="table table-full-width">
+          <tr>
+            <td>@lang('common.email')</td>
+            <td>{{ $user->email }}</td>
+          </tr>
+          <tr>
+            <td>@lang('profile.apikey')&nbsp;&nbsp;<span class="description">(@lang('profile.dontshare'))</span></td>
+            <td>{{ $user->api_key }}</td>
+          </tr>
+          <tr>
+            <td>@lang('common.timezone')</td>
+            <td>{{ $user->timezone }}</td>
+          </tr>
+          <tr>
+            <td>@lang('profile.opt-in')</td>
+            <td>{{ $user->opt_in ? __('common.yes') : __('common.no') }}</td>
+          </tr>
+        </table>
+      </div>
     </div>
-@endif
+  @endif
 @endsection
diff --git a/resources/views/layouts/default/theme.json b/resources/views/layouts/default/theme.json
index a3c05c0a..59187ed9 100644
--- a/resources/views/layouts/default/theme.json
+++ b/resources/views/layouts/default/theme.json
@@ -1,4 +1,4 @@
 {
-    "name": "default",
-    "parent_theme": null
+  "name": "default",
+  "parent_theme": null
 }
diff --git a/resources/views/layouts/default/users/index.blade.php b/resources/views/layouts/default/users/index.blade.php
index e7572b78..8e597965 100644
--- a/resources/views/layouts/default/users/index.blade.php
+++ b/resources/views/layouts/default/users/index.blade.php
@@ -2,15 +2,15 @@
 @section('title', trans_choice('common.pilot', 2))
 
 @section('content')
-<div class="row">
+  <div class="row">
     <div class="col-md-12">
-        <h2>{{ trans_choice('common.pilot', 2) }}</h2>
-        @include('users.table')
+      <h2>{{ trans_choice('common.pilot', 2) }}</h2>
+      @include('users.table')
     </div>
-</div>
-    <div class="row">
-        <div class="col-12 text-center">
-            {{ $users->links('pagination.default') }}
-        </div>
+  </div>
+  <div class="row">
+    <div class="col-12 text-center">
+      {{ $users->links('pagination.default') }}
     </div>
+  </div>
 @endsection
diff --git a/resources/views/layouts/default/users/table.blade.php b/resources/views/layouts/default/users/table.blade.php
index 9dc9872d..d6a00f10 100644
--- a/resources/views/layouts/default/users/table.blade.php
+++ b/resources/views/layouts/default/users/table.blade.php
@@ -1,48 +1,48 @@
 <table class="table table-hover" id="users-table">
-    <thead>
-        <th></th>
-        <th>@lang('common.name')</th>
-        <th style="text-align: center"></th>
-        <th style="text-align: center">@lang('common.airline')</th>
-        <th style="text-align: center">@lang('user.location')</th>
-        <th style="text-align: center">{{ trans_choice('common.flight', 2) }}</th>
-        <th style="text-align: center">{{ trans_choice('common.hour', 2) }}</th>
-    </thead>
-    <tbody>
-    @foreach($users as $user)
-        <tr>
-            <td style="width: 80px;">
-                <div class="photo-container">
-                @if ($user->avatar == null)
-                    <img class="rounded-circle"
-                         src="{{ $user->gravatar(256) }}&s=256"/>
-                @else
-                    <img src="{{ $user->avatar->url }}">
-                @endif
-                </div>
-            </td>
-            <td>
-                <a href="{{ route('frontend.profile.show.public', [$user->id]) }}">
-                    {{ $user->name }}
-                </a>
-            </td>
-            <td align="center">
-                @if(filled($user->country))
-                    <span class="flag-icon flag-icon-{{ $user->country }}"
-                          title="{{ $country->alpha2($user->country)['name'] }}"></span>
-                @endif
-            </td>
-            <td class="text-center">{{ $user->airline->icao }}</td>
-            <td class="text-center">
-                @if($user->current_airport)
-                    {{ $user->curr_airport_id }}
-                @else
-                    -
-                @endif
-            </td>
-            <td align="center">{{ $user->flights }}</td>
-            <td align="center">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time) }}</td>
-        </tr>
-    @endforeach
-    </tbody>
+  <thead>
+  <th></th>
+  <th>@lang('common.name')</th>
+  <th style="text-align: center"></th>
+  <th style="text-align: center">@lang('common.airline')</th>
+  <th style="text-align: center">@lang('user.location')</th>
+  <th style="text-align: center">{{ trans_choice('common.flight', 2) }}</th>
+  <th style="text-align: center">{{ trans_choice('common.hour', 2) }}</th>
+  </thead>
+  <tbody>
+  @foreach($users as $user)
+    <tr>
+      <td style="width: 80px;">
+        <div class="photo-container">
+          @if ($user->avatar == null)
+            <img class="rounded-circle"
+                 src="{{ $user->gravatar(256) }}&s=256"/>
+          @else
+            <img src="{{ $user->avatar->url }}">
+          @endif
+        </div>
+      </td>
+      <td>
+        <a href="{{ route('frontend.profile.show.public', [$user->id]) }}">
+          {{ $user->name }}
+        </a>
+      </td>
+      <td align="center">
+        @if(filled($user->country))
+          <span class="flag-icon flag-icon-{{ $user->country }}"
+                title="{{ $country->alpha2($user->country)['name'] }}"></span>
+        @endif
+      </td>
+      <td class="text-center">{{ $user->airline->icao }}</td>
+      <td class="text-center">
+        @if($user->current_airport)
+          {{ $user->curr_airport_id }}
+        @else
+          -
+        @endif
+      </td>
+      <td align="center">{{ $user->flights }}</td>
+      <td align="center">{{ \App\Facades\Utils::minutesToTimeString($user->flight_time) }}</td>
+    </tr>
+  @endforeach
+  </tbody>
 </table>
diff --git a/resources/views/layouts/default/widgets/airspace_map.blade.php b/resources/views/layouts/default/widgets/airspace_map.blade.php
index 563925ba..7a62d557 100644
--- a/resources/views/layouts/default/widgets/airspace_map.blade.php
+++ b/resources/views/layouts/default/widgets/airspace_map.blade.php
@@ -1,11 +1,11 @@
 <div id="map" style="width: {{ $config['width'] }}; height: {{ $config['height'] }}"></div>
 
 @section('scripts')
-<script>
-phpvms.map.render_airspace_map({
-    lat: "{{$config['lat']}}",
-    lon: "{{$config['lon']}}",
-    metar_wms: {!! json_encode(config('map.metar_wms')) !!},
-});
-</script>
+  <script>
+    phpvms.map.render_airspace_map({
+      lat: "{{$config['lat']}}",
+      lon: "{{$config['lon']}}",
+      metar_wms: {!! json_encode(config('map.metar_wms')) !!},
+    });
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/widgets/latest_news.blade.php b/resources/views/layouts/default/widgets/latest_news.blade.php
index 75c4168e..b97fe0c4 100644
--- a/resources/views/layouts/default/widgets/latest_news.blade.php
+++ b/resources/views/layouts/default/widgets/latest_news.blade.php
@@ -1,20 +1,20 @@
 <div class="nav nav-tabs" role="tablist" style="background: #067ec1; color: #FFF;">
-    @lang('widgets.latestnews.news')
+  @lang('widgets.latestnews.news')
 </div>
 <div class="card border-blue-bottom">
-    <div class="card-body" style="min-height: 0px">
-        @if($news->count() === 0)
-            <div class="text-center text-muted" style="padding: 30px;">
-                @lang('widgets.latestnews.nonewsfound')
-            </div>
-        @endif
+  <div class="card-body" style="min-height: 0px">
+    @if($news->count() === 0)
+      <div class="text-center text-muted" style="padding: 30px;">
+        @lang('widgets.latestnews.nonewsfound')
+      </div>
+    @endif
 
-        @foreach($news as $item)
-            <h4 style="margin-top: 0px;">{{ $item->subject }}</h4>
-            <p class="category">{{ $item->user->name }}
-                - {{ show_datetime($item->created_at) }}</p>
+    @foreach($news as $item)
+      <h4 style="margin-top: 0px;">{{ $item->subject }}</h4>
+      <p class="category">{{ $item->user->name }}
+        - {{ show_datetime($item->created_at) }}</p>
 
-            {{ $item->body }}
-        @endforeach
-    </div>
+      {{ $item->body }}
+    @endforeach
+  </div>
 </div>
diff --git a/resources/views/layouts/default/widgets/latest_pilots.blade.php b/resources/views/layouts/default/widgets/latest_pilots.blade.php
index 4ea5bdd4..16e6e434 100644
--- a/resources/views/layouts/default/widgets/latest_pilots.blade.php
+++ b/resources/views/layouts/default/widgets/latest_pilots.blade.php
@@ -1,10 +1,10 @@
 <table>
-    @foreach($users as $u)
-        <tr>
-            <td style="padding-right: 10px;">
-                <span class="title">{{ $u->ident }}</span>
-            </td>
-            <td>{{ $u->name }}</td>
-        </tr>
-    @endforeach
+  @foreach($users as $u)
+    <tr>
+      <td style="padding-right: 10px;">
+        <span class="title">{{ $u->ident }}</span>
+      </td>
+      <td>{{ $u->name }}</td>
+    </tr>
+  @endforeach
 </table>
diff --git a/resources/views/layouts/default/widgets/live_map.blade.php b/resources/views/layouts/default/widgets/live_map.blade.php
index f0e93ecd..c1c5c342 100644
--- a/resources/views/layouts/default/widgets/live_map.blade.php
+++ b/resources/views/layouts/default/widgets/live_map.blade.php
@@ -1,67 +1,67 @@
 <div class="row">
-    <div class="col-md-12">
-        <div class="box-body">
+  <div class="col-md-12">
+    <div class="box-body">
 
-            {{--
-            This map uses rivets.js to fill in the updates from the livemap
-            So the single brackets are used by rivets to fill in the values
-            And then the rv-* attributes are data-binds that will automatically
-            update whenever the base model behind it updates:
+      {{--
+      This map uses rivets.js to fill in the updates from the livemap
+      So the single brackets are used by rivets to fill in the values
+      And then the rv-* attributes are data-binds that will automatically
+      update whenever the base model behind it updates:
 
-                http://rivetsjs.com/docs/guide
+          http://rivetsjs.com/docs/guide
 
-            Look in resources/js/maps/live_map.js to see where the actual binding
-            and update() call is made
-            --}}
-            <div id="map" style="width: {{ $config['width'] }}; height: {{ $config['height'] }}">
+      Look in resources/js/maps/live_map.js to see where the actual binding
+      and update() call is made
+      --}}
+      <div id="map" style="width: {{ $config['width'] }}; height: {{ $config['height'] }}">
 
-                {{--
-                This is the bottom bar that appears when you click on a flight in the map.
-                You can show any data you want - use a JS debugger to see the value of "pirep",
-                or look up the API documentation for the /api/pirep/{id}/acars call
+        {{--
+        This is the bottom bar that appears when you click on a flight in the map.
+        You can show any data you want - use a JS debugger to see the value of "pirep",
+        or look up the API documentation for the /api/pirep/{id}/acars call
 
-                It's basically any of the fields from the database and pirep.position.X is any
-                column from the ACARS table - holds the latest position.
+        It's basically any of the fields from the database and pirep.position.X is any
+        column from the ACARS table - holds the latest position.
 
-                Again, this is updated automatically via the rivets.js bindings, so be mindful
-                when you're editing the { } - single brackets == rivets, double brackets == laravel
+        Again, this is updated automatically via the rivets.js bindings, so be mindful
+        when you're editing the { } - single brackets == rivets, double brackets == laravel
 
-                A couple of places (like the distance) use both to output the correct bindings.
-                --}}
-                <div id="map-info-box" class="map-info-box"
-                     rv-show="pirep"
-                     style="width: {{ $config['width'] }};">
-                    <div style="float: left; width: 50%;">
-                        <h3 style="margin: 0" id="map_flight_id">
-                            <a rv-href="pirep.id | prepend '{{url('/pireps/')}}/'" target="_blank">
-                                { pirep.airline.icao }{ pirep.flight_number }
-                            </a>
-                        </h3>
-                        <p id="map_flight_info">
-                            { pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) @lang('common.to')
-                            { pirep.arr_airport.name } ({ pirep.arr_airport.icao })
-                        </p>
-                    </div>
-                    <div style="float: right; margin-left: 30px; margin-right: 30px;">
-                        <p id="map_flight_stats_right">
-                            @lang('widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
-                            @lang('widgets.livemap.altitude'): <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
-                            @lang('widgets.livemap.heading'): <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
-                        </p>
-                    </div>
-                    <div style="float: right; margin-left: 30px;">
-                        <p id="map_flight_stats_middle">
-                            @lang('common.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br />
-                            @lang('flights.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br />
-                            @lang('common.distance'): <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
-                                / <span style="font-weight: bold">
+        A couple of places (like the distance) use both to output the correct bindings.
+        --}}
+        <div id="map-info-box" class="map-info-box"
+             rv-show="pirep"
+             style="width: {{ $config['width'] }};">
+          <div style="float: left; width: 50%;">
+            <h3 style="margin: 0" id="map_flight_id">
+              <a rv-href="pirep.id | prepend '{{url('/pireps/')}}/'" target="_blank">
+                { pirep.airline.icao }{ pirep.flight_number }
+              </a>
+            </h3>
+            <p id="map_flight_info">
+              { pirep.dpt_airport.name } ({ pirep.dpt_airport.icao }) @lang('common.to')
+              { pirep.arr_airport.name } ({ pirep.arr_airport.icao })
+            </p>
+          </div>
+          <div style="float: right; margin-left: 30px; margin-right: 30px;">
+            <p id="map_flight_stats_right">
+              @lang('widgets.livemap.groundspeed'): <span style="font-weight: bold">{ pirep.position.gs }</span><br/>
+              @lang('widgets.livemap.altitude'): <span style="font-weight: bold">{ pirep.position.altitude }</span><br/>
+              @lang('widgets.livemap.heading'): <span style="font-weight: bold">{ pirep.position.heading }</span><br/>
+            </p>
+          </div>
+          <div style="float: right; margin-left: 30px;">
+            <p id="map_flight_stats_middle">
+              @lang('common.status'): <span style="font-weight: bold">{ pirep.status_text }</span><br/>
+              @lang('flights.flighttime'): <span style="font-weight: bold">{ pirep.flight_time | time_hm }</span><br/>
+              @lang('common.distance'): <span style="font-weight: bold">{ pirep.position.distance.{{setting('units.distance')}} }</span>
+              / <span style="font-weight: bold">
                                         { pirep.planned_distance.{{setting('units.distance')}} }</span>
-                        </p>
-                    </div>
-                </div>
-            </div>
+            </p>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 <div class="clearfix" style="padding-top: 25px"></div>
@@ -74,47 +74,47 @@ Same note applies from above about the data from the PIREP API being available
 and being mindful of the rivets bindings
 --}}
 <div id="live_flights" class="row">
-    <div class="col-md-12">
-        <div rv-hide="has_data" class="jumbotron text-center">@lang('widgets.livemap.noflights')</div>
-        <table rv-show="has_data" id="live_flights_table" class="table table-striped">
-            <thead>
-                <tr class="text-small header">
-                    <td class="text-small">{{ trans_choice('common.flight', 2) }}</td>
-                    <td class="text-small">@lang('common.departure')</td>
-                    <td class="text-small">@lang('common.arrival')</td>
-                    <td class="text-small">@lang('common.aircraft')</td>
-                    <td class="text-small">@lang('widgets.livemap.altitude')</td>
-                    <td class="text-small">@lang('widgets.livemap.gs')</td>
-                    <td class="text-small">@lang('widgets.livemap.distance')</td>
-                    <td class="text-small">@lang('common.status')</td>
-                </tr>
-            </thead>
-            <tbody>
-                <tr rv-each-pirep="pireps">
-                    <td><a href="#top_anchor" rv-on-click="controller.focusMarker">{ pirep.airline.icao }{ pirep.ident}</a> </td>
-                    {{-- Show the full airport name on hover --}}
-                    <td><span rv-title="pirep.dpt_airport.name">{ pirep.dpt_airport.icao }</span></td>
-                    <td><span rv-title="pirep.arr_airport.name">{ pirep.arr_airport.icao }</span></td>
-                    <td>{ pirep.aircraft.name }</td>
-                    <td>{ pirep.position.altitude }</td>
-                    <td>{ pirep.position.gs }</td>
-                    <td>{ pirep.position.distance.{{setting('units.distance')}} | fallback 0 } /
-                        { pirep.planned_distance.{{setting('units.distance')}} | fallback 0 }
-                    </td>
-                    <td>{ pirep.status_text }</td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
+  <div class="col-md-12">
+    <div rv-hide="has_data" class="jumbotron text-center">@lang('widgets.livemap.noflights')</div>
+    <table rv-show="has_data" id="live_flights_table" class="table table-striped">
+      <thead>
+      <tr class="text-small header">
+        <td class="text-small">{{ trans_choice('common.flight', 2) }}</td>
+        <td class="text-small">@lang('common.departure')</td>
+        <td class="text-small">@lang('common.arrival')</td>
+        <td class="text-small">@lang('common.aircraft')</td>
+        <td class="text-small">@lang('widgets.livemap.altitude')</td>
+        <td class="text-small">@lang('widgets.livemap.gs')</td>
+        <td class="text-small">@lang('widgets.livemap.distance')</td>
+        <td class="text-small">@lang('common.status')</td>
+      </tr>
+      </thead>
+      <tbody>
+      <tr rv-each-pirep="pireps">
+        <td><a href="#top_anchor" rv-on-click="controller.focusMarker">{ pirep.airline.icao }{ pirep.ident}</a></td>
+        {{-- Show the full airport name on hover --}}
+        <td><span rv-title="pirep.dpt_airport.name">{ pirep.dpt_airport.icao }</span></td>
+        <td><span rv-title="pirep.arr_airport.name">{ pirep.arr_airport.icao }</span></td>
+        <td>{ pirep.aircraft.name }</td>
+        <td>{ pirep.position.altitude }</td>
+        <td>{ pirep.position.gs }</td>
+        <td>{ pirep.position.distance.{{setting('units.distance')}} | fallback 0 } /
+          { pirep.planned_distance.{{setting('units.distance')}} | fallback 0 }
+        </td>
+        <td>{ pirep.status_text }</td>
+      </tr>
+      </tbody>
+    </table>
+  </div>
 </div>
 
 @section('scripts')
-<script>
-phpvms.map.render_live_map({
-    center: ['{{ $center[0] }}', '{{ $center[1] }}'],
-    zoom: '{{ $zoom }}',
-    aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
-    units: '{{ setting('units.distance') }}',
-});
-</script>
+  <script>
+    phpvms.map.render_live_map({
+      center: ['{{ $center[0] }}', '{{ $center[1] }}'],
+      zoom: '{{ $zoom }}',
+      aircraft_icon: '{!! public_asset('/assets/img/acars/aircraft.png') !!}',
+      units: '{{ setting('units.distance') }}',
+    });
+  </script>
 @endsection
diff --git a/resources/views/layouts/default/widgets/weather.blade.php b/resources/views/layouts/default/widgets/weather.blade.php
index 5ef12fa9..92ee46f8 100644
--- a/resources/views/layouts/default/widgets/weather.blade.php
+++ b/resources/views/layouts/default/widgets/weather.blade.php
@@ -5,76 +5,76 @@ https://api.checkwx.com/#metar-decoded
 
 --}}
 @if(!$metar)
-    <p>@lang('widgets.weather.nometar')</p>
+  <p>@lang('widgets.weather.nometar')</p>
 @else
-    <table class="table table-striped">
-        <tr>
-            <td>@lang('widgets.weather.conditions')</td>
-            <td>
-                {{ $metar['category'] }}
-                {{ $metar['temperature'][$unit_temp] }}
-                °{{strtoupper($unit_temp)}}
-                @if($metar['visibility'])
-                , @lang('widgets.weather.visibility') {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
-                @endif
-                @if($metar['humidity'])
-                    , {{ $metar['humidity'] }}% @lang('widgets.weather.humidity')
-                @endif
-                @if($metar['dew_point'])
-                    , @lang('widgets.weather.dewpoint')
-                    {{ $metar['dew_point'][$unit_temp] }}
-                    °{{strtoupper($unit_temp)}}
-                @endif
-            </td>
-        </tr>
-        <tr>
-            <td>@lang('widgets.weather.barometer')</td>
-            <td>
-                {{ number_format($metar['barometer']['hPa'], 2) }} hPa
-                / {{ number_format($metar['barometer']['inHg'], 2) }} inHg
-            </td>
-        </tr>
-        @if($metar['clouds'])
-            <tr>
-                <td>@lang('widgets.weather.clouds')</td>
-                <td>
-                    @if($unit_alt === 'ft')
-                        {{$metar['clouds_report_ft']}}
-                    @else
-                        {{ $metar['clouds_report'] }}
-                    @endif
-                </td>
-            </tr>
+  <table class="table table-striped">
+    <tr>
+      <td>@lang('widgets.weather.conditions')</td>
+      <td>
+        {{ $metar['category'] }}
+        {{ $metar['temperature'][$unit_temp] }}
+        °{{strtoupper($unit_temp)}}
+        @if($metar['visibility'])
+          , @lang('widgets.weather.visibility') {{ $metar['visibility'][$unit_dist] }} {{$unit_dist}}
         @endif
-        <tr>
-            <td>@lang('widgets.weather.wind')</td>
-            <td>
-                {{$metar['wind_speed']}} kts @lang('common.from') {{$metar['wind_direction_label']}}
-                ({{$metar['wind_direction']}}°)
-                @if($metar['wind_gust_speed'])
-                    @lang('widgets.weather.guststo') {{ $metar['wind_gust_speed'] }}
-                @endif
-            </td>
-        </tr>
-        <tr>
-            <td>@lang('common.metar')</td>
-            <td>
-                <div style="line-height:1.5em;min-height: 3em;">
-                    {{ $metar['raw'] }}
-                </div>
-            </td>
-        </tr>
-        @if($metar['remarks'])
-            <tr>
-                <td>@lang('widgets.weather.remarks')</td>
-                <td>
-                    {{ $metar['remarks'] }}
-                </td>
-            </tr>
+        @if($metar['humidity'])
+          , {{ $metar['humidity'] }}% @lang('widgets.weather.humidity')
         @endif
-        <tr>
-            <td>@lang('widgets.weather.updated')</td>
-            <td>{{$metar['observed_time']}} ({{$metar['observed_age']}})</td>
-        </tr>
-    </table>
+        @if($metar['dew_point'])
+          , @lang('widgets.weather.dewpoint')
+          {{ $metar['dew_point'][$unit_temp] }}
+          °{{strtoupper($unit_temp)}}
+        @endif
+      </td>
+    </tr>
+    <tr>
+      <td>@lang('widgets.weather.barometer')</td>
+      <td>
+        {{ number_format($metar['barometer']['hPa'], 2) }} hPa
+        / {{ number_format($metar['barometer']['inHg'], 2) }} inHg
+      </td>
+    </tr>
+    @if($metar['clouds'])
+      <tr>
+        <td>@lang('widgets.weather.clouds')</td>
+        <td>
+          @if($unit_alt === 'ft')
+            {{$metar['clouds_report_ft']}}
+          @else
+            {{ $metar['clouds_report'] }}
+          @endif
+        </td>
+      </tr>
+    @endif
+    <tr>
+      <td>@lang('widgets.weather.wind')</td>
+      <td>
+        {{$metar['wind_speed']}} kts @lang('common.from') {{$metar['wind_direction_label']}}
+        ({{$metar['wind_direction']}}°)
+        @if($metar['wind_gust_speed'])
+          @lang('widgets.weather.guststo') {{ $metar['wind_gust_speed'] }}
+        @endif
+      </td>
+    </tr>
+    <tr>
+      <td>@lang('common.metar')</td>
+      <td>
+        <div style="line-height:1.5em;min-height: 3em;">
+          {{ $metar['raw'] }}
+        </div>
+      </td>
+    </tr>
+    @if($metar['remarks'])
+      <tr>
+        <td>@lang('widgets.weather.remarks')</td>
+        <td>
+          {{ $metar['remarks'] }}
+        </td>
+      </tr>
+    @endif
+    <tr>
+      <td>@lang('widgets.weather.updated')</td>
+      <td>{{$metar['observed_time']}} ({{$metar['observed_age']}})</td>
+    </tr>
+  </table>
 @endif
diff --git a/resources/views/notifications/mail/admin/pirep/submitted.blade.php b/resources/views/notifications/mail/admin/pirep/submitted.blade.php
index f9f77f62..7341348f 100644
--- a/resources/views/notifications/mail/admin/pirep/submitted.blade.php
+++ b/resources/views/notifications/mail/admin/pirep/submitted.blade.php
@@ -1,12 +1,12 @@
 @component('mail::message')
-# New PIREP Submitted
+  # New PIREP Submitted
 
-A new PIREP has been submitted by {{ $pirep->user->ident }} {{ $pirep->user->name }}
+  A new PIREP has been submitted by {{ $pirep->user->ident }} {{ $pirep->user->name }}
 
-@component('mail::button', ['url' => route('admin.pireps.edit', [$pirep->id])])
-View PIREP
-@endcomponent
-
-Thanks,<br>
-{{ config('app.name') }}
+  @component('mail::button', ['url' => route('admin.pireps.edit', [$pirep->id])])
+    View PIREP
+  @endcomponent
+
+  Thanks,<br>
+  {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/admin/user/registered.blade.php b/resources/views/notifications/mail/admin/user/registered.blade.php
index c868d063..5872178f 100644
--- a/resources/views/notifications/mail/admin/user/registered.blade.php
+++ b/resources/views/notifications/mail/admin/user/registered.blade.php
@@ -1,9 +1,9 @@
 @component('mail::message')
-A new user has signed up!
+  A new user has signed up!
 
-Name: {{ $user->name }}!
-Email: {{ $user->email }}
-State: {{ UserState::label($user->state) }}
+  Name: {{ $user->name }}!
+  Email: {{ $user->email }}
+  State: {{ UserState::label($user->state) }}
 
-{{ config('app.name') }}
+  {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/news/news.blade.php b/resources/views/notifications/mail/news/news.blade.php
index 51193ce7..ffce5615 100644
--- a/resources/views/notifications/mail/news/news.blade.php
+++ b/resources/views/notifications/mail/news/news.blade.php
@@ -1,12 +1,12 @@
 @component('mail::message')
-# {{ $news->subject }}
+  # {{ $news->subject }}
 
-$news->body
+  $news->body
 
-@component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
-View PIREP
-@endcomponent
-
-Thanks,<br>
-{{ config('app.name') }}
+  @component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
+    View PIREP
+  @endcomponent
+
+  Thanks,<br>
+  {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/pirep/accepted.blade.php b/resources/views/notifications/mail/pirep/accepted.blade.php
index 6e8acc72..68c5551d 100644
--- a/resources/views/notifications/mail/pirep/accepted.blade.php
+++ b/resources/views/notifications/mail/pirep/accepted.blade.php
@@ -1,12 +1,12 @@
 @component('mail::message')
-# PIREP Accepted!
+  # PIREP Accepted!
 
-Your PIREP has been accepted
+  Your PIREP has been accepted
 
-@component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
-View PIREP
-@endcomponent
-
-Thanks,<br>
-{{ config('app.name') }}
+  @component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
+    View PIREP
+  @endcomponent
+
+  Thanks,<br>
+  {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/pirep/rejected.blade.php b/resources/views/notifications/mail/pirep/rejected.blade.php
index a3ddffc3..92d7df1b 100644
--- a/resources/views/notifications/mail/pirep/rejected.blade.php
+++ b/resources/views/notifications/mail/pirep/rejected.blade.php
@@ -1,12 +1,12 @@
 @component('mail::message')
-# PIREP Accepted!
+  # PIREP Accepted!
 
-Your PIREP has been rejected
+  Your PIREP has been rejected
 
-@component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
+  @component('mail::button', ['url' => route('frontend.pireps.show', [$pirep->id])])
     View PIREP
-@endcomponent
+  @endcomponent
 
-Thanks,<br>
-{{ config('app.name') }}
+  Thanks,<br>
+  {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/user/new_login_details.blade.php b/resources/views/notifications/mail/user/new_login_details.blade.php
index ee29fadb..543d4e28 100644
--- a/resources/views/notifications/mail/user/new_login_details.blade.php
+++ b/resources/views/notifications/mail/user/new_login_details.blade.php
@@ -1,17 +1,17 @@
 @component('mail::message')
-Your new login details for {{ config('app.name') }} follow:
+  Your new login details for {{ config('app.name') }} follow:
 
-Do not share this information with anyone else! <br />
-<strong>E-Mail Address:</strong> {{ $user->email }}<br />
-<strong>Temporary Password:</strong> {{ $newpw }}<br /><br />
+  Do not share this information with anyone else! <br/>
+  <strong>E-Mail Address:</strong> {{ $user->email }}<br/>
+  <strong>Temporary Password:</strong> {{ $newpw }}<br/><br/>
 
-Your account is now ready for use.<br />
-Upon first login, please reset your password.
+  Your account is now ready for use.<br/>
+  Upon first login, please reset your password.
 
-@component('mail::button', ['url' => url('/login')])
-Login & Reset Password
-@endcomponent
-
-Thanks,<br />
-Management, {{ config('app.name') }}
+  @component('mail::button', ['url' => url('/login')])
+    Login & Reset Password
+  @endcomponent
+
+  Thanks,<br/>
+  Management, {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/user/pending.blade.php b/resources/views/notifications/mail/user/pending.blade.php
index 9b35b7d1..cd4bc1bf 100644
--- a/resources/views/notifications/mail/user/pending.blade.php
+++ b/resources/views/notifications/mail/user/pending.blade.php
@@ -1,8 +1,8 @@
 @component('mail::message')
-# Thanks for signing up, {{ $user->name }}!
+  # Thanks for signing up, {{ $user->name }}!
 
-You will be notified as soon as your account is approved!
+  You will be notified as soon as your account is approved!
 
-Thanks,<br>
-Management, {{ config('app.name') }}
+  Thanks,<br>
+  Management, {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/user/registered.blade.php b/resources/views/notifications/mail/user/registered.blade.php
index 49d08a81..c39b7c1b 100644
--- a/resources/views/notifications/mail/user/registered.blade.php
+++ b/resources/views/notifications/mail/user/registered.blade.php
@@ -1,12 +1,12 @@
 @component('mail::message')
-# Thanks for signing up, {{ $user->name }}!
+  # Thanks for signing up, {{ $user->name }}!
 
-Your account is ready to use.
+  Your account is ready to use.
 
-@component('mail::button', ['url' => url('/login')])
-Visit your account now!
-@endcomponent
-
-Thanks,<br>
-Management, {{ config('app.name') }}
+  @component('mail::button', ['url' => url('/login')])
+    Visit your account now!
+  @endcomponent
+
+  Thanks,<br>
+  Management, {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/notifications/mail/user/rejected.blade.php b/resources/views/notifications/mail/user/rejected.blade.php
index 8e62ec75..f2c05b3a 100644
--- a/resources/views/notifications/mail/user/rejected.blade.php
+++ b/resources/views/notifications/mail/user/rejected.blade.php
@@ -1,9 +1,9 @@
 @component('mail::message')
-# Hi {{ $user->name }},
+  # Hi {{ $user->name }},
 
-Your registration to our airline was denied. Please contact
-an administrator with any questions you may have.
+  Your registration to our airline was denied. Please contact
+  an administrator with any questions you may have.
 
-Thanks,<br>
-Management, {{ config('app.name') }}
+  Thanks,<br>
+  Management, {{ config('app.name') }}
 @endcomponent
diff --git a/resources/views/system/errors/database_error.blade.php b/resources/views/system/errors/database_error.blade.php
index fa8de3e7..3e2f765c 100644
--- a/resources/views/system/errors/database_error.blade.php
+++ b/resources/views/system/errors/database_error.blade.php
@@ -2,71 +2,71 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
-    <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <title>@yield('title') - installer</title>
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
-    <!--     Fonts and icons     -->
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link rel="stylesheet"
-          href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
-    <!-- CSS Files -->
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
-    {{--<link href="/assets/frontend/css/installer.css" rel="stylesheet"/>--}}
+  <meta charset="utf-8"/>
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
+  <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <title>@yield('title') - installer</title>
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <!--     Fonts and icons     -->
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link rel="stylesheet"
+        href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
+  <!-- CSS Files -->
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  {{--<link href="/assets/frontend/css/installer.css" rel="stylesheet"/>--}}
 
-    <link rel="stylesheet"
-          href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
+  <link rel="stylesheet"
+        href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/styles/default.min.css">
 
-    <style>
-        .table tr:first-child td {
-            border-top: 0px;
-        }
-    </style>
-    @yield('css')
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+  </style>
+  @yield('css')
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
-                    data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
-                    aria-label="Toggle navigation">
-                <span class="navbar-toggler-bar bar1"></span>
-                <span class="navbar-toggler-bar bar2"></span>
-                <span class="navbar-toggler-bar bar3"></span>
-            </button>
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/frontend/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation"
-             style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
+              data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
+              aria-label="Toggle navigation">
+        <span class="navbar-toggler-bar bar1"></span>
+        <span class="navbar-toggler-bar bar2"></span>
+        <span class="navbar-toggler-bar bar3"></span>
+      </button>
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/frontend/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation"
+         style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 {{--<div class="clearfix" style="height: 25px;"></div>--}}
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                <h2>Database Error</h2>
-                {{ $error }}
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        <h2>Database Error</h2>
+        {{ $error }}
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 @yield('scripts')
diff --git a/resources/views/system/errors/not_installed.blade.php b/resources/views/system/errors/not_installed.blade.php
index 5b9cac7f..78bdf97d 100644
--- a/resources/views/system/errors/not_installed.blade.php
+++ b/resources/views/system/errors/not_installed.blade.php
@@ -2,71 +2,71 @@
 <html lang="en">
 
 <head>
-    <meta charset="utf-8"/>
-    <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
-    <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
-    <title>welcome to phpvms</title>
-    <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
-          name='viewport'/>
-    <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
-    <link rel="stylesheet"
-          href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
-    <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
-    <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
+  <meta charset="utf-8"/>
+  <link rel="apple-touch-icon" sizes="76x76" href="/assets/frontend/img/apple-icon.png">
+  <link rel="icon" type="image/png" href="/assets/frontend/img/favicon.png">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+  <title>welcome to phpvms</title>
+  <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no'
+        name='viewport'/>
+  <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700,200" rel="stylesheet"/>
+  <link rel="stylesheet"
+        href="https://maxcdn.bootstrapcdn.com/font-awesome/latest/css/font-awesome.min.css"/>
+  <link href="{{ public_asset('/assets/frontend/css/bootstrap.min.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/now-ui-kit.css') }}" rel="stylesheet"/>
+  <link href="{{ public_asset('/assets/frontend/css/styles.css') }}" rel="stylesheet"/>
 
-    <style>
-        .table tr:first-child td {
-            border-top: 0px;
-        }
-    </style>
-    @yield('css')
+  <style>
+    .table tr:first-child td {
+      border-top: 0px;
+    }
+  </style>
+  @yield('css')
 </head>
 
 <body>
 <!-- Navbar -->
 <nav class="navbar navbar-toggleable-md" style="background: #067ec1;">
-    <div class="container" style="width: 85%!important;">
-        <div class="navbar-translate">
-            <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
-                    data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
-                    aria-label="Toggle navigation">
-                <span class="navbar-toggler-bar bar1"></span>
-                <span class="navbar-toggler-bar bar2"></span>
-                <span class="navbar-toggler-bar bar3"></span>
-            </button>
-            <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
-                <a href="{{ url('/') }}">
-                    <img src="{{ public_asset('/assets/frontend/img/logo_blue_bg.svg') }}" width="135px" style=""/>
-                </a>
-            </p>
-        </div>
-        <div class="justify-content-center" id="navigation"
-             style="margin-left: 50px; color: white; font-size: 20px;">
-            @yield('title')
-        </div>
+  <div class="container" style="width: 85%!important;">
+    <div class="navbar-translate">
+      <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse"
+              data-target="#navigation" aria-controls="navigation-index" aria-expanded="false"
+              aria-label="Toggle navigation">
+        <span class="navbar-toggler-bar bar1"></span>
+        <span class="navbar-toggler-bar bar2"></span>
+        <span class="navbar-toggler-bar bar3"></span>
+      </button>
+      <p class="navbar-brand text-white" data-placement="bottom" target="_blank">
+        <a href="{{ url('/') }}">
+          <img src="{{ public_asset('/assets/frontend/img/logo_blue_bg.svg') }}" width="135px" style=""/>
+        </a>
+      </p>
     </div>
+    <div class="justify-content-center" id="navigation"
+         style="margin-left: 50px; color: white; font-size: 20px;">
+      @yield('title')
+    </div>
+  </div>
 </nav>
 <!-- End Navbar -->
 <div class="clearfix" style="height: 25px;"></div>
 <div class="wrapper">
-    <div class="clear"></div>
-    <div class="container" style="width: 50%">
-        <div class="row">
-            <div class="col-12">
-                <h1>phpVMS Not Installed</h1>
-                <br />
-                <br />
-                <br />
-                <p style="text-align: right; font-size: 22px;">
-                    <a href="{{ public_url('/install') }}" class="btn btn-success">Head on to the installer ></a>
-                </p>
-                @yield('content')
-            </div>
-        </div>
+  <div class="clear"></div>
+  <div class="container" style="width: 50%">
+    <div class="row">
+      <div class="col-12">
+        <h1>phpVMS Not Installed</h1>
+        <br/>
+        <br/>
+        <br/>
+        <p style="text-align: right; font-size: 22px;">
+          <a href="{{ public_url('/install') }}" class="btn btn-success">Head on to the installer ></a>
+        </p>
+        @yield('content')
+      </div>
     </div>
-    <div class="clearfix" style="height: 200px;"></div>
+  </div>
+  <div class="clearfix" style="height: 200px;"></div>
 </div>
 
 @yield('scripts')
diff --git a/resources/views/vendor/datatables/print.blade.php b/resources/views/vendor/datatables/print.blade.php
index 3a5cffe5..534966ed 100644
--- a/resources/views/vendor/datatables/print.blade.php
+++ b/resources/views/vendor/datatables/print.blade.php
@@ -1,37 +1,39 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
-        <title>Print Table</title>
-        <meta charset="UTF-8">
-        <meta name=description content="">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <!-- Bootstrap CSS -->
-        <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
-        <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
-        <style>
-            body {margin: 20px}
-        </style>
-    </head>
-    <body>
-        <table class="table table-bordered table-condensed table-striped">
-            @foreach($data as $row)
-                @if ($row == reset($data))
-                    <tr>
-                        @foreach($row as $key => $value)
-                            <th>{{ $key }}</th>
-                        @endforeach
-                    </tr>
-                @endif
-                <tr>
-                    @foreach($row as $key => $value)
-                        @if(is_string($value) || is_numeric($value))
-                            <td>{{ $value }}</td>
-                        @else
-                            <td></td>
-                        @endif
-                    @endforeach
-                </tr>
-            @endforeach
-        </table>
-    </body>
+<head>
+  <title>Print Table</title>
+  <meta charset="UTF-8">
+  <meta name=description content="">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <!-- Bootstrap CSS -->
+  <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css" rel="stylesheet">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
+  <style>
+    body {
+      margin: 20px
+    }
+  </style>
+</head>
+<body>
+<table class="table table-bordered table-condensed table-striped">
+  @foreach($data as $row)
+    @if ($row == reset($data))
+      <tr>
+        @foreach($row as $key => $value)
+          <th>{{ $key }}</th>
+        @endforeach
+      </tr>
+    @endif
+    <tr>
+      @foreach($row as $key => $value)
+        @if(is_string($value) || is_numeric($value))
+          <td>{{ $value }}</td>
+        @else
+          <td></td>
+        @endif
+      @endforeach
+    </tr>
+  @endforeach
+</table>
+</body>
 </html>
diff --git a/resources/views/vendor/mail/html/button.blade.php b/resources/views/vendor/mail/html/button.blade.php
index c7aae1b8..1fe24ee9 100644
--- a/resources/views/vendor/mail/html/button.blade.php
+++ b/resources/views/vendor/mail/html/button.blade.php
@@ -1,19 +1,19 @@
 <table class="action" align="center" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-        <td align="center">
-            <table width="100%" border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td align="center">
-                        <table border="0" cellpadding="0" cellspacing="0">
-                            <tr>
-                                <td>
-                                    <a href="{{ $url }}" class="button button-{{ $color or 'blue' }}" target="_blank">{{ $slot }}</a>
-                                </td>
-                            </tr>
-                        </table>
-                    </td>
-                </tr>
+  <tr>
+    <td align="center">
+      <table width="100%" border="0" cellpadding="0" cellspacing="0">
+        <tr>
+          <td align="center">
+            <table border="0" cellpadding="0" cellspacing="0">
+              <tr>
+                <td>
+                  <a href="{{ $url }}" class="button button-{{ $color or 'blue' }}" target="_blank">{{ $slot }}</a>
+                </td>
+              </tr>
             </table>
-        </td>
-    </tr>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
diff --git a/resources/views/vendor/mail/html/footer.blade.php b/resources/views/vendor/mail/html/footer.blade.php
index c3f9360a..cd259cee 100644
--- a/resources/views/vendor/mail/html/footer.blade.php
+++ b/resources/views/vendor/mail/html/footer.blade.php
@@ -1,11 +1,11 @@
 <tr>
-    <td>
-        <table class="footer" align="center" width="570" cellpadding="0" cellspacing="0">
-            <tr>
-                <td class="content-cell" align="center">
-                    {{ Illuminate\Mail\Markdown::parse($slot) }}
-                </td>
-            </tr>
-        </table>
-    </td>
+  <td>
+    <table class="footer" align="center" width="570" cellpadding="0" cellspacing="0">
+      <tr>
+        <td class="content-cell" align="center">
+          {{ Illuminate\Mail\Markdown::parse($slot) }}
+        </td>
+      </tr>
+    </table>
+  </td>
 </tr>
diff --git a/resources/views/vendor/mail/html/header.blade.php b/resources/views/vendor/mail/html/header.blade.php
index eefabab9..2e13a218 100644
--- a/resources/views/vendor/mail/html/header.blade.php
+++ b/resources/views/vendor/mail/html/header.blade.php
@@ -1,7 +1,7 @@
 <tr>
-    <td class="header">
-        <a href="{{ $url }}">
-            {{ $slot }}
-        </a>
-    </td>
+  <td class="header">
+    <a href="{{ $url }}">
+      {{ $slot }}
+    </a>
+  </td>
 </tr>
diff --git a/resources/views/vendor/mail/html/layout.blade.php b/resources/views/vendor/mail/html/layout.blade.php
index 991ae52a..4eeef751 100644
--- a/resources/views/vendor/mail/html/layout.blade.php
+++ b/resources/views/vendor/mail/html/layout.blade.php
@@ -1,54 +1,55 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
 </head>
 <body>
-    <style>
-        @media only screen and (max-width: 600px) {
-            .inner-body {
-                width: 100% !important;
-            }
+<style>
+  @media only screen and (max-width: 600px) {
+    .inner-body {
+      width: 100% !important;
+    }
 
-            .footer {
-                width: 100% !important;
-            }
-        }
+    .footer {
+      width: 100% !important;
+    }
+  }
 
-        @media only screen and (max-width: 500px) {
-            .button {
-                width: 100% !important;
-            }
-        }
-    </style>
+  @media only screen and (max-width: 500px) {
+    .button {
+      width: 100% !important;
+    }
+  }
+</style>
 
-    <table class="wrapper" width="100%" cellpadding="0" cellspacing="0">
+<table class="wrapper" width="100%" cellpadding="0" cellspacing="0">
+  <tr>
+    <td align="center">
+      <table class="content" width="100%" cellpadding="0" cellspacing="0">
+      {{ $header or '' }}
+
+      <!-- Email Body -->
         <tr>
-            <td align="center">
-                <table class="content" width="100%" cellpadding="0" cellspacing="0">
-                    {{ $header or '' }}
+          <td class="body" width="100%" cellpadding="0" cellspacing="0">
+            <table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0">
+              <!-- Body content -->
+              <tr>
+                <td class="content-cell">
+                  {{ Illuminate\Mail\Markdown::parse($slot) }}
 
-                    <!-- Email Body -->
-                    <tr>
-                        <td class="body" width="100%" cellpadding="0" cellspacing="0">
-                            <table class="inner-body" align="center" width="570" cellpadding="0" cellspacing="0">
-                                <!-- Body content -->
-                                <tr>
-                                    <td class="content-cell">
-                                        {{ Illuminate\Mail\Markdown::parse($slot) }}
-
-                                        {{ $subcopy or '' }}
-                                    </td>
-                                </tr>
-                            </table>
-                        </td>
-                    </tr>
-
-                    {{ $footer or '' }}
-                </table>
-            </td>
+                  {{ $subcopy or '' }}
+                </td>
+              </tr>
+            </table>
+          </td>
         </tr>
-    </table>
+
+        {{ $footer or '' }}
+      </table>
+    </td>
+  </tr>
+</table>
 </body>
 </html>
diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
index 2ad23a66..9d66a6b9 100644
--- a/resources/views/vendor/mail/html/message.blade.php
+++ b/resources/views/vendor/mail/html/message.blade.php
@@ -1,27 +1,27 @@
 @component('mail::layout')
-    {{-- Header --}}
-    @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
-        @endcomponent
-    @endslot
-
-    {{-- Body --}}
-    {{ $slot }}
-
-    {{-- Subcopy --}}
-    @isset($subcopy)
-        @slot('subcopy')
-            @component('mail::subcopy')
-                {{ $subcopy }}
-            @endcomponent
-        @endslot
-    @endisset
-
-    {{-- Footer --}}
-    @slot('footer')
-        @component('mail::footer')
-            &copy; {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
-        @endcomponent
-    @endslot
+{{-- Header --}}
+@slot('header')
+@component('mail::header', ['url' => config('app.url')])
+{{ config('app.name') }}
+@endcomponent
+@endslot
+
+{{-- Body --}}
+{{ $slot }}
+
+{{-- Subcopy --}}
+@isset($subcopy)
+@slot('subcopy')
+@component('mail::subcopy')
+{{ $subcopy }}
+@endcomponent
+@endslot
+@endisset
+
+{{-- Footer --}}
+@slot('footer')
+@component('mail::footer')
+&copy; {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+@endcomponent
+@endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/html/panel.blade.php b/resources/views/vendor/mail/html/panel.blade.php
index f3970802..e6f597b4 100644
--- a/resources/views/vendor/mail/html/panel.blade.php
+++ b/resources/views/vendor/mail/html/panel.blade.php
@@ -1,13 +1,13 @@
 <table class="panel" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-        <td class="panel-content">
-            <table width="100%" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td class="panel-item">
-                        {{ Illuminate\Mail\Markdown::parse($slot) }}
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
+  <tr>
+    <td class="panel-content">
+      <table width="100%" cellpadding="0" cellspacing="0">
+        <tr>
+          <td class="panel-item">
+            {{ Illuminate\Mail\Markdown::parse($slot) }}
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
diff --git a/resources/views/vendor/mail/html/promotion.blade.php b/resources/views/vendor/mail/html/promotion.blade.php
index 0debcf8a..04111b3d 100644
--- a/resources/views/vendor/mail/html/promotion.blade.php
+++ b/resources/views/vendor/mail/html/promotion.blade.php
@@ -1,7 +1,7 @@
 <table class="promotion" align="center" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-        <td align="center">
-            {{ Illuminate\Mail\Markdown::parse($slot) }}
-        </td>
-    </tr>
+  <tr>
+    <td align="center">
+      {{ Illuminate\Mail\Markdown::parse($slot) }}
+    </td>
+  </tr>
 </table>
diff --git a/resources/views/vendor/mail/html/promotion/button.blade.php b/resources/views/vendor/mail/html/promotion/button.blade.php
index 8e79081c..4fa43029 100644
--- a/resources/views/vendor/mail/html/promotion/button.blade.php
+++ b/resources/views/vendor/mail/html/promotion/button.blade.php
@@ -1,13 +1,13 @@
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
-    <tr>
-        <td align="center">
-            <table border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                    <td>
-                        <a href="{{ $url }}" class="button button-green" target="_blank">{{ $slot }}</a>
-                    </td>
-                </tr>
-            </table>
-        </td>
-    </tr>
+  <tr>
+    <td align="center">
+      <table border="0" cellpadding="0" cellspacing="0">
+        <tr>
+          <td>
+            <a href="{{ $url }}" class="button button-green" target="_blank">{{ $slot }}</a>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
diff --git a/resources/views/vendor/mail/html/subcopy.blade.php b/resources/views/vendor/mail/html/subcopy.blade.php
index c3df7b4c..ce76352d 100644
--- a/resources/views/vendor/mail/html/subcopy.blade.php
+++ b/resources/views/vendor/mail/html/subcopy.blade.php
@@ -1,7 +1,7 @@
 <table class="subcopy" width="100%" cellpadding="0" cellspacing="0">
-    <tr>
-        <td>
-            {{ Illuminate\Mail\Markdown::parse($slot) }}
-        </td>
-    </tr>
+  <tr>
+    <td>
+      {{ Illuminate\Mail\Markdown::parse($slot) }}
+    </td>
+  </tr>
 </table>
diff --git a/resources/views/vendor/mail/html/table.blade.php b/resources/views/vendor/mail/html/table.blade.php
index a5f3348b..8d2f6fe6 100644
--- a/resources/views/vendor/mail/html/table.blade.php
+++ b/resources/views/vendor/mail/html/table.blade.php
@@ -1,3 +1,3 @@
 <div class="table">
-{{ Illuminate\Mail\Markdown::parse($slot) }}
+  {{ Illuminate\Mail\Markdown::parse($slot) }}
 </div>
diff --git a/resources/views/vendor/mail/markdown/layout.blade.php b/resources/views/vendor/mail/markdown/layout.blade.php
index f42a90e0..601d7621 100644
--- a/resources/views/vendor/mail/markdown/layout.blade.php
+++ b/resources/views/vendor/mail/markdown/layout.blade.php
@@ -3,7 +3,7 @@
 {{ strip_tags($slot) }}
 @isset($subcopy)
 
-{{ strip_tags($subcopy) }}
+  {{ strip_tags($subcopy) }}
 @endisset
 
 {{ strip_tags($footer) }}
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
index b409c71c..90b2383c 100644
--- a/resources/views/vendor/mail/markdown/message.blade.php
+++ b/resources/views/vendor/mail/markdown/message.blade.php
@@ -1,27 +1,27 @@
 @component('mail::layout')
-    {{-- Header --}}
-    @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
-        @endcomponent
+  {{-- Header --}}
+  @slot('header')
+    @component('mail::header', ['url' => config('app.url')])
+      {{ config('app.name') }}
+    @endcomponent
+  @endslot
+
+  {{-- Body --}}
+  {{ $slot }}
+
+  {{-- Subcopy --}}
+  @isset($subcopy)
+    @slot('subcopy')
+      @component('mail::subcopy')
+        {{ $subcopy }}
+      @endcomponent
     @endslot
+  @endisset
 
-    {{-- Body --}}
-    {{ $slot }}
-
-    {{-- Subcopy --}}
-    @isset($subcopy)
-        @slot('subcopy')
-            @component('mail::subcopy')
-                {{ $subcopy }}
-            @endcomponent
-        @endslot
-    @endisset
-
-    {{-- Footer --}}
-    @slot('footer')
-        @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
-        @endcomponent
-    @endslot
+  {{-- Footer --}}
+  @slot('footer')
+    @component('mail::footer')
+      © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+    @endcomponent
+  @endslot
 @endcomponent