Fixed merge

2018-03-26 09:35:01 -05:00
parent 46e956475a 5ecfc2d437
commit 99142f9fec
38 changed files with 608 additions and 1839 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,7 @@ services:

 before_script:
  - cp .travis/env.travis.php env.php
-  - composer install --no-interaction --verbose
+  - composer install --dev --no-interaction --verbose

 script:
 - php artisan database:create --reset
--- a/.travis/deploy_script.sh
+++ b/.travis/deploy_script.sh
@@ -4,6 +4,10 @@ if [ "$TRAVIS" = "true" ]; then

    cd $TRAVIS_BUILD_DIR

+    # Clean up the dependencies to only remove the dev packages
+    rm -rf vendor
+    composer install --no-interaction --no-dev
+
    if test "$TRAVIS_TAG"; then
        PKG_NAME=$TRAVIS_TAG
    else
--- a/app/Console/Commands/ComposerCommand.php
+++ b/app/Console/Commands/ComposerCommand.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Console\Command;
+use Artisan;
+
+/**
+ * Class ComposerCommand
+ * @package App\Console\Commands
+ */
+class ComposerCommand extends Command
+{
+    protected $signature = 'phpvms:composer {cmd}';
+    protected $description = 'Composer related tasks';
+
+    /**
+     * Run composer update related commands
+     */
+    public function handle()
+    {
+        switch(trim($this->argument('cmd')))
+        {
+            case 'post-update':
+                $this->postUpdate();
+                break;
+            default:
+                $this->error('Command exists');
+        }
+    }
+
+    /**
+     * Any composer post update tasks
+     */
+    protected function postUpdate(): void
+    {
+        if (config('app.env') === 'dev') {
+            if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
+                Artisan::call('ide-helper:generate');
+                Artisan::call('ide-helper:meta');
+            }
+        }
+    }
+}
--- a/app/Console/Commands/DevCommands.php
+++ b/app/Console/Commands/DevCommands.php
@@ -8,6 +8,7 @@ use App\Models\Airline;
 use App\Models\Pirep;
 use App\Models\User;
 use App\Services\AwardService;
+use Artisan;
 use DB;
 use PDO;
 use Symfony\Component\Yaml\Yaml;
--- a/app/Console/Commands/Install.php
+++ b/app/Console/Commands/Install.php
@@ -1,84 +0,0 @@
-<?php
-
-namespace App\Console\Commands;
-
-use App\Console\Command;
-
-/**
- * Class Install
- * @package App\Console\Commands
- */
-class Install extends Command
-{
-    protected $signature = 'phpvms:install 
-                                {--update}
-                                {--airline-name?} 
-                                {--airline-code?}';
-
-    protected $description = 'Install or update phpVMS';
-
-    /**
-     * Install constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-    }
-
-    /**
-     * @return mixed|void
-     */
-    public function handle()
-    {
-        $this->info('Installing phpVMS...');
-
-        $this->setupDatabase();
-
-        # Only run these if we're doing an initial install
-        if (!$this->option('update')) {
-            $this->writeLocalConfig();
-            $this->initialData();
-        }
-    }
-
-    /**
-     * Setup the database and run the migrations
-     * Only call the database creation if we're not
-     * explicitly trying to upgrade
-     */
-    protected function setupDatabase()
-    {
-        if (!$this->option('update')) {
-            $this->call('database:create');
-        }
-
-        $this->info('Running database migrations...');
-        $this->call('migrate');
-        # TODO: Call initial seed data, for the groups and other supporting data
-    }
-
-    /**
-     * Write a local config file
-     */
-    protected function writeLocalConfig(): void
-    {
-    }
-
-    /**
-     * Set an initial airline and admin user/password
-     */
-    protected function initialData()
-    {
-        # TODO: Prompt for initial airline info
-        $airline_name = $this->option('airline-name');
-        if (!$airline_name) {
-            $airline_name = $this->ask('Enter your airline name');
-        }
-
-        $airline_code = $this->option('airline-code');
-        if (!$airline_code) {
-            $airline_code = $this->ask('Enter your airline code');
-        }
-        # TODO: Prompt for admin user/password
-    }
-}
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -15,14 +15,13 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 class Kernel extends ConsoleKernel
 {
    protected $commands = [
-        Commands\AcarsReplay::class,
+        /*Commands\AcarsReplay::class,
        Commands\CreateDatabase::class,
        Commands\DevCommands::class,
        Commands\YamlImport::class,
        Commands\ImportFromClassic::class,
-        Commands\Install::class,
        Commands\NavdataImport::class,
-        Commands\TestApi::class,
+        Commands\TestApi::class,*/
    ];

    /**
--- a/app/Exceptions/InternalError.php
+++ b/app/Exceptions/InternalError.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Exceptions;
+
+use Illuminate\Validation\ValidationException;
+use Validator;
+use Log;
+
+/**
+ * Show an internal error, bug piggyback off of the validation
+ * exception type - this has a place to show up in the UI as a
+ * flash message.
+ * @package App\Exceptions
+ */
+class InternalError extends ValidationException
+{
+    protected const FLASH_FIELD_NAME = 'internal_error_message';
+
+    /**
+     * InternalError constructor.
+     * @param string|null $message
+     * @param null        $field
+     */
+    final public function __construct(string $message = null, $field = null)
+    {
+        Log::error($message);
+        $validator = Validator::make([], []);
+        $validator->errors()->add($field ?? static::FLASH_FIELD_NAME, $message);
+
+        parent::__construct($validator);
+    }
+}
--- a/app/Http/Controllers/Admin/AircraftController.php
+++ b/app/Http/Controllers/Admin/AircraftController.php
@@ -49,22 +49,33 @@ class AircraftController extends Controller
     */
    public function index(Request $request)
    {
-        $this->aircraftRepo->pushCriteria(new RequestCriteria($request));
-        $aircraft = $this->aircraftRepo->orderBy('registration', 'asc')->all();
+        // If subfleet ID is passed part of the query string, then only
+        // show the aircraft that are in that subfleet
+        $w = [];
+        if($request->filled('subfleet')) {
+            $w['subfleet_id'] = $request->input('subfleet');
+        }
+
+        $aircraft = $this->aircraftRepo->whereOrder($w, 'registration', 'asc');
+        $aircraft = $aircraft->all();

        return view('admin.aircraft.index', [
-            'aircraft' => $aircraft
+            'aircraft' => $aircraft,
+            'subfleet_id' => $request->input('subfleet'),
        ]);
    }

    /**
     * Show the form for creating a new Aircraft.
+     * @param Request $request
+     * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
     */
-    public function create()
+    public function create(Request $request)
    {
        return view('admin.aircraft.create', [
            'subfleets' => Subfleet::all()->pluck('name', 'id'),
            'statuses'  => AircraftStatus::select(true),
+            'subfleet_id' => $request->query('subfleet')
        ]);
    }

--- a/app/Http/Controllers/Admin/FlightController.php
+++ b/app/Http/Controllers/Admin/FlightController.php
@@ -398,21 +398,25 @@ class FlightController extends Controller
        if ($request->isMethod('post')) {
            Log::info('Adding new flight field, flight: '.$flight_id, $request->input());

-            $field = new FlightFieldValue;
+            $field = new FlightFieldValue();
            $field->flight_id = $flight_id;
            $field->name = $request->input('name');
            $field->value = $request->input('value');
            $field->save();
        } elseif ($request->isMethod('put')) {
            Log::info('Updating flight field, flight: '.$flight_id, $request->input());
-            $field = FlightFieldValue::where('name', $request->input('name'))->first();
+            $field = FlightFieldValue::where([
+                'name' => $request->input('name'),
+                'flight_id' => $flight_id,
+            ])->first();
+
            if(!$field) {
                Log::info('Field not found, creating new');
                $field = new FlightFieldValue();
-                $field->flight_id = $flight_id;
                $field->name = $request->input('name');
            }

+            $field->flight_id = $flight_id;
            $field->value = $request->input('value');
            $field->save();
            // update the field value
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -46,5 +46,14 @@ class AppServiceProvider extends ServiceProvider
     */
    public function register(): void
    {
+        # Only dev environment stuff
+        if ($this->app->environment() === 'dev') {
+
+            # Only load the IDE helper if it's included. This lets use distribute the
+            # package without any dev dependencies
+            if (class_exists(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class)) {
+                $this->app->register(\Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class);
+            }
+        }
    }
 }
--- a/app/Services/ImportService.php
+++ b/app/Services/ImportService.php
@@ -36,6 +36,8 @@ class ImportService extends Service
    }

    /**
+     * Throw a validation error back up because it will automatically show
+     * itself under the CSV file upload, and nothing special needs to be done
     * @param $error
     * @param $e
     * @throws ValidationException
@@ -72,13 +74,15 @@ class ImportService extends Service
    /**
     * Run the actual importer, pass in one of the Import classes which implements
     * the ImportExport interface
-     * @param Reader       $reader
+     * @param              $file_path
     * @param ImportExport $importer
     * @return array
     * @throws ValidationException
     */
-    protected function runImport(Reader $reader, ImportExport $importer): array
+    protected function runImport($file_path, ImportExport $importer): array
    {
+        $reader = $this->openCsv($file_path);
+
        $cols = $importer->getColumns();
        $first_header = $cols[0];

@@ -126,13 +130,8 @@ class ImportService extends Service
            # TODO: delete airports
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            return false;
-        }
-
        $importer = new AircraftImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }

    /**
@@ -148,13 +147,8 @@ class ImportService extends Service
            Airport::truncate();
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            return false;
-        }
-
        $importer = new AirportImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }

    /**
@@ -170,13 +164,8 @@ class ImportService extends Service
            Expense::truncate();
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            return false;
-        }
-
        $importer = new ExpenseImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }

    /**
@@ -192,14 +181,8 @@ class ImportService extends Service
            # TODO: Delete all from: fares
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            # TODO: Throw an error
-            return false;
-        }
-
        $importer = new FareImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }

    /**
@@ -215,14 +198,8 @@ class ImportService extends Service
            # TODO: Delete all from: flights, flight_field_values
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            # TODO: Throw an error
-            return false;
-        }
-
        $importer = new FlightImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }

    /**
@@ -238,13 +215,7 @@ class ImportService extends Service
            # TODO: Cleanup subfleet data
        }

-        $reader = $this->openCsv($csv_file);
-        if (!$reader) {
-            # TODO: Throw an error
-            return false;
-        }
-
        $importer = new SubfleetImporter();
-        return $this->runImport($reader, $importer);
+        return $this->runImport($csv_file, $importer);
    }
 }
--- a/composer.json
+++ b/composer.json
@@ -8,7 +8,7 @@
    "homepage": "http://www.phpvms.net",
    "require": {
        "php": ">=7.1",
-        "laravel/framework": "5.6.*",
+        "laravel/framework": "^5.6",
        "laravelcollective/html": "5.6.x",
        "prettus/l5-repository": "2.6.x",
        "spatie/laravel-pjax": "1.3.x",
@@ -49,7 +49,8 @@
        "filp/whoops": "~2.0",
        "bpocallaghan/generators": "5.0.1",
        "zircote/swagger-php": "2.0.13",
-        "nunomaduro/collision": "^2.0"
+        "nunomaduro/collision": "^2.0",
+        "codedungeon/phpunit-result-printer": "^0.8.4"
    },
    "autoload": {
        "classmap": [
@@ -89,12 +90,11 @@
        ],
        "post-update-cmd": [
            "Illuminate\\Foundation\\ComposerScripts::postUpdate",
-            "php artisan ide-helper:generate",
-            "php artisan ide-helper:meta"
+            "php artisan phpvms:composer post-update"
        ],
        "post-autoload-dump": [
            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-            "@php artisan package:discover"
+            "php artisan package:discover"
        ]
    },
    "config": {
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
    ],
-    "content-hash": "833c46d2dbb420462272d9a86fa28ff9",
+    "content-hash": "72f80bf4c16eee977da9106ec5e3ed69",
    "packages": [
        {
            "name": "akaunting/money",
@@ -1705,16 +1705,16 @@
        },
        {
            "name": "laravelcollective/html",
-            "version": "v5.6.3",
+            "version": "v5.6.5",
            "source": {
                "type": "git",
                "url": "https://github.com/LaravelCollective/html.git",
-                "reference": "41cd9291a69bd24f2184e504be041348a87308a8"
+                "reference": "623a150c91e2d3f92eeee9f9eda58a841e3cb548"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/41cd9291a69bd24f2184e504be041348a87308a8",
-                "reference": "41cd9291a69bd24f2184e504be041348a87308a8",
+                "url": "https://api.github.com/repos/LaravelCollective/html/zipball/623a150c91e2d3f92eeee9f9eda58a841e3cb548",
+                "reference": "623a150c91e2d3f92eeee9f9eda58a841e3cb548",
                "shasum": ""
            },
            "require": {
@@ -1769,7 +1769,7 @@
            ],
            "description": "HTML and Form Builders for the Laravel Framework",
            "homepage": "https://laravelcollective.com",
-            "time": "2018-02-12T14:19:42+00:00"
+            "time": "2018-03-16T16:57:31+00:00"
        },
        {
            "name": "league/csv",
@@ -5238,6 +5238,55 @@
            ],
            "time": "2017-11-16T12:28:04+00:00"
        },
+        {
+            "name": "codedungeon/phpunit-result-printer",
+            "version": "0.8.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/mikeerickson/phpunit-pretty-result-printer.git",
+                "reference": "cb9bf244b62392909ee61ee174874de137fe698a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/mikeerickson/phpunit-pretty-result-printer/zipball/cb9bf244b62392909ee61ee174874de137fe698a",
+                "reference": "cb9bf244b62392909ee61ee174874de137fe698a",
+                "shasum": ""
+            },
+            "require": {
+                "hassankhan/config": "^0.10.0",
+                "php": "^7.0",
+                "symfony/yaml": "^2.7|^3.0|^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": ">=5.2",
+                "spatie/phpunit-watcher": "^1.3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Codedungeon\\PHPUnitPrettyResultPrinter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike Erickson",
+                    "email": "codedungeon@gmail.com"
+                }
+            ],
+            "description": "PHPUnit Pretty Result Printer",
+            "keywords": [
+                "composer",
+                "package",
+                "phpunit",
+                "printer",
+                "result-printer"
+            ],
+            "time": "2018-03-23T23:03:37+00:00"
+        },
        {
            "name": "doctrine/annotations",
            "version": "v1.6.0",
@@ -5516,6 +5565,63 @@
            ],
            "time": "2015-05-11T14:41:42+00:00"
        },
+        {
+            "name": "hassankhan/config",
+            "version": "0.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/hassankhan/config.git",
+                "reference": "06ac500348af033f1a2e44dc357ca86282626d4a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/hassankhan/config/zipball/06ac500348af033f1a2e44dc357ca86282626d4a",
+                "reference": "06ac500348af033f1a2e44dc357ca86282626d4a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0",
+                "scrutinizer/ocular": "~1.1",
+                "squizlabs/php_codesniffer": "~2.2"
+            },
+            "suggest": {
+                "symfony/yaml": "~2.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Noodlehaus\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Hassan Khan",
+                    "homepage": "http://hassankhan.me/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Lightweight configuration file loader that supports PHP, INI, XML, JSON, and YAML files",
+            "homepage": "http://hassankhan.me/config/",
+            "keywords": [
+                "config",
+                "configuration",
+                "ini",
+                "json",
+                "microphp",
+                "unframework",
+                "xml",
+                "yaml",
+                "yml"
+            ],
+            "time": "2016-02-11T16:21:17+00:00"
+        },
        {
            "name": "jakub-onderka/php-console-color",
            "version": "0.1",
@@ -5715,16 +5821,16 @@
        },
        {
            "name": "nunomaduro/collision",
-            "version": "v2.0.1",
+            "version": "v2.0.2",
            "source": {
                "type": "git",
                "url": "https://github.com/nunomaduro/collision.git",
-                "reference": "e60011a179d97f33ee394865b1cec472247df3b9"
+                "reference": "245958b02c6a9edf24627380f368333ac5413a51"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/e60011a179d97f33ee394865b1cec472247df3b9",
-                "reference": "e60011a179d97f33ee394865b1cec472247df3b9",
+                "url": "https://api.github.com/repos/nunomaduro/collision/zipball/245958b02c6a9edf24627380f368333ac5413a51",
+                "reference": "245958b02c6a9edf24627380f368333ac5413a51",
                "shasum": ""
            },
            "require": {
@@ -5773,7 +5879,7 @@
                "php",
                "symfony"
            ],
-            "time": "2018-03-20T21:27:23+00:00"
+            "time": "2018-03-21T20:11:24+00:00"
        },
        {
            "name": "phar-io/manifest",
--- a/config/app.php
+++ b/config/app.php
@@ -68,7 +68,6 @@ return [
        /*
         * Package Service Providers...
         */
-        Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
        Collective\Html\HtmlServiceProvider::class,
        Laracasts\Flash\FlashServiceProvider::class,
        Prettus\Repository\Providers\RepositoryServiceProvider::class,
--- a/config/ide-helper.php
+++ b/config/ide-helper.php
@@ -41,7 +41,7 @@ return array(
    */

    'model_locations' => array(
-        'app/Models',
+        //'app/Models',
    ),


--- a/phpunit.xml
+++ b/phpunit.xml
@@ -8,6 +8,7 @@
         convertWarningsToExceptions="false"
         beStrictAboutOutputDuringTests="false"
         beStrictAboutTestsThatDoNotTestAnything="false">
+         <!--printerClass="Codedungeon\PHPUnitPrettyResultPrinter\Printer"-->
    <testsuites>
        <testsuite name="Application Test Suite">
            <directory suffix="Test.php">./tests</directory>
--- a/public/assets/admin/css/admin.css
+++ b/public/assets/admin/css/admin.css
@@ -3,6 +3,10 @@
 *
 */

+.select2-container {
+    margin-top: 5px;
+}
+
 .border-blue-bottom {
    border-bottom: 3px solid #067ec1;
 }
--- a/public/assets/admin/css/vendor.min.css
+++ b/public/assets/admin/css/vendor.min.css
--- a/public/assets/admin/js/vendor.js
+++ b/public/assets/admin/js/vendor.js
@@ -17084,6 +17084,10 @@
 }.call(this));

 //! moment.js
+//! version : 2.20.1
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com

 ;(function (global, factory) {
    typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
@@ -17742,6 +17746,7 @@ var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
 // includes scottish gaelic two word and hyphenated months
 var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;

+
 var regexes = {};

 function addRegexToken (token, regex, strictRegex) {
@@ -18854,6 +18859,10 @@ function localeMeridiem (hours, minutes, isLower) {
 // this rule.
 var getSetHour = makeGetSet('Hours', true);

+// months
+// week
+// weekdays
+// meridiem
 var baseConfig = {
    calendar: defaultCalendar,
    longDateFormat: defaultLongDateFormat,
@@ -18907,7 +18916,7 @@ function chooseLocale(names) {
        }
        i++;
    }
-    return globalLocale;
+    return null;
 }

 function loadLocale(name) {
@@ -18942,12 +18951,6 @@ function getSetGlobalLocale (key, values) {
            // moment.duration._locale = moment._locale = data;
            globalLocale = data;
        }
-        else {
-            if ((typeof console !==  'undefined') && console.warn) {
-                //warn user if arguments are passed but the locale could not be set
-                console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
-            }
-        }
    }

    return globalLocale._abbr;
@@ -18955,7 +18958,7 @@ function getSetGlobalLocale (key, values) {

 function defineLocale (name, config) {
    if (config !== null) {
-        var locale, parentConfig = baseConfig;
+        var parentConfig = baseConfig;
        config.abbr = name;
        if (locales[name] != null) {
            deprecateSimple('defineLocaleOverride',
@@ -18968,19 +18971,14 @@ function defineLocale (name, config) {
            if (locales[config.parentLocale] != null) {
                parentConfig = locales[config.parentLocale]._config;
            } else {
-                locale = loadLocale(config.parentLocale);
-                if (locale != null) {
-                    parentConfig = locale._config;
-                } else {
-                    if (!localeFamilies[config.parentLocale]) {
-                        localeFamilies[config.parentLocale] = [];
-                    }
-                    localeFamilies[config.parentLocale].push({
-                        name: name,
-                        config: config
-                    });
-                    return null;
+                if (!localeFamilies[config.parentLocale]) {
+                    localeFamilies[config.parentLocale] = [];
                }
+                localeFamilies[config.parentLocale].push({
+                    name: name,
+                    config: config
+                });
+                return null;
            }
        }
        locales[name] = new Locale(mergeConfigs(parentConfig, config));
@@ -20328,7 +20326,7 @@ function isSameOrBefore (input, units) {
 function diff (input, units, asFloat) {
    var that,
        zoneDelta,
-        output;
+        delta, output;

    if (!this.isValid()) {
        return NaN;
@@ -20401,7 +20399,7 @@ function toISOString(keepOffset) {
        if (utc) {
            return this.toDate().toISOString();
        } else {
-            return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
+            return new Date(this._d.valueOf()).toISOString().replace('Z', formatMoment(m, 'Z'));
        }
    }
    return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
@@ -20955,26 +20953,48 @@ proto.toString          = toString;
 proto.unix              = unix;
 proto.valueOf           = valueOf;
 proto.creationData      = creationData;
+
+// Year
 proto.year       = getSetYear;
 proto.isLeapYear = getIsLeapYear;
+
+// Week Year
 proto.weekYear    = getSetWeekYear;
 proto.isoWeekYear = getSetISOWeekYear;
+
+// Quarter
 proto.quarter = proto.quarters = getSetQuarter;
+
+// Month
 proto.month       = getSetMonth;
 proto.daysInMonth = getDaysInMonth;
+
+// Week
 proto.week           = proto.weeks        = getSetWeek;
 proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
 proto.weeksInYear    = getWeeksInYear;
 proto.isoWeeksInYear = getISOWeeksInYear;
+
+// Day
 proto.date       = getSetDayOfMonth;
 proto.day        = proto.days             = getSetDayOfWeek;
 proto.weekday    = getSetLocaleDayOfWeek;
 proto.isoWeekday = getSetISODayOfWeek;
 proto.dayOfYear  = getSetDayOfYear;
+
+// Hour
 proto.hour = proto.hours = getSetHour;
+
+// Minute
 proto.minute = proto.minutes = getSetMinute;
+
+// Second
 proto.second = proto.seconds = getSetSecond;
+
+// Millisecond
 proto.millisecond = proto.milliseconds = getSetMillisecond;
+
+// Offset
 proto.utcOffset            = getSetOffset;
 proto.utc                  = setOffsetToUTC;
 proto.local                = setOffsetToLocal;
@@ -20985,8 +21005,12 @@ proto.isLocal              = isLocal;
 proto.isUtcOffset          = isUtcOffset;
 proto.isUtc                = isUtc;
 proto.isUTC                = isUtc;
+
+// Timezone
 proto.zoneAbbr = getZoneAbbr;
 proto.zoneName = getZoneName;
+
+// Deprecations
 proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
 proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
 proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
@@ -21017,15 +21041,19 @@ proto$1.relativeTime    = relativeTime;
 proto$1.pastFuture      = pastFuture;
 proto$1.set             = set;

+// Month
 proto$1.months            =        localeMonths;
 proto$1.monthsShort       =        localeMonthsShort;
 proto$1.monthsParse       =        localeMonthsParse;
 proto$1.monthsRegex       = monthsRegex;
 proto$1.monthsShortRegex  = monthsShortRegex;
+
+// Week
 proto$1.week = localeWeek;
 proto$1.firstDayOfYear = localeFirstDayOfYear;
 proto$1.firstDayOfWeek = localeFirstDayOfWeek;

+// Day of Week
 proto$1.weekdays       =        localeWeekdays;
 proto$1.weekdaysMin    =        localeWeekdaysMin;
 proto$1.weekdaysShort  =        localeWeekdaysShort;
@@ -21035,6 +21063,7 @@ proto$1.weekdaysRegex       =        weekdaysRegex;
 proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
 proto$1.weekdaysMinRegex    =        weekdaysMinRegex;

+// Hours
 proto$1.isPM = localeIsPM;
 proto$1.meridiem = localeMeridiem;

@@ -21141,7 +21170,6 @@ getSetGlobalLocale('en', {
 });

 // Side effect imports
-
 hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
 hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);

@@ -21517,6 +21545,7 @@ proto$2.toJSON         = toISOString$1;
 proto$2.locale         = locale;
 proto$2.localeData     = localeData;

+// Deprecations
 proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
 proto$2.lang = lang;

@@ -21541,7 +21570,7 @@ addParseToken('x', function (input, array, config) {
 // Side effect imports


-hooks.version = '2.21.0';
+hooks.version = '2.20.1';

 setHookCallback(createLocal);

@@ -25829,7 +25858,7 @@ if (typeof jQuery === 'undefined') {

 /**!
 * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.14.0
+ * @version 1.13.0
 * @license
 * Copyright (c) 2016 Federico Zivolo and contributors
 *
@@ -25977,48 +26006,13 @@ function getScrollParent(element) {
      overflowX = _getStyleComputedProp.overflowX,
      overflowY = _getStyleComputedProp.overflowY;

-  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
+  if (/(auto|scroll)/.test(overflow + overflowY + overflowX)) {
    return element;
  }

  return getScrollParent(getParentNode(element));
 }

-/**
- * Tells if you are running Internet Explorer
- * @method
- * @memberof Popper.Utils
- * @argument {number} version to check
- * @returns {Boolean} isIE
- */
-var cache = {};
-
-var isIE = function () {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'all';
-
-  version = version.toString();
-  if (cache.hasOwnProperty(version)) {
-    return cache[version];
-  }
-  switch (version) {
-    case '11':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1;
-      break;
-    case '10':
-      cache[version] = navigator.appVersion.indexOf('MSIE 10') !== -1;
-      break;
-    case 'all':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1 || navigator.userAgent.indexOf('MSIE') !== -1;
-      break;
-  }
-
-  //Set IE
-  cache.all = cache.all || Object.keys(cache).some(function (key) {
-    return cache[key];
-  });
-  return cache[version];
-};
-
 /**
 * Returns the offset parent of the given element
 * @method
@@ -26027,23 +26021,16 @@ var isIE = function () {
 * @returns {Element} offset parent
 */
 function getOffsetParent(element) {
-  if (!element) {
-    return document.documentElement;
-  }
-
-  var noOffsetParent = isIE(10) ? document.body : null;
-
  // NOTE: 1 DOM access here
-  var offsetParent = element.offsetParent;
-  // Skip hidden elements which don't have an offsetParent
-  while (offsetParent === noOffsetParent && element.nextElementSibling) {
-    offsetParent = (element = element.nextElementSibling).offsetParent;
-  }
-
+  var offsetParent = element && element.offsetParent;
  var nodeName = offsetParent && offsetParent.nodeName;

  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
-    return element ? element.ownerDocument.documentElement : document.documentElement;
+    if (element) {
+      return element.ownerDocument.documentElement;
+    }
+
+    return document.documentElement;
  }

  // .offsetParent will return the closest TD or TABLE in case
@@ -26185,14 +26172,29 @@ function getBordersSize(styles, axis) {
  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
 }

+/**
+ * Tells if you are running Internet Explorer 10
+ * @method
+ * @memberof Popper.Utils
+ * @returns {Boolean} isIE10
+ */
+var isIE10 = undefined;
+
+var isIE10$1 = function () {
+  if (isIE10 === undefined) {
+    isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1;
+  }
+  return isIE10;
+};
+
 function getSize(axis, body, html, computedStyle) {
-  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
+  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE10$1() ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
 }

 function getWindowSizes() {
  var body = document.body;
  var html = document.documentElement;
-  var computedStyle = isIE(10) && getComputedStyle(html);
+  var computedStyle = isIE10$1() && getComputedStyle(html);

  return {
    height: getSize('Height', body, html, computedStyle),
@@ -26284,8 +26286,8 @@ function getBoundingClientRect(element) {
  // IE10 10 FIX: Please, don't ask, the element isn't
  // considered in DOM in some circumstances...
  // This isn't reproducible in IE10 compatibility mode of IE11
-  try {
-    if (isIE(10)) {
+  if (isIE10$1()) {
+    try {
      rect = element.getBoundingClientRect();
      var scrollTop = getScroll(element, 'top');
      var scrollLeft = getScroll(element, 'left');
@@ -26293,10 +26295,10 @@ function getBoundingClientRect(element) {
      rect.left += scrollLeft;
      rect.bottom += scrollTop;
      rect.right += scrollLeft;
-    } else {
-      rect = element.getBoundingClientRect();
-    }
-  } catch (e) {}
+    } catch (err) {}
+  } else {
+    rect = element.getBoundingClientRect();
+  }

  var result = {
    left: rect.left,
@@ -26328,9 +26330,7 @@ function getBoundingClientRect(element) {
 }

 function getOffsetRectRelativeToArbitraryNode(children, parent) {
-  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var isIE10 = isIE(10);
+  var isIE10 = isIE10$1();
  var isHTML = parent.nodeName === 'HTML';
  var childrenRect = getBoundingClientRect(children);
  var parentRect = getBoundingClientRect(parent);
@@ -26340,11 +26340,6 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);

-  // In cases where the parent is fixed, we must ignore negative scroll in offset calc
-  if (fixedPosition && parent.nodeName === 'HTML') {
-    parentRect.top = Math.max(parentRect.top, 0);
-    parentRect.left = Math.max(parentRect.left, 0);
-  }
  var offsets = getClientRect({
    top: childrenRect.top - parentRect.top - borderTopWidth,
    left: childrenRect.left - parentRect.left - borderLeftWidth,
@@ -26372,7 +26367,7 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
    offsets.marginLeft = marginLeft;
  }

-  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+  if (isIE10 ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
    offsets = includeScroll(offsets, parent);
  }

@@ -26380,15 +26375,13 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
 }

 function getViewportOffsetRectRelativeToArtbitraryNode(element) {
-  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
  var html = element.ownerDocument.documentElement;
  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
  var width = Math.max(html.clientWidth, window.innerWidth || 0);
  var height = Math.max(html.clientHeight, window.innerHeight || 0);

-  var scrollTop = !excludeScroll ? getScroll(html) : 0;
-  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
+  var scrollTop = getScroll(html);
+  var scrollLeft = getScroll(html, 'left');

  var offset = {
    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
@@ -26419,26 +26412,6 @@ function isFixed(element) {
  return isFixed(getParentNode(element));
 }

-/**
- * Finds the first parent of an element that has a transformed property defined
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} first transformed parent or documentElement
- */
-
-function getFixedPositionOffsetParent(element) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element || !element.parentElement || isIE()) {
-    return document.documentElement;
-  }
-  var el = element.parentElement;
-  while (el && getStyleComputedProperty(el, 'transform') === 'none') {
-    el = el.parentElement;
-  }
-  return el || document.documentElement;
-}
-
 /**
 * Computed the boundaries limits and return them
 * @method
@@ -26447,20 +26420,16 @@ function getFixedPositionOffsetParent(element) {
 * @param {HTMLElement} reference
 * @param {number} padding
 * @param {HTMLElement} boundariesElement - Element used to define the boundaries
- * @param {Boolean} fixedPosition - Is in fixed position mode
 * @returns {Object} Coordinates of the boundaries
 */
 function getBoundaries(popper, reference, padding, boundariesElement) {
-  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-
  // NOTE: 1 DOM access here
-
  var boundaries = { top: 0, left: 0 };
-  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
+  var offsetParent = findCommonOffsetParent(popper, reference);

  // Handle viewport case
  if (boundariesElement === 'viewport') {
-    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
+    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent);
  } else {
    // Handle other cases based on DOM element used as boundaries
    var boundariesNode = void 0;
@@ -26475,7 +26444,7 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
      boundariesNode = boundariesElement;
    }

-    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
+    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent);

    // In case of HTML, we need a different computation
    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
@@ -26576,14 +26545,11 @@ function computeAutoPlacement(placement, refRect, popper, reference, boundariesE
 * @param {Object} state
 * @param {Element} popper - the popper element
 * @param {Element} reference - the reference element (the popper will be relative to this)
- * @param {Element} fixedPosition - is in fixed position mode
 * @returns {Object} An object containing the offsets which will be applied to the popper
 */
 function getReferenceOffsets(state, popper, reference) {
-  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
-  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
+  var commonOffsetParent = findCommonOffsetParent(popper, reference);
+  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent);
 }

 /**
@@ -26756,7 +26722,7 @@ function update() {
  };

  // compute reference element offsets
-  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);
+  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference);

  // compute auto placement, store placement inside the data object,
  // modifiers will be able to edit `placement` if needed
@@ -26766,11 +26732,9 @@ function update() {
  // store the computed placement inside `originalPlacement`
  data.originalPlacement = data.placement;

-  data.positionFixed = this.options.positionFixed;
-
  // compute the popper offsets
  data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);
-  data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';
+  data.offsets.popper.position = 'absolute';

  // run the modifiers
  data = runModifiers(this.modifiers, data);
@@ -26810,7 +26774,7 @@ function getSupportedPropertyName(property) {
  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);

-  for (var i = 0; i < prefixes.length; i++) {
+  for (var i = 0; i < prefixes.length - 1; i++) {
    var prefix = prefixes[i];
    var toCheck = prefix ? '' + prefix + upperProp : property;
    if (typeof document.body.style[toCheck] !== 'undefined') {
@@ -26831,12 +26795,9 @@ function destroy() {
  // touch DOM only if `applyStyle` modifier is enabled
  if (isModifierEnabled(this.modifiers, 'applyStyle')) {
    this.popper.removeAttribute('x-placement');
+    this.popper.style.left = '';
    this.popper.style.position = '';
    this.popper.style.top = '';
-    this.popper.style.left = '';
-    this.popper.style.right = '';
-    this.popper.style.bottom = '';
-    this.popper.style.willChange = '';
    this.popper.style[getSupportedPropertyName('transform')] = '';
  }

@@ -27024,12 +26985,12 @@ function applyStyle(data) {
 * @method
 * @memberof Popper.modifiers
 * @param {HTMLElement} reference - The reference element used to position the popper
- * @param {HTMLElement} popper - The HTML element used as popper
+ * @param {HTMLElement} popper - The HTML element used as popper.
 * @param {Object} options - Popper.js options
 */
 function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
  // compute reference element offsets
-  var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);
+  var referenceOffsets = getReferenceOffsets(state, popper, reference);

  // compute auto placement, store placement inside the data object,
  // modifiers will be able to edit `placement` if needed
@@ -27040,7 +27001,7 @@ function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {

  // Apply `position` to popper before anything else because
  // without the position applied we can't guarantee correct computations
-  setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });
+  setStyles(popper, { position: 'absolute' });

  return options;
 }
@@ -27343,7 +27304,7 @@ function flip(data, options) {
    return data;
  }

-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);
+  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement);

  var placement = data.placement.split('-')[0];
  var placementOpposite = getOppositePlacement(placement);
@@ -27635,7 +27596,7 @@ function preventOverflow(data, options) {
    boundariesElement = getOffsetParent(boundariesElement);
  }

-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);
+  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement);
  options.boundaries = boundaries;

  var order = options.priority;
@@ -28132,12 +28093,6 @@ var Defaults = {
   */
  placement: 'bottom',

-  /**
-   * Set this to true if you want popper to position it self in 'fixed' mode
-   * @prop {Boolean} positionFixed=false
-   */
-  positionFixed: false,
-
  /**
   * Whether events (resize, scroll) are initially enabled
   * @prop {Boolean} eventsEnabled=true
@@ -28349,7 +28304,7 @@ return Popper;

 /**!
 * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.14.0
+ * @version 1.13.0
 * @license
 * Copyright (c) 2016 Federico Zivolo and contributors
 *
@@ -28435,48 +28390,13 @@ function getScrollParent(element) {
      overflowX = _getStyleComputedProp.overflowX,
      overflowY = _getStyleComputedProp.overflowY;

-  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
+  if (/(auto|scroll)/.test(overflow + overflowY + overflowX)) {
    return element;
  }

  return getScrollParent(getParentNode(element));
 }

-/**
- * Tells if you are running Internet Explorer
- * @method
- * @memberof Popper.Utils
- * @argument {number} version to check
- * @returns {Boolean} isIE
- */
-var cache = {};
-
-var isIE = function () {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'all';
-
-  version = version.toString();
-  if (cache.hasOwnProperty(version)) {
-    return cache[version];
-  }
-  switch (version) {
-    case '11':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1;
-      break;
-    case '10':
-      cache[version] = navigator.appVersion.indexOf('MSIE 10') !== -1;
-      break;
-    case 'all':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1 || navigator.userAgent.indexOf('MSIE') !== -1;
-      break;
-  }
-
-  //Set IE
-  cache.all = cache.all || Object.keys(cache).some(function (key) {
-    return cache[key];
-  });
-  return cache[version];
-};
-
 /**
 * Returns the offset parent of the given element
 * @method
@@ -28485,23 +28405,16 @@ var isIE = function () {
 * @returns {Element} offset parent
 */
 function getOffsetParent(element) {
-  if (!element) {
-    return document.documentElement;
-  }
-
-  var noOffsetParent = isIE(10) ? document.body : null;
-
  // NOTE: 1 DOM access here
-  var offsetParent = element.offsetParent;
-  // Skip hidden elements which don't have an offsetParent
-  while (offsetParent === noOffsetParent && element.nextElementSibling) {
-    offsetParent = (element = element.nextElementSibling).offsetParent;
-  }
-
+  var offsetParent = element && element.offsetParent;
  var nodeName = offsetParent && offsetParent.nodeName;

  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
-    return element ? element.ownerDocument.documentElement : document.documentElement;
+    if (element) {
+      return element.ownerDocument.documentElement;
+    }
+
+    return document.documentElement;
  }

  // .offsetParent will return the closest TD or TABLE in case
@@ -28643,14 +28556,29 @@ function getBordersSize(styles, axis) {
  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
 }

+/**
+ * Tells if you are running Internet Explorer 10
+ * @method
+ * @memberof Popper.Utils
+ * @returns {Boolean} isIE10
+ */
+var isIE10 = undefined;
+
+var isIE10$1 = function () {
+  if (isIE10 === undefined) {
+    isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1;
+  }
+  return isIE10;
+};
+
 function getSize(axis, body, html, computedStyle) {
-  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
+  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE10$1() ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
 }

 function getWindowSizes() {
  var body = document.body;
  var html = document.documentElement;
-  var computedStyle = isIE(10) && getComputedStyle(html);
+  var computedStyle = isIE10$1() && getComputedStyle(html);

  return {
    height: getSize('Height', body, html, computedStyle),
@@ -28699,8 +28627,8 @@ function getBoundingClientRect(element) {
  // IE10 10 FIX: Please, don't ask, the element isn't
  // considered in DOM in some circumstances...
  // This isn't reproducible in IE10 compatibility mode of IE11
-  try {
-    if (isIE(10)) {
+  if (isIE10$1()) {
+    try {
      rect = element.getBoundingClientRect();
      var scrollTop = getScroll(element, 'top');
      var scrollLeft = getScroll(element, 'left');
@@ -28708,10 +28636,10 @@ function getBoundingClientRect(element) {
      rect.left += scrollLeft;
      rect.bottom += scrollTop;
      rect.right += scrollLeft;
-    } else {
-      rect = element.getBoundingClientRect();
-    }
-  } catch (e) {}
+    } catch (err) {}
+  } else {
+    rect = element.getBoundingClientRect();
+  }

  var result = {
    left: rect.left,
@@ -28743,9 +28671,7 @@ function getBoundingClientRect(element) {
 }

 function getOffsetRectRelativeToArbitraryNode(children, parent) {
-  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var isIE10 = isIE(10);
+  var isIE10 = isIE10$1();
  var isHTML = parent.nodeName === 'HTML';
  var childrenRect = getBoundingClientRect(children);
  var parentRect = getBoundingClientRect(parent);
@@ -28755,11 +28681,6 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);

-  // In cases where the parent is fixed, we must ignore negative scroll in offset calc
-  if (fixedPosition && parent.nodeName === 'HTML') {
-    parentRect.top = Math.max(parentRect.top, 0);
-    parentRect.left = Math.max(parentRect.left, 0);
-  }
  var offsets = getClientRect({
    top: childrenRect.top - parentRect.top - borderTopWidth,
    left: childrenRect.left - parentRect.left - borderLeftWidth,
@@ -28787,7 +28708,7 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
    offsets.marginLeft = marginLeft;
  }

-  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+  if (isIE10 ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
    offsets = includeScroll(offsets, parent);
  }

@@ -28795,15 +28716,13 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
 }

 function getViewportOffsetRectRelativeToArtbitraryNode(element) {
-  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
  var html = element.ownerDocument.documentElement;
  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
  var width = Math.max(html.clientWidth, window.innerWidth || 0);
  var height = Math.max(html.clientHeight, window.innerHeight || 0);

-  var scrollTop = !excludeScroll ? getScroll(html) : 0;
-  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
+  var scrollTop = getScroll(html);
+  var scrollLeft = getScroll(html, 'left');

  var offset = {
    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
@@ -28834,26 +28753,6 @@ function isFixed(element) {
  return isFixed(getParentNode(element));
 }

-/**
- * Finds the first parent of an element that has a transformed property defined
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} first transformed parent or documentElement
- */
-
-function getFixedPositionOffsetParent(element) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element || !element.parentElement || isIE()) {
-    return document.documentElement;
-  }
-  var el = element.parentElement;
-  while (el && getStyleComputedProperty(el, 'transform') === 'none') {
-    el = el.parentElement;
-  }
-  return el || document.documentElement;
-}
-
 /**
 * Computed the boundaries limits and return them
 * @method
@@ -28862,20 +28761,16 @@ function getFixedPositionOffsetParent(element) {
 * @param {HTMLElement} reference
 * @param {number} padding
 * @param {HTMLElement} boundariesElement - Element used to define the boundaries
- * @param {Boolean} fixedPosition - Is in fixed position mode
 * @returns {Object} Coordinates of the boundaries
 */
 function getBoundaries(popper, reference, padding, boundariesElement) {
-  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-
  // NOTE: 1 DOM access here
-
  var boundaries = { top: 0, left: 0 };
-  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
+  var offsetParent = findCommonOffsetParent(popper, reference);

  // Handle viewport case
  if (boundariesElement === 'viewport') {
-    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
+    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent);
  } else {
    // Handle other cases based on DOM element used as boundaries
    var boundariesNode = void 0;
@@ -28890,7 +28785,7 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
      boundariesNode = boundariesElement;
    }

-    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
+    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent);

    // In case of HTML, we need a different computation
    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
@@ -29188,14 +29083,11 @@ function getPopperOffsets(popper, referenceOffsets, placement) {
 * @param {Object} state
 * @param {Element} popper - the popper element
 * @param {Element} reference - the reference element (the popper will be relative to this)
- * @param {Element} fixedPosition - is in fixed position mode
 * @returns {Object} An object containing the offsets which will be applied to the popper
 */
 function getReferenceOffsets(state, popper, reference) {
-  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
-  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
+  var commonOffsetParent = findCommonOffsetParent(popper, reference);
+  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent);
 }

 /**
@@ -29209,7 +29101,7 @@ function getSupportedPropertyName(property) {
  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);

-  for (var i = 0; i < prefixes.length; i++) {
+  for (var i = 0; i < prefixes.length - 1; i++) {
    var prefix = prefixes[i];
    var toCheck = prefix ? '' + prefix + upperProp : property;
    if (typeof document.body.style[toCheck] !== 'undefined') {
--- a/public/assets/admin/vendor/paper-dashboard.css
+++ b/public/assets/admin/vendor/paper-dashboard.css
@@ -658,7 +658,8 @@ hr {
  background-color: transparent;
  font-size: 14px;
  font-weight: 500;
-  padding: 7px 18px;
+  margin-top: 5px;
+  padding: 4px 18px;
  background-color: #2f2d2a;
  color: #FFFFFF;
  -webkit-transition: all 150ms linear;
@@ -1313,16 +1314,17 @@ input {
  line-height: 1.846;
  color: #666666;
  border: medium none;
-  border-radius: 4px;
+  border-radius: 0.125rem;
  border-bottom: 2px solid #0f5b8c;
+  vertical-align: middle;
  /*-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
  -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
  transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
-  padding: 7px 18px;
-  height: 40px;
+  padding: 4px 10px;
+  height: 30px;
  /*background-color: $gray-input-bg;
    border: medium none;
    border-radius: $border-radius-base;
@@ -2239,7 +2241,7 @@ textarea.form-control {

 .card {
  border: 0;
-  border-radius: 6px;
+  border-radius: 0.125rem;
  -webkit-box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
          box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
  background-color: #FFFFFF;
@@ -2308,6 +2310,7 @@ textarea.form-control {
  font-size: 14px;
  font-weight: 400;
  color: #9A9A9A;
+  text-transform: capitalize;
  margin-bottom: 0px;
 }

@@ -2319,6 +2322,9 @@ textarea.form-control {
 .card label {
  font-size: 15px;
  margin-bottom: 5px;
+  text-transform: capitalize;
+  display: inline-block;
+  vertical-align: middle;
 }

 .card .title {
--- a/public/assets/admin/vendor/sass/paper/_buttons.scss
+++ b/public/assets/admin/vendor/sass/paper/_buttons.scss
@@ -7,7 +7,8 @@
    font-size: $font-size-base;
    font-weight: $font-weight-semi;

-    padding: $padding-base-vertical $padding-base-horizontal;
+    margin-top: 5px;
+    padding: $padding-small-vertical $padding-base-horizontal;

    @include btn-styles($default-color, $default-states-color);
    @include transition($fast-transition-time, linear);
--- a/public/assets/admin/vendor/sass/paper/_cards.scss
+++ b/public/assets/admin/vendor/sass/paper/_cards.scss
@@ -1,6 +1,6 @@
 .card {
    border: 0;
-    border-radius: $border-radius-extreme;
+    border-radius: $border-radius-extra-small;
    box-shadow: 0 2px 2px rgba(204, 197, 185, 0.5);
    background-color: #FFFFFF;
    color: $card-black-color;
@@ -62,6 +62,7 @@
        font-size: $font-size-base;
        font-weight: $font-weight-normal;
        color: $dark-gray;
+        text-transform: capitalize;
        margin-bottom: 0px;
        i{
            font-size: $font-paragraph;
@@ -71,6 +72,9 @@
    label{
        font-size: 15px;
        margin-bottom: 5px;
+        text-transform: capitalize;
+        display: inline-block;
+        vertical-align: middle;
    }

    .title{
--- a/public/assets/admin/vendor/sass/paper/_inputs.scss
+++ b/public/assets/admin/vendor/sass/paper/_inputs.scss
@@ -28,14 +28,15 @@ input {
    line-height: 1.846;
    color: #666666;
    border: medium none;
-    border-radius: $border-radius-base;
+    border-radius: $border-radius-extra-small;
    border-bottom: 2px solid #0f5b8c;
+    vertical-align: middle;
    /*-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
    box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
    -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
    -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-    @include input-size($padding-base-vertical, $padding-base-horizontal, $height-base);
+    @include input-size($padding-small-vertical, $padding-small-horizontal, 30px);

    /*background-color: $gray-input-bg;
    border: medium none;
--- a/public/assets/admin/vendor/sass/paper/mixins/_labels.scss
+++ b/public/assets/admin/vendor/sass/paper/mixins/_labels.scss
@@ -5,7 +5,7 @@
     color: $default-color;
     font-weight: $font-weight-semi;
     font-size: $font-size-small;
-     text-transform: uppercase;
+     text-transform: capitalize;
     display: inline-block;
     vertical-align: middle;
 }
@@ -18,4 +18,4 @@
     border-color: $color;
     color: $white-color;
     background-color: $color;
-}
+}
--- a/public/assets/system/js/vendor.js
+++ b/public/assets/system/js/vendor.js
@@ -31415,7 +31415,7 @@ if (typeof jQuery === 'undefined') {

 /**!
 * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.14.0
+ * @version 1.13.0
 * @license
 * Copyright (c) 2016 Federico Zivolo and contributors
 *
@@ -31563,48 +31563,13 @@ function getScrollParent(element) {
      overflowX = _getStyleComputedProp.overflowX,
      overflowY = _getStyleComputedProp.overflowY;

-  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
+  if (/(auto|scroll)/.test(overflow + overflowY + overflowX)) {
    return element;
  }

  return getScrollParent(getParentNode(element));
 }

-/**
- * Tells if you are running Internet Explorer
- * @method
- * @memberof Popper.Utils
- * @argument {number} version to check
- * @returns {Boolean} isIE
- */
-var cache = {};
-
-var isIE = function () {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'all';
-
-  version = version.toString();
-  if (cache.hasOwnProperty(version)) {
-    return cache[version];
-  }
-  switch (version) {
-    case '11':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1;
-      break;
-    case '10':
-      cache[version] = navigator.appVersion.indexOf('MSIE 10') !== -1;
-      break;
-    case 'all':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1 || navigator.userAgent.indexOf('MSIE') !== -1;
-      break;
-  }
-
-  //Set IE
-  cache.all = cache.all || Object.keys(cache).some(function (key) {
-    return cache[key];
-  });
-  return cache[version];
-};
-
 /**
 * Returns the offset parent of the given element
 * @method
@@ -31613,23 +31578,16 @@ var isIE = function () {
 * @returns {Element} offset parent
 */
 function getOffsetParent(element) {
-  if (!element) {
-    return document.documentElement;
-  }
-
-  var noOffsetParent = isIE(10) ? document.body : null;
-
  // NOTE: 1 DOM access here
-  var offsetParent = element.offsetParent;
-  // Skip hidden elements which don't have an offsetParent
-  while (offsetParent === noOffsetParent && element.nextElementSibling) {
-    offsetParent = (element = element.nextElementSibling).offsetParent;
-  }
-
+  var offsetParent = element && element.offsetParent;
  var nodeName = offsetParent && offsetParent.nodeName;

  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
-    return element ? element.ownerDocument.documentElement : document.documentElement;
+    if (element) {
+      return element.ownerDocument.documentElement;
+    }
+
+    return document.documentElement;
  }

  // .offsetParent will return the closest TD or TABLE in case
@@ -31771,14 +31729,29 @@ function getBordersSize(styles, axis) {
  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
 }

+/**
+ * Tells if you are running Internet Explorer 10
+ * @method
+ * @memberof Popper.Utils
+ * @returns {Boolean} isIE10
+ */
+var isIE10 = undefined;
+
+var isIE10$1 = function () {
+  if (isIE10 === undefined) {
+    isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1;
+  }
+  return isIE10;
+};
+
 function getSize(axis, body, html, computedStyle) {
-  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
+  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE10$1() ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
 }

 function getWindowSizes() {
  var body = document.body;
  var html = document.documentElement;
-  var computedStyle = isIE(10) && getComputedStyle(html);
+  var computedStyle = isIE10$1() && getComputedStyle(html);

  return {
    height: getSize('Height', body, html, computedStyle),
@@ -31870,8 +31843,8 @@ function getBoundingClientRect(element) {
  // IE10 10 FIX: Please, don't ask, the element isn't
  // considered in DOM in some circumstances...
  // This isn't reproducible in IE10 compatibility mode of IE11
-  try {
-    if (isIE(10)) {
+  if (isIE10$1()) {
+    try {
      rect = element.getBoundingClientRect();
      var scrollTop = getScroll(element, 'top');
      var scrollLeft = getScroll(element, 'left');
@@ -31879,10 +31852,10 @@ function getBoundingClientRect(element) {
      rect.left += scrollLeft;
      rect.bottom += scrollTop;
      rect.right += scrollLeft;
-    } else {
-      rect = element.getBoundingClientRect();
-    }
-  } catch (e) {}
+    } catch (err) {}
+  } else {
+    rect = element.getBoundingClientRect();
+  }

  var result = {
    left: rect.left,
@@ -31914,9 +31887,7 @@ function getBoundingClientRect(element) {
 }

 function getOffsetRectRelativeToArbitraryNode(children, parent) {
-  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var isIE10 = isIE(10);
+  var isIE10 = isIE10$1();
  var isHTML = parent.nodeName === 'HTML';
  var childrenRect = getBoundingClientRect(children);
  var parentRect = getBoundingClientRect(parent);
@@ -31926,11 +31897,6 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);

-  // In cases where the parent is fixed, we must ignore negative scroll in offset calc
-  if (fixedPosition && parent.nodeName === 'HTML') {
-    parentRect.top = Math.max(parentRect.top, 0);
-    parentRect.left = Math.max(parentRect.left, 0);
-  }
  var offsets = getClientRect({
    top: childrenRect.top - parentRect.top - borderTopWidth,
    left: childrenRect.left - parentRect.left - borderLeftWidth,
@@ -31958,7 +31924,7 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
    offsets.marginLeft = marginLeft;
  }

-  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+  if (isIE10 ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
    offsets = includeScroll(offsets, parent);
  }

@@ -31966,15 +31932,13 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
 }

 function getViewportOffsetRectRelativeToArtbitraryNode(element) {
-  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
  var html = element.ownerDocument.documentElement;
  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
  var width = Math.max(html.clientWidth, window.innerWidth || 0);
  var height = Math.max(html.clientHeight, window.innerHeight || 0);

-  var scrollTop = !excludeScroll ? getScroll(html) : 0;
-  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
+  var scrollTop = getScroll(html);
+  var scrollLeft = getScroll(html, 'left');

  var offset = {
    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
@@ -32005,26 +31969,6 @@ function isFixed(element) {
  return isFixed(getParentNode(element));
 }

-/**
- * Finds the first parent of an element that has a transformed property defined
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} first transformed parent or documentElement
- */
-
-function getFixedPositionOffsetParent(element) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element || !element.parentElement || isIE()) {
-    return document.documentElement;
-  }
-  var el = element.parentElement;
-  while (el && getStyleComputedProperty(el, 'transform') === 'none') {
-    el = el.parentElement;
-  }
-  return el || document.documentElement;
-}
-
 /**
 * Computed the boundaries limits and return them
 * @method
@@ -32033,20 +31977,16 @@ function getFixedPositionOffsetParent(element) {
 * @param {HTMLElement} reference
 * @param {number} padding
 * @param {HTMLElement} boundariesElement - Element used to define the boundaries
- * @param {Boolean} fixedPosition - Is in fixed position mode
 * @returns {Object} Coordinates of the boundaries
 */
 function getBoundaries(popper, reference, padding, boundariesElement) {
-  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-
  // NOTE: 1 DOM access here
-
  var boundaries = { top: 0, left: 0 };
-  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
+  var offsetParent = findCommonOffsetParent(popper, reference);

  // Handle viewport case
  if (boundariesElement === 'viewport') {
-    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
+    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent);
  } else {
    // Handle other cases based on DOM element used as boundaries
    var boundariesNode = void 0;
@@ -32061,7 +32001,7 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
      boundariesNode = boundariesElement;
    }

-    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
+    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent);

    // In case of HTML, we need a different computation
    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
@@ -32162,14 +32102,11 @@ function computeAutoPlacement(placement, refRect, popper, reference, boundariesE
 * @param {Object} state
 * @param {Element} popper - the popper element
 * @param {Element} reference - the reference element (the popper will be relative to this)
- * @param {Element} fixedPosition - is in fixed position mode
 * @returns {Object} An object containing the offsets which will be applied to the popper
 */
 function getReferenceOffsets(state, popper, reference) {
-  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
-  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
+  var commonOffsetParent = findCommonOffsetParent(popper, reference);
+  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent);
 }

 /**
@@ -32342,7 +32279,7 @@ function update() {
  };

  // compute reference element offsets
-  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference, this.options.positionFixed);
+  data.offsets.reference = getReferenceOffsets(this.state, this.popper, this.reference);

  // compute auto placement, store placement inside the data object,
  // modifiers will be able to edit `placement` if needed
@@ -32352,11 +32289,9 @@ function update() {
  // store the computed placement inside `originalPlacement`
  data.originalPlacement = data.placement;

-  data.positionFixed = this.options.positionFixed;
-
  // compute the popper offsets
  data.offsets.popper = getPopperOffsets(this.popper, data.offsets.reference, data.placement);
-  data.offsets.popper.position = this.options.positionFixed ? 'fixed' : 'absolute';
+  data.offsets.popper.position = 'absolute';

  // run the modifiers
  data = runModifiers(this.modifiers, data);
@@ -32396,7 +32331,7 @@ function getSupportedPropertyName(property) {
  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);

-  for (var i = 0; i < prefixes.length; i++) {
+  for (var i = 0; i < prefixes.length - 1; i++) {
    var prefix = prefixes[i];
    var toCheck = prefix ? '' + prefix + upperProp : property;
    if (typeof document.body.style[toCheck] !== 'undefined') {
@@ -32417,12 +32352,9 @@ function destroy() {
  // touch DOM only if `applyStyle` modifier is enabled
  if (isModifierEnabled(this.modifiers, 'applyStyle')) {
    this.popper.removeAttribute('x-placement');
+    this.popper.style.left = '';
    this.popper.style.position = '';
    this.popper.style.top = '';
-    this.popper.style.left = '';
-    this.popper.style.right = '';
-    this.popper.style.bottom = '';
-    this.popper.style.willChange = '';
    this.popper.style[getSupportedPropertyName('transform')] = '';
  }

@@ -32610,12 +32542,12 @@ function applyStyle(data) {
 * @method
 * @memberof Popper.modifiers
 * @param {HTMLElement} reference - The reference element used to position the popper
- * @param {HTMLElement} popper - The HTML element used as popper
+ * @param {HTMLElement} popper - The HTML element used as popper.
 * @param {Object} options - Popper.js options
 */
 function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {
  // compute reference element offsets
-  var referenceOffsets = getReferenceOffsets(state, popper, reference, options.positionFixed);
+  var referenceOffsets = getReferenceOffsets(state, popper, reference);

  // compute auto placement, store placement inside the data object,
  // modifiers will be able to edit `placement` if needed
@@ -32626,7 +32558,7 @@ function applyStyleOnLoad(reference, popper, options, modifierOptions, state) {

  // Apply `position` to popper before anything else because
  // without the position applied we can't guarantee correct computations
-  setStyles(popper, { position: options.positionFixed ? 'fixed' : 'absolute' });
+  setStyles(popper, { position: 'absolute' });

  return options;
 }
@@ -32929,7 +32861,7 @@ function flip(data, options) {
    return data;
  }

-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement, data.positionFixed);
+  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, options.boundariesElement);

  var placement = data.placement.split('-')[0];
  var placementOpposite = getOppositePlacement(placement);
@@ -33221,7 +33153,7 @@ function preventOverflow(data, options) {
    boundariesElement = getOffsetParent(boundariesElement);
  }

-  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement, data.positionFixed);
+  var boundaries = getBoundaries(data.instance.popper, data.instance.reference, options.padding, boundariesElement);
  options.boundaries = boundaries;

  var order = options.priority;
@@ -33718,12 +33650,6 @@ var Defaults = {
   */
  placement: 'bottom',

-  /**
-   * Set this to true if you want popper to position it self in 'fixed' mode
-   * @prop {Boolean} positionFixed=false
-   */
-  positionFixed: false,
-
  /**
   * Whether events (resize, scroll) are initially enabled
   * @prop {Boolean} eventsEnabled=true
@@ -33935,7 +33861,7 @@ return Popper;

 /**!
 * @fileOverview Kickass library to create and place poppers near their reference elements.
- * @version 1.14.0
+ * @version 1.13.0
 * @license
 * Copyright (c) 2016 Federico Zivolo and contributors
 *
@@ -34021,48 +33947,13 @@ function getScrollParent(element) {
      overflowX = _getStyleComputedProp.overflowX,
      overflowY = _getStyleComputedProp.overflowY;

-  if (/(auto|scroll|overlay)/.test(overflow + overflowY + overflowX)) {
+  if (/(auto|scroll)/.test(overflow + overflowY + overflowX)) {
    return element;
  }

  return getScrollParent(getParentNode(element));
 }

-/**
- * Tells if you are running Internet Explorer
- * @method
- * @memberof Popper.Utils
- * @argument {number} version to check
- * @returns {Boolean} isIE
- */
-var cache = {};
-
-var isIE = function () {
-  var version = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'all';
-
-  version = version.toString();
-  if (cache.hasOwnProperty(version)) {
-    return cache[version];
-  }
-  switch (version) {
-    case '11':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1;
-      break;
-    case '10':
-      cache[version] = navigator.appVersion.indexOf('MSIE 10') !== -1;
-      break;
-    case 'all':
-      cache[version] = navigator.userAgent.indexOf('Trident') !== -1 || navigator.userAgent.indexOf('MSIE') !== -1;
-      break;
-  }
-
-  //Set IE
-  cache.all = cache.all || Object.keys(cache).some(function (key) {
-    return cache[key];
-  });
-  return cache[version];
-};
-
 /**
 * Returns the offset parent of the given element
 * @method
@@ -34071,23 +33962,16 @@ var isIE = function () {
 * @returns {Element} offset parent
 */
 function getOffsetParent(element) {
-  if (!element) {
-    return document.documentElement;
-  }
-
-  var noOffsetParent = isIE(10) ? document.body : null;
-
  // NOTE: 1 DOM access here
-  var offsetParent = element.offsetParent;
-  // Skip hidden elements which don't have an offsetParent
-  while (offsetParent === noOffsetParent && element.nextElementSibling) {
-    offsetParent = (element = element.nextElementSibling).offsetParent;
-  }
-
+  var offsetParent = element && element.offsetParent;
  var nodeName = offsetParent && offsetParent.nodeName;

  if (!nodeName || nodeName === 'BODY' || nodeName === 'HTML') {
-    return element ? element.ownerDocument.documentElement : document.documentElement;
+    if (element) {
+      return element.ownerDocument.documentElement;
+    }
+
+    return document.documentElement;
  }

  // .offsetParent will return the closest TD or TABLE in case
@@ -34229,14 +34113,29 @@ function getBordersSize(styles, axis) {
  return parseFloat(styles['border' + sideA + 'Width'], 10) + parseFloat(styles['border' + sideB + 'Width'], 10);
 }

+/**
+ * Tells if you are running Internet Explorer 10
+ * @method
+ * @memberof Popper.Utils
+ * @returns {Boolean} isIE10
+ */
+var isIE10 = undefined;
+
+var isIE10$1 = function () {
+  if (isIE10 === undefined) {
+    isIE10 = navigator.appVersion.indexOf('MSIE 10') !== -1;
+  }
+  return isIE10;
+};
+
 function getSize(axis, body, html, computedStyle) {
-  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE(10) ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
+  return Math.max(body['offset' + axis], body['scroll' + axis], html['client' + axis], html['offset' + axis], html['scroll' + axis], isIE10$1() ? html['offset' + axis] + computedStyle['margin' + (axis === 'Height' ? 'Top' : 'Left')] + computedStyle['margin' + (axis === 'Height' ? 'Bottom' : 'Right')] : 0);
 }

 function getWindowSizes() {
  var body = document.body;
  var html = document.documentElement;
-  var computedStyle = isIE(10) && getComputedStyle(html);
+  var computedStyle = isIE10$1() && getComputedStyle(html);

  return {
    height: getSize('Height', body, html, computedStyle),
@@ -34285,8 +34184,8 @@ function getBoundingClientRect(element) {
  // IE10 10 FIX: Please, don't ask, the element isn't
  // considered in DOM in some circumstances...
  // This isn't reproducible in IE10 compatibility mode of IE11
-  try {
-    if (isIE(10)) {
+  if (isIE10$1()) {
+    try {
      rect = element.getBoundingClientRect();
      var scrollTop = getScroll(element, 'top');
      var scrollLeft = getScroll(element, 'left');
@@ -34294,10 +34193,10 @@ function getBoundingClientRect(element) {
      rect.left += scrollLeft;
      rect.bottom += scrollTop;
      rect.right += scrollLeft;
-    } else {
-      rect = element.getBoundingClientRect();
-    }
-  } catch (e) {}
+    } catch (err) {}
+  } else {
+    rect = element.getBoundingClientRect();
+  }

  var result = {
    left: rect.left,
@@ -34329,9 +34228,7 @@ function getBoundingClientRect(element) {
 }

 function getOffsetRectRelativeToArbitraryNode(children, parent) {
-  var fixedPosition = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-
-  var isIE10 = isIE(10);
+  var isIE10 = isIE10$1();
  var isHTML = parent.nodeName === 'HTML';
  var childrenRect = getBoundingClientRect(children);
  var parentRect = getBoundingClientRect(parent);
@@ -34341,11 +34238,6 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
  var borderTopWidth = parseFloat(styles.borderTopWidth, 10);
  var borderLeftWidth = parseFloat(styles.borderLeftWidth, 10);

-  // In cases where the parent is fixed, we must ignore negative scroll in offset calc
-  if (fixedPosition && parent.nodeName === 'HTML') {
-    parentRect.top = Math.max(parentRect.top, 0);
-    parentRect.left = Math.max(parentRect.left, 0);
-  }
  var offsets = getClientRect({
    top: childrenRect.top - parentRect.top - borderTopWidth,
    left: childrenRect.left - parentRect.left - borderLeftWidth,
@@ -34373,7 +34265,7 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
    offsets.marginLeft = marginLeft;
  }

-  if (isIE10 && !fixedPosition ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
+  if (isIE10 ? parent.contains(scrollParent) : parent === scrollParent && scrollParent.nodeName !== 'BODY') {
    offsets = includeScroll(offsets, parent);
  }

@@ -34381,15 +34273,13 @@ function getOffsetRectRelativeToArbitraryNode(children, parent) {
 }

 function getViewportOffsetRectRelativeToArtbitraryNode(element) {
-  var excludeScroll = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-
  var html = element.ownerDocument.documentElement;
  var relativeOffset = getOffsetRectRelativeToArbitraryNode(element, html);
  var width = Math.max(html.clientWidth, window.innerWidth || 0);
  var height = Math.max(html.clientHeight, window.innerHeight || 0);

-  var scrollTop = !excludeScroll ? getScroll(html) : 0;
-  var scrollLeft = !excludeScroll ? getScroll(html, 'left') : 0;
+  var scrollTop = getScroll(html);
+  var scrollLeft = getScroll(html, 'left');

  var offset = {
    top: scrollTop - relativeOffset.top + relativeOffset.marginTop,
@@ -34420,26 +34310,6 @@ function isFixed(element) {
  return isFixed(getParentNode(element));
 }

-/**
- * Finds the first parent of an element that has a transformed property defined
- * @method
- * @memberof Popper.Utils
- * @argument {Element} element
- * @returns {Element} first transformed parent or documentElement
- */
-
-function getFixedPositionOffsetParent(element) {
-  // This check is needed to avoid errors in case one of the elements isn't defined for any reason
-  if (!element || !element.parentElement || isIE()) {
-    return document.documentElement;
-  }
-  var el = element.parentElement;
-  while (el && getStyleComputedProperty(el, 'transform') === 'none') {
-    el = el.parentElement;
-  }
-  return el || document.documentElement;
-}
-
 /**
 * Computed the boundaries limits and return them
 * @method
@@ -34448,20 +34318,16 @@ function getFixedPositionOffsetParent(element) {
 * @param {HTMLElement} reference
 * @param {number} padding
 * @param {HTMLElement} boundariesElement - Element used to define the boundaries
- * @param {Boolean} fixedPosition - Is in fixed position mode
 * @returns {Object} Coordinates of the boundaries
 */
 function getBoundaries(popper, reference, padding, boundariesElement) {
-  var fixedPosition = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
-
  // NOTE: 1 DOM access here
-
  var boundaries = { top: 0, left: 0 };
-  var offsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
+  var offsetParent = findCommonOffsetParent(popper, reference);

  // Handle viewport case
  if (boundariesElement === 'viewport') {
-    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent, fixedPosition);
+    boundaries = getViewportOffsetRectRelativeToArtbitraryNode(offsetParent);
  } else {
    // Handle other cases based on DOM element used as boundaries
    var boundariesNode = void 0;
@@ -34476,7 +34342,7 @@ function getBoundaries(popper, reference, padding, boundariesElement) {
      boundariesNode = boundariesElement;
    }

-    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent, fixedPosition);
+    var offsets = getOffsetRectRelativeToArbitraryNode(boundariesNode, offsetParent);

    // In case of HTML, we need a different computation
    if (boundariesNode.nodeName === 'HTML' && !isFixed(offsetParent)) {
@@ -34774,14 +34640,11 @@ function getPopperOffsets(popper, referenceOffsets, placement) {
 * @param {Object} state
 * @param {Element} popper - the popper element
 * @param {Element} reference - the reference element (the popper will be relative to this)
- * @param {Element} fixedPosition - is in fixed position mode
 * @returns {Object} An object containing the offsets which will be applied to the popper
 */
 function getReferenceOffsets(state, popper, reference) {
-  var fixedPosition = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
-  var commonOffsetParent = fixedPosition ? getFixedPositionOffsetParent(popper) : findCommonOffsetParent(popper, reference);
-  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent, fixedPosition);
+  var commonOffsetParent = findCommonOffsetParent(popper, reference);
+  return getOffsetRectRelativeToArbitraryNode(reference, commonOffsetParent);
 }

 /**
@@ -34795,7 +34658,7 @@ function getSupportedPropertyName(property) {
  var prefixes = [false, 'ms', 'Webkit', 'Moz', 'O'];
  var upperProp = property.charAt(0).toUpperCase() + property.slice(1);

-  for (var i = 0; i < prefixes.length; i++) {
+  for (var i = 0; i < prefixes.length - 1; i++) {
    var prefix = prefixes[i];
    var toCheck = prefix ? '' + prefix + upperProp : property;
    if (typeof document.body.style[toCheck] !== 'undefined') {
--- a/public/js/frontend/app.js
+++ b/public/js/frontend/app.js
--- a/public/js/frontend/vendor.js
+++ b/public/js/frontend/vendor.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,10 +1,9 @@
 {
-    "/js/admin/app.js": "/js/admin/app.js?id=3ed3c345656238c8deb3",
-    "/js/frontend/app.js": "/js/frontend/app.js?id=e9d1f6af5d93ee637b97",
-    "/assets/admin/vendor/paper-dashboard.css": "/assets/admin/vendor/paper-dashboard.css?id=3bbf7dd2a80739ab63b9",
+    "/js/frontend/app.js": "/js/frontend/app.js?id=3dade2872dd9c5f40690",
+    "/assets/admin/vendor/paper-dashboard.css": "/assets/admin/vendor/paper-dashboard.css?id=1e97d08716e0c4630ae9",
    "/assets/frontend/css/now-ui-kit.css": "/assets/frontend/css/now-ui-kit.css?id=9923ce002ceafb1d740a",
-    "/js/admin/vendor.js": "/js/admin/vendor.js?id=1c5ddb087f24b16da40f",
-    "/js/admin/manifest.js": "/js/admin/manifest.js?id=ce6566a24afe6e358977",
+    "/js/frontend/vendor.js": "/js/frontend/vendor.js?id=e0423758b58fa78616dd",
+    "/js/frontend/manifest.js": "/js/frontend/manifest.js?id=8dc6cd78606fe58b6628",
    "/assets/fonts/glyphicons-halflings-regular.woff2": "/assets/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
    "/assets/admin/fonts/glyphicons-halflings-regular.woff2": "/assets/admin/fonts/glyphicons-halflings-regular.woff2?id=b5b5055c6d812c0f9f0d",
    "/assets/admin/js/icheck.js": "/assets/admin/js/icheck.js?id=14d0d9d9cae155580c5e",
@@ -12,12 +11,12 @@
    "/assets/admin/js/bootstrap-editable.min.js": "/assets/admin/js/bootstrap-editable.min.js?id=3a6eeef3fbdb0d4cf5ba",
    "/assets/admin/img/clear.png": "/assets/admin/img/clear.png?id=0e92f4c3efc6988a3c96",
    "/assets/admin/img/loading.gif": "/assets/admin/img/loading.gif?id=90a4b76b4f11558691f6",
-    "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=cae3dbc399c60b06b967",
-    "/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=ffb4cf337de6d63b3ec6",
+    "/assets/admin/css/vendor.min.css": "/assets/admin/css/vendor.min.css?id=88e01e7683bc0807f1ba",
+    "/assets/admin/js/vendor.js": "/assets/admin/js/vendor.js?id=ae877cb8b94dd56c2e46",
    "/assets/admin/css/blue.png": "/assets/admin/css/blue.png?id=753a3c0dec86d3a38d9c",
    "/assets/admin/css/blue@2x.png": "/assets/admin/css/blue@2x.png?id=97da23d47b838cbd4bef",
    "/assets/system/js/jquery.js": "/assets/system/js/jquery.js?id=6a07da9fae934baf3f74",
-    "/assets/system/js/vendor.js": "/assets/system/js/vendor.js?id=0e6df5b264518fb37f48",
+    "/assets/system/js/vendor.js": "/assets/system/js/vendor.js?id=377bd4e1042239b37046",
    "/assets/system/css/vendor.min.css": "/assets/system/css/vendor.min.css?id=23451051c1ac99cae5fb",
    "/assets/system/css/installer.css": "/assets/system/css/installer.css?id=1101b178b0383008aaa1",
    "/assets/system/js/installer-vendor.js": "/assets/system/js/installer-vendor.js?id=efb330ef732d2f856623"
--- a/resources/stubs/installer/config.stub
+++ b/resources/stubs/installer/config.stub
@@ -13,7 +13,7 @@ return [
        'url' => '$SITE_URL$',

        # Don't forget to change these when live
-        'env' => 'dev',
+        'env' => 'local',
        'debug' => true,
    ],

--- a/resources/views/admin/aircraft/fields.blade.php
+++ b/resources/views/admin/aircraft/fields.blade.php
@@ -1,7 +1,11 @@
 <div class="row">
    <div class="form-group col-sm-6">
        {{ Form::label('subfleet_id', 'Subfleet:') }}
-        {{ Form::select('subfleet_id', $subfleets, null, ['class' => 'form-control select2', 'placeholder' => 'Select 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>

--- a/resources/views/admin/aircraft/index.blade.php
+++ b/resources/views/admin/aircraft/index.blade.php
@@ -4,8 +4,9 @@
@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') }}"><i class="ti-plus"></i>New Aircraft</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')
--- a/resources/views/admin/app.blade.php
+++ b/resources/views/admin/app.blade.php
@@ -27,12 +27,11 @@

    <style type="text/css">
    @yield('css')
-
-    label {
+    /*label {
        text-transform: uppercase;
        font-size: 14px;
        margin: 0;
-    }
+    }*/
    </style>

    <script>
--- a/resources/views/admin/menu.blade.php
+++ b/resources/views/admin/menu.blade.php
@@ -10,13 +10,13 @@

    <div class="collapse" id="operations_menu" aria-expanded="true">
        <ul class="nav">
-            <li><a href="{{ url('/admin/pireps') }}"><i class="pe-7s-cloud-upload"></i>flight reports
+            <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>
            <li><a href="{{ url('/admin/flights') }}"><i class="pe-7s-vector"></i>flights</a></li>
-            <li><a href="{{ url('/admin/aircraft') }}"><i class="pe-7s-plane"></i>fleet</a></li>
+            <li><a href="{{ url('/admin/subfleets') }}"><i class="pe-7s-plane"></i>fleet</a></li>
            <li><a href="{{ url('/admin/fares') }}"><i class="pe-7s-graph2"></i>fares</a></li>
            <li><a href="{{ url('/admin/finances') }}"><i class="pe-7s-display1"></i>finances</a></li>
        </ul>
@@ -31,9 +31,9 @@
    <div class="collapse" id="config_menu" aria-expanded="true">
        <ul class="nav">
            <li><a href="{{ url('/admin/airlines') }}"><i
-                            class="pe-7s-paper-plane"></i>airlines</a></li>
+                   class="pe-7s-paper-plane"></i>airlines</a></li>
            <li><a href="{{ url('/admin/airports') }}"><i
-                            class="pe-7s-map-marker"></i>airports</a></li>
+                   class="pe-7s-map-marker"></i>airports</a></li>
            <li><a href="{{ url('/admin/expenses') }}"><i class="pe-7s-cash"></i>expenses</a></li>
            <li><a href="{{ url('/admin/users') }}"><i class="pe-7s-users"></i>users</a></li>
            <li><a href="{{ url('/admin/ranks') }}"><i class="pe-7s-graph1"></i>ranks</a></li>
--- a/resources/views/admin/pireps/actions.blade.php
+++ b/resources/views/admin/pireps/actions.blade.php
@@ -29,9 +29,11 @@
        </td>
        <td>&nbsp;</td>
        <td>
-            <a href="{{ route('admin.pireps.edit', [$pirep->id]) }}"
-               class='btn btn-info btn-icon'>
-                <i class="fas fa-pencil-alt"></i>&nbsp;Edit</a>
+            <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>
    </tr>
 </table>
--- a/resources/views/admin/subfleets/fields.blade.php
+++ b/resources/views/admin/subfleets/fields.blade.php
@@ -1,9 +1,15 @@
 <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="form-group col-sm-6">
-        {{ Form::label('name', 'Name:') }}
-        {{ Form::text('name', null, ['class' => 'form-control']) }}
-        <p class="text-danger">{{ $errors->first('name') }}</p>
+            Read more about subfleets <a
+                    href="http://docs.phpvms.net/concepts/basics#subfleets-and-aircraft"
+                    target="_new">here</a>.
+
+        @endcomponent
    </div>

    <div class="form-group col-sm-6">
@@ -11,6 +17,13 @@
        {{ Form::text('type', null, ['class' => 'form-control']) }}
        <p class="text-danger">{{ $errors->first('type') }}</p>
    </div>
+
+    <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>
 <div class="row">

--- a/resources/views/admin/subfleets/index.blade.php
+++ b/resources/views/admin/subfleets/index.blade.php
@@ -4,7 +4,7 @@
@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</a></li>
+    <li><a href="{{ route('admin.subfleets.create') }}"><i class="ti-plus"></i>Add New Subfleet</a></li>
@endsection

@section('content')
--- a/resources/views/admin/subfleets/table.blade.php
+++ b/resources/views/admin/subfleets/table.blade.php
@@ -4,19 +4,20 @@
        <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.subfleets.edit', [$subfleet->id]) }}">
+                <a href="{{ route('admin.aircraft.index') }}?subfleet={{$subfleet->id}}">
                {{ $subfleet->name }}
                </a>
            </td>
            <td>{{ $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/webpack.mix.js
+++ b/webpack.mix.js
@@ -37,8 +37,6 @@ mix.sass('public/assets/admin/vendor/sass/paper-dashboard.scss',
 mix.styles([
  'node_modules/bootstrap3/dist/css/bootstrap.css',
  'public/assets/admin/vendor/animate.css',
-  'node_modules/select2/dist/css/select2.css',
-  'node_modules/leaflet/dist/leaflet.css',
  'node_modules/icheck/skins/square/blue.css',
  'node_modules/x-editable/dist/bootstrap3-editable/css/bootstrap-editable.css',
  'public/assets/admin/vendor/paper-dashboard.css',