diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index e5506df2..0a0f02f2 100755
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -1,19 +1,24 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used during authentication for various
-    | messages that we need to display to the user. You are free to modify
-    | these language lines according to your application's requirements.
-    |
-    */
-
-    'failed' => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
-
+    'failed'                   => 'These credentials do not match our records.',
+    'throttle'                 => 'Too many login attempts. Please try again in :seconds seconds.',
+    'login'                    => 'Log In',
+    'password'                 => 'Password',
+    'createaccount'            => 'Create Account',
+    'forgotpassword'           => 'Forgot Password',
+    'fullname'                 => 'Full Name',
+    'emailaddress'             => 'Email Address',
+    'fillcaptcha'              => 'Fill out the captcha',
+    'tocaccept'                => 'By registering, you agree to the Terms and Conditions.',
+    'register'                 => 'Register',
+    'registrationpending'      => 'Registration Pending',
+    'pendingmessage'           => 'Your registration is pending approval. Please check your email!',
+    'registrationsubmitted'    => 'Registration Submitted',
+    'registrationconfirmation' => 'Registration Confirmation',
+    'confirmationmessage'      => 'Your application has been submitted. It requires staff member approval, once a\nstaff member has reviewed your application, you will receive a confirmation email.',
+    'registrationdenied'       => 'Registration Denied',
+    'deniedmessage'            => 'Your registration was denied. Please contact an administrator.',
+    'accountsuspended'         => 'Account Suspended',
+    'suspendedmessage'         => 'Your account has been suspended. Please contact an administrator.',
 ];
diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php
index be64a90c..fb7b4ec3 100644
--- a/resources/lang/it/auth.php
+++ b/resources/lang/it/auth.php
@@ -1,19 +1,24 @@
 <?php
 
 return [
-
-    /*
-    |--------------------------------------------------------------------------
-    | Authentication Language Lines
-    |--------------------------------------------------------------------------
-    |
-    | The following language lines are used during authentication for various
-    | messages that we need to display to the user. You are free to modify
-    | these language lines according to your application's requirements.
-    |
-    */
-
-    'failed' => 'Queste credenziali non sono presenti nei nostri archivi.',
-    'throttle' => 'Troppi tentativi di login. Tenta di nuovo tra :seconds secondi per favore.',
-
+    'failed'                   => 'Queste credenziali non sono presenti nei nostri archivi.',
+    'throttle'                 => 'Troppi tentativi di login. Tenta di nuovo tra :seconds secondi per favore.',
+    'login'                    => 'Accedi',
+    'password'                 => 'Password',
+    'createaccount'            => 'Crea Account',
+    'forgotpassword'           => 'Password Dimenticata',
+    'fullname'                 => 'Nome Completo',
+    'emailaddress'             => 'Indirizzo Email',
+    'fillcaptcha'              => 'Compila la captcha',
+    'tocaccept'                => 'Registrandoti confermi di accettare i Termini e le Condizioni di Utilizzo.',
+    'register'                 => 'Registrati',
+    'registrationpending'      => 'Registrazione in Sospeso',
+    'pendingmessage'           => 'La tua registrazione è in attesa di approvazione. Controlla la tua email per favore.',
+    'registrationsubmitted'    => 'Registrazione Inviata',
+    'registrationconfirmation' => 'Conferma di Registrazione',
+    'confirmationmessage'      => 'La tua richiesta è stata inviata e richiede l\'approvazione di un membro dello staff. Quando\nverrà esaminata, riceverai una email di conferma.',
+    'registrationdenied'       => 'Registrazione Negata',
+    'deniedmessage'            => 'La tua registrazione è stata rifiutata. Contatta un amministratore per favore.',
+    'accountsuspended'         => 'Account Sospeso',
+    'suspendedmessage'         => 'Il tuo account è stato sospeso. Contatta un amministratore per favore.',
 ];
diff --git a/resources/views/layouts/default/acars/index.blade.php b/resources/views/layouts/default/acars/index.blade.php
index 2093eb12..5474abb3 100644
--- a/resources/views/layouts/default/acars/index.blade.php
+++ b/resources/views/layouts/default/acars/index.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.global.livemap'))
+@section('title', __('common.livemap'))
 
 @section('content')
     {{ Widget::liveMap() }}
diff --git a/resources/views/layouts/default/auth/login.blade.php b/resources/views/layouts/default/auth/login.blade.php
index 6426f5b5..056ad9e5 100644
--- a/resources/views/layouts/default/auth/login.blade.php
+++ b/resources/views/layouts/default/auth/login.blade.php
@@ -1,5 +1,5 @@
 @extends('auth.layout')
-@section('title', trans('frontend.global.login'))
+@section('title', __('auth.login'))
 
 @section('content')
 <div class="col-md-4 content-center">
@@ -18,7 +18,7 @@
                     {{
                         Form::text('email', old('email'), [
                             'id' => 'email',
-                            'placeholder' => trans('frontend.global.email'),
+                            'placeholder' => __('common.email'),
                             'class' => 'form-control',
                             'required' => true,
                         ])
@@ -38,7 +38,7 @@
                         Form::password('password', [
                             'name' => 'password',
                             'class' => 'form-control',
-                            'placeholder' => trans('frontend.auth.password'),
+                            'placeholder' => __('auth.password'),
                             'required' => true,
                         ])
                     }}
@@ -51,16 +51,16 @@
 
             </div>
             <div class="footer text-center">
-                <button href="#pablo" class="btn btn-primary btn-round btn-lg btn-block">@lang('frontend.auth.login')</button>
+                <button class="btn btn-primary btn-round btn-lg btn-block">@lang('auth.login')</button>
             </div>
             <div class="pull-left">
                 <h6>
-                    <a href="{{ url('/register') }}" class="link">@lang('frontend.auth.createaccount')</a>
+                    <a href="{{ url('/register') }}" class="link">@lang('auth.createaccount')</a>
                 </h6>
             </div>
             <div class="pull-right">
                 <h6>
-                    <a href="{{ url('/password/reset') }}" class="link">@lang('frontend.auth.forgotpassword')?</a>
+                    <a href="{{ url('/password/reset') }}" class="link">@lang('auth.forgotpassword')?</a>
                 </h6>
             </div>
         {{ Form::close() }}
diff --git a/resources/views/layouts/default/auth/pending.blade.php b/resources/views/layouts/default/auth/pending.blade.php
index 611bf173..cc29d2b3 100644
--- a/resources/views/layouts/default/auth/pending.blade.php
+++ b/resources/views/layouts/default/auth/pending.blade.php
@@ -1,12 +1,12 @@
 @extends('app')
-@section('title', trans('frontend.auth.registrationpending'))
+@section('title', __('auth.registrationpending'))
 
 @section('content')
 <div class="row">
     <div class="col-md-12 " style="text-align: center;">
         <div class="flex-center position-ref full-height">
             <div class="title m-b-md">
-                <h2 class="description">@lang('frontend.auth.pendingmessage')</h2>
+                <h2 class="description">@lang('auth.pendingmessage')</h2>
             </div>
         </div>
     </div>
diff --git a/resources/views/layouts/default/auth/register.blade.php b/resources/views/layouts/default/auth/register.blade.php
index d71f843d..0398e44b 100644
--- a/resources/views/layouts/default/auth/register.blade.php
+++ b/resources/views/layouts/default/auth/register.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.global.register'))
+@section('title', __('auth.register'))
 
 @section('content')
 <div class="row">
@@ -11,7 +11,7 @@
     <div class="panel periodic-login">
         <div class="panel-body">
             <h2>@lang('common.register')</h2>
-            <label for="name" class="control-label">@lang('frontend.auth.fullname')</label>
+            <label for="name" class="control-label">@lang('auth.fullname')</label>
             <div class="input-group form-group-no-border {{ $errors->has('name') ? 'has-danger' : '' }}">
                 {{ Form::text('name', null, ['class' => 'form-control']) }}
             </div>
@@ -19,7 +19,7 @@
             <p class="text-danger">{{ $errors->first('name') }}</p>
             @endif
 
-            <label for="email" class="control-label">@lang('frontend.auth.emailaddress')</label>
+            <label for="email" class="control-label">@lang('auth.emailaddress')</label>
             <div class="input-group form-group-no-border {{ $errors->has('email') ? 'has-danger' : '' }}">
                 {{ Form::text('email', null, ['class' => 'form-control']) }}
             </div>
@@ -59,7 +59,7 @@
                 <p class="text-danger">{{ $errors->first('timezone') }}</p>
             @endif
 
-            <label for="password" class="control-label">@lang('frontend.auth.password')</label>
+            <label for="password" class="control-label">@lang('auth.password')</label>
             <div class="input-group form-group-no-border {{ $errors->has('password') ? 'has-danger' : '' }}">
                 {{ Form::password('password', ['class' => 'form-control']) }}
             </div>
@@ -76,7 +76,7 @@
             @endif
 
             @if(config('captcha.enabled'))
-                <label for="g-recaptcha-response" class="control-label">@lang('frontend.auth.fillcaptcha')</label>
+                <label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
                 <div class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
                     {!! NoCaptcha::display(config('captcha.attributes')) !!}
                 </div>
@@ -88,8 +88,8 @@
             @include('auth.toc')
 
             <div style="width: 100%; text-align: right; padding-top: 20px;">
-                @lang('frontend.auth.tocaccept')<br /><br />
-                {{ Form::submit(trans('frontend.auth.register'), ['class' => 'btn btn-primary']) }}
+                @lang('auth.tocaccept')<br /><br />
+                {{ Form::submit(__('auth.register'), ['class' => 'btn btn-primary']) }}
             </div>
 
         </div>
diff --git a/resources/views/layouts/default/auth/registered.blade.php b/resources/views/layouts/default/auth/registered.blade.php
index 9889ca50..17c68ae1 100644
--- a/resources/views/layouts/default/auth/registered.blade.php
+++ b/resources/views/layouts/default/auth/registered.blade.php
@@ -1,11 +1,11 @@
 @extends('app')
-@section('title', trans('frontend.auth.registrationsubmitted'))
+@section('title', __('auth.registrationsubmitted'))
 
 @section('content')
 <div class="container registered-page">
-    <h3>@lang('frontend.auth.registrationconfirmation')</h3>
+    <h3>@lang('auth.registrationconfirmation')</h3>
     <p>
-        @lang('frontend.auth.confirmationmessage')
+        @lang('auth.confirmationmessage')
     </p>
 </div>
 @endsection
diff --git a/resources/views/layouts/default/auth/rejected.blade.php b/resources/views/layouts/default/auth/rejected.blade.php
index d6d06402..f3bd198f 100644
--- a/resources/views/layouts/default/auth/rejected.blade.php
+++ b/resources/views/layouts/default/auth/rejected.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.auth.registrationdenied'))
+@section('title', __('auth.registrationdenied'))
 
 @section('content')
 <div class="row">
@@ -7,7 +7,7 @@
         <div class="flex-center position-ref full-height">
             <div class="title m-b-md">
                 <h2 class="description">
-                @lang('frontend.auth.deniedmessage')
+                @lang('auth.deniedmessage')
                 </h2>
             </div>
         </div>
diff --git a/resources/views/layouts/default/auth/suspended.blade.php b/resources/views/layouts/default/auth/suspended.blade.php
index 51610a60..7a187007 100644
--- a/resources/views/layouts/default/auth/suspended.blade.php
+++ b/resources/views/layouts/default/auth/suspended.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.auth.accountsuspended'))
+@section('title', __('auth.accountsuspended'))
 
 @section('content')
 <div class="row">
@@ -7,7 +7,7 @@
         <div class="flex-center position-ref full-height">
             <div class="title m-b-md">
                 <h2 class="description">
-                @lang('frontend.auth.suspendedmessage')
+                @lang('auth.suspendedmessage')
                 </h2>
             </div>
         </div>
diff --git a/resources/views/layouts/default/dashboard/index.blade.php b/resources/views/layouts/default/dashboard/index.blade.php
index 3313fa00..7497c976 100644
--- a/resources/views/layouts/default/dashboard/index.blade.php
+++ b/resources/views/layouts/default/dashboard/index.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.global.dashboard'))
+@section('title', __('common.dashboard'))
 
 @section('content')
 <div class="row">
diff --git a/resources/views/layouts/default/flights/search.blade.php b/resources/views/layouts/default/flights/search.blade.php
index 4058419f..b219323a 100644
--- a/resources/views/layouts/default/flights/search.blade.php
+++ b/resources/views/layouts/default/flights/search.blade.php
@@ -23,7 +23,7 @@
             </div>
 
             <div class="clear" style="margin-top: 10px;">
-                {{ Form::submit(trans('frontend.global.find'), ['class' => 'btn btn-primary']) }}&nbsp;
+                {{ Form::submit(__('common.find'), ['class' => 'btn btn-primary']) }}&nbsp;
                 <a href="{{ route('frontend.flights.index') }}">@lang('common.reset')</a>
             </div>
             {{ Form::close() }}
diff --git a/resources/views/layouts/default/flights/table.blade.php b/resources/views/layouts/default/flights/table.blade.php
index 57c41c24..5ed34244 100644
--- a/resources/views/layouts/default/flights/table.blade.php
+++ b/resources/views/layouts/default/flights/table.blade.php
@@ -49,7 +49,7 @@
                 @if($flight->arr_time), {{ $flight->arr_time }}@endif
                 <br />
                 @if($flight->distance)
-                    <span class="title">{{ strtoupper(trans('frontend.global.distance')) }}&nbsp;</span>
+                    <span class="title">{{ strtoupper(__('common.distance')) }}&nbsp;</span>
                     {{ $flight->distance }} {{ setting('units.distance') }}
                 @endif
                 <br />
@@ -61,7 +61,7 @@
             <div class="col-sm-7">
                 <div class="row">
                     <div class="col-sm-12">
-                        <span class="title">{{ strtoupper(trans('frontend.global.route')) }}&nbsp;</span>
+                        <span class="title">{{ strtoupper(__('common.route')) }}&nbsp;</span>
                         {{ $flight->route }}
                     </div>
                 </div>
diff --git a/resources/views/layouts/default/pireps/fields.blade.php b/resources/views/layouts/default/pireps/fields.blade.php
index afcaad2b..6042e178 100644
--- a/resources/views/layouts/default/pireps/fields.blade.php
+++ b/resources/views/layouts/default/pireps/fields.blade.php
@@ -26,7 +26,7 @@ flight reports that have been filed. You've been warned!
             <div class="form-container-body">
                 <div class="row">
                     <div class="col-sm-4">
-                        {{ Form::label('airline_id', trans('frontend.global.airline')) }}
+                        {{ Form::label('airline_id', __('common.airline')) }}
                         @if(!empty($pirep) && $pirep->read_only)
                             <p>{{ $pirep->airline->name }}</p>
                             {{ Form::hidden('airline_id') }}
@@ -52,7 +52,7 @@ flight reports that have been filed. You've been warned!
                         @else
                             <div class="input-group input-group-sm mb3">
                                 {{ Form::text('flight_number', null, [
-                                    'placeholder' => trans('frontend.global.flightnumber'),
+                                    'placeholder' => __('common.flightnumber'),
                                     'class' => 'form-control',
                                     'readonly' => (!empty($pirep) && $pirep->read_only),
                                 ]) }}
@@ -96,7 +96,7 @@ flight reports that have been filed. You've been warned!
 
                 <div class="row">
                     <div class="col-3">
-                        {{ Form::label('hours', trans('frontend.global.flighttime')) }}
+                        {{ Form::label('hours', __('common.flighttime')) }}
                         @if(!empty($pirep) && $pirep->read_only)
                             <p>
                                 {{ $pirep->hours.' '.trans_choice('common.hour', $pirep->hours) }}, {{ $pirep->minutes.' '.trans_choice('common.minute', $pirep->minutes) }}
@@ -163,7 +163,7 @@ flight reports that have been filed. You've been warned!
             <div class="form-container-body">
                 <div class="row">
                     <div class="col-6">
-                        {{ Form::label('dpt_airport_id', trans('frontend.global.departureairport')) }}
+                        {{ Form::label('dpt_airport_id', __('common.departureairport')) }}
                         @if(!empty($pirep) && $pirep->read_only)
                             {{ $pirep->dpt_airport->name }}
                             (<a href="{{route('frontend.airports.show', [
@@ -183,7 +183,7 @@ flight reports that have been filed. You've been warned!
                     </div>
 
                     <div class="col-6">
-                        {{ Form::label('arr_airport_id', trans('frontend.global.arrivalairport')) }}
+                        {{ Form::label('arr_airport_id', __('common.arrivalairport')) }}
                         @if(!empty($pirep) && $pirep->read_only)
                             {{ $pirep->arr_airport->name }}
                             (<a href="{{route('frontend.airports.show', [
@@ -212,7 +212,7 @@ flight reports that have been filed. You've been warned!
             <div class="form-container-body">
                 <div class="row">
                     <div class="col">
-                        {{ Form::label('aircraft_id', trans('frontend.global.aircraft')) }}
+                        {{ Form::label('aircraft_id', __('common.aircraft')) }}
                         @if(!empty($pirep) && $pirep->read_only)
                             <p>{{ $pirep->aircraft->name }}</p>
                             {{ Form::hidden('aircraft_id') }}
@@ -240,7 +240,7 @@ flight reports that have been filed. You've been warned!
                 <div class="row">
                     <div class="col">
                         <div class="input-group input-group-sm form-group">
-                            {{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => trans('frontend.global.route')]) }}
+                            {{ Form::textarea('route', null, ['class' => 'form-control', 'placeholder' => __('common.route')]) }}
                             <p class="text-danger">{{ $errors->first('route') }}</p>
                         </div>
                     </div>
diff --git a/resources/views/layouts/default/profile/index.blade.php b/resources/views/layouts/default/profile/index.blade.php
index cea62529..a20296f6 100644
--- a/resources/views/layouts/default/profile/index.blade.php
+++ b/resources/views/layouts/default/profile/index.blade.php
@@ -1,5 +1,5 @@
 @extends('app')
-@section('title', trans('frontend.global.profile'))
+@section('title', __('common.profile'))
 
 @section('content')
 <div class="row profile-page content-center text-color-dark-beige">