diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index d597cdb6f8..2a31d75ca8 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -565,7 +565,7 @@ class AssetsController extends Controller
         if (!ini_get("auto_detect_line_endings")) {
             ini_set("auto_detect_line_endings", '1');
         }
-        $csv = Reader::createFromPath(Input::file('user_import_csv'));
+        $csv = Reader::createFromPath($request->file('user_import_csv'));
         $csv->setHeaderOffset(0);
         $results = $csv->getRecords();
         $item = array();
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index fb412c6e1e..8b69e5a6fe 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -186,7 +186,7 @@ class SettingsController extends Controller
             Auth::login($user, true);
             $settings->save();
 
-            if ('1' == Input::get('email_creds')) {
+            if ('1' == get('email_creds')) {
                 $data               = [];
                 $data['email']      = $user->email;
                 $data['username']   = $user->username;
@@ -347,7 +347,7 @@ class SettingsController extends Controller
 
         $setting->depreciation_method = $request->input('depreciation_method');
 
-        if ('' != Input::get('per_page')) {
+        if ('' != get('per_page')) {
             $setting->per_page = $request->input('per_page');
         } else {
             $setting->per_page = 200;
@@ -1146,10 +1146,10 @@ class SettingsController extends Controller
      *
      * @return View
      */
-    public function postPurge()
+    public function postPurge(Request $request)
     {
         if (! config('app.lock_passwords')) {
-            if ('DELETE' == Input::get('confirm_purge')) {
+            if ('DELETE' == $request->get('confirm_purge')) {
                 // Run a backup immediately before processing
                 Artisan::call('backup:run');
                 Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);
diff --git a/public/css/build/app.css b/public/css/build/app.css
index 109e376074..ef505aa4ce 100644
Binary files a/public/css/build/app.css and b/public/css/build/app.css differ
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 1ecd7d01f3..6e4e056a0c 100644
Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index c8393e096c..18a2bc6e5d 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/js/build/app.js b/public/js/build/app.js
index e9fa9cd367..7a3564a5a0 100644
Binary files a/public/js/build/app.js and b/public/js/build/app.js differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 450dce89c6..3b3da83b9f 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 4d079dfba0..3168c675dd 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=041c2c23e0a7e285999d",
+    "/js/build/app.js": "/js/build/app.js?id=32ad11cb23fc92588929",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
-    "/css/build/app.css": "/css/build/app.css?id=3911a887c2bdc7d0b528",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=688f59cd273484405f9b",
+    "/css/build/app.css": "/css/build/app.css?id=a57b2b79587cb8368899",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=4f146f545931890d557e",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9fa704134cfacfacab93",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=2f665cf40d7348b3f94c",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71c178700d68294e3413",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
-    "/css/dist/all.css": "/css/dist/all.css?id=cd644954b1fc39b7f25b",
+    "/css/dist/all.css": "/css/dist/all.css?id=3a890130fb96565185d5",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0cfa39cacd9c83b4f53b",
@@ -34,5 +34,5 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62",
     "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1",
-    "/js/dist/all.js": "/js/dist/all.js?id=451bd5a52c473c82fd71"
+    "/js/dist/all.js": "/js/dist/all.js?id=3fade7209d054eb18a72"
 }
diff --git a/resources/assets/js/components/importer/importer-file.vue b/resources/assets/js/components/importer/importer-file.vue
index 8dba9fe5d9..a5c0725418 100644
--- a/resources/assets/js/components/importer/importer-file.vue
+++ b/resources/assets/js/components/importer/importer-file.vue
@@ -1,17 +1,20 @@
 <template>
+
     <div v-show="processDetail" class="col-md-6 col-md-offset-3">
 
-        <div class="row">
+            <div class="row">
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="import-type">Import Type:</label>
                     </div>
+
                     <div class="col-md-7 col-xs-12">
                         <select2 :options="options.importTypes" v-model="options.importType" required>
                             <option disabled value="0"></option>
                         </select2>
                     </div>
-                </div>
+
+                </div><!-- /dynamic-form-row -->
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="import-update">Update Existing Values?:</label>
@@ -19,7 +22,8 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="import-update" v-model="options.update">
                     </div>
-                </div>
+                </div><!-- /dynamic-form-row -->
+
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="send-welcome">Send Welcome Email for new Users?</label>
@@ -27,7 +31,8 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome">
                     </div>
-                </div>
+                </div><!-- /dynamic-form-row -->
+
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="run-backup">Backup before importing?</label>
@@ -35,14 +40,15 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup">
                     </div>
-                </div>
-            </div>
-            <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
-                 :class="alertClass"
-                 v-if="statusText">
-                {{ this.statusText }}
-            </div>
-        </div>
+                </div><!-- /dynamic-form-row -->
+
+                <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
+                     :class="alertClass"
+                     v-if="statusText">
+                    {{ this.statusText }}
+                </div><!-- /alert -->
+        </div> <!-- /div row -->
+
         <div class="row">
             <div class="col-md-2"></div>
             <div class="col-md-8" style="padding-top: 30px;">
@@ -50,7 +56,7 @@
                 <div class="col-md-4"><h4>Import Field</h4></div>
                 <div class="col-md-4"><h4>Sample Value</h4></div>
             </div>
-        </div>
+        </div><!-- /div row -->
 
         <template v-for="(header, index) in file.header_row">
             <div class="row">
@@ -69,8 +75,8 @@
                     <div class="col-md-4">
                         <p class="form-control-static">{{ activeFile.first_row[index] }}</p>
                     </div>
-                </div>
-            </div>
+                </div><!-- /div col-md-8 -->
+            </div><!-- /div row -->
         </template>
 
         <div class="row">
@@ -79,17 +85,17 @@
                 <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
                 <br><br>
             </div>
-        </div>
+        </div><!-- /div row -->
         <div class="row">
             <div class="alert col-md-8 col-md-offset-2" style="padding-top: 20px;"
                  :class="alertClass"
                  v-if="statusText">
                 {{ this.statusText }}
             </div>
-        </div>
+        </div><!-- /div row -->
 
+    </div><!-- /div v-show -->
 
-    </div>
 </template>
 
 <script>
diff --git a/resources/assets/js/components/passport/Clients.vue b/resources/assets/js/components/passport/Clients.vue
index ee5db67742..81c1903c16 100644
--- a/resources/assets/js/components/passport/Clients.vue
+++ b/resources/assets/js/components/passport/Clients.vue
@@ -83,7 +83,7 @@
                     <div class="modal-header">
                         <button type="button " class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-                        <h4 class="modal-title">
+                        <h2 class="modal-title">
                             Create Client
                         </h2>
                     </div>
@@ -153,7 +153,7 @@
 
                         <h4 class="modal-title">
                             Edit Client
-                        </h2>
+                        </h4>
                     </div>
 
                     <div class="modal-body">
diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less
index a0ac196358..94f5f4098b 100644
--- a/resources/assets/less/app.less
+++ b/resources/assets/less/app.less
@@ -137,13 +137,13 @@ a.accordion-header {
   width: 100%;
 }
 .error input {
-  color: #dd4b39;
-  border: 2px solid #dd4b39 !important;
+  color: #a94442;
+  border: 2px solid #a94442 !important;
 }
 
 .error label,
 .alert-msg {
-  color: #dd4b39;
+  color: #a94442;
   display: block;
 }
 
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index d189a90796..87c44e2a01 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -156,12 +156,12 @@ a.accordion-header {
   width: 100%;
 }
 .error input {
-  color: #dd4b39;
-  border: 2px solid #dd4b39 !important;
+  color: #a94442;
+  border: 2px solid #a94442 !important;
 }
 
 .error label, .alert-msg {
-  color: #dd4b39;
+  color: #a94442;
   display: block;
 }
 
@@ -552,3 +552,7 @@ th.css-accessory > .th-inner::before
   padding: 6px 12px;
   height: 34px;
 }
+
+.form-group.has-error label {
+  color: #a94442;
+}
\ No newline at end of file
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 508b368d6f..16b6d877eb 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -33,7 +33,7 @@
             <label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label>
             <div class="input-group col-md-3">
               <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date') }}">
+                <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date') }}">
                 <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
               </div>
               {!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
@@ -44,7 +44,7 @@
              <label for="expected_checkin" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
              <div class="input-group col-md-3">
                   <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-                      <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ Input::old('expected_checkin') }}">
+                      <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
                       <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                  </div>
                  {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index a0ecb9e851..44ee626683 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -742,7 +742,17 @@
         <section class="content-header" style="padding-bottom: 30px;">
           <h1 class="pull-left">
             @yield('title')
+
+
           </h1>
+
+            @if (isset($helpText))
+            @include ('partials.more-info',
+                                   [
+                                       'helpText' => $helpText,
+                                       'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
+                                   ])
+            @endif
           <div class="pull-right">
             @yield('header_right')
           </div>
diff --git a/resources/views/layouts/edit-form.blade.php b/resources/views/layouts/edit-form.blade.php
index 03557765ed..20a8c99e71 100644
--- a/resources/views/layouts/edit-form.blade.php
+++ b/resources/views/layouts/edit-form.blade.php
@@ -24,48 +24,37 @@
 <!-- row -->
 <div class="row">
     <!-- col-md-8 -->
-    <div class="col-md-8 col-md-offset-2">
+    <div class="col-lg-8 col-lg-offset-2 col-md-10 col-md-offset-1 col-sm-12 col-sm-offset-0">
 
         <form id="create-form" class="form-horizontal" method="post" action="{{ (isset($formAction)) ? $formAction : \Request::url()  }}" autocomplete="off" role="form" enctype="multipart/form-data">
 
         <!-- box -->
         <div class="box box-default">
             <!-- box-header -->
-            <div class="box-header{{  ($item->id) ? ' with-border' : ''  }}">
+            <div class="box-header with-border text-right">
 
-            <div class="box-title col-md-12" style="min-height: 20px;">
+                <div class="col-md-12 box-title text-right" style="padding: 0px; margin: 0px;">
 
-                <div class="col-md-12">
-
-                    @if (isset($helpText))
-                        <div class="col-md-1 text-left" style="horiz-align: center;">
-                        @include ('partials.more-info',
-                            [
-                                'helpText' => $helpText,
-                                'helpPosition' => (isset($helpPosition)) ? $helpPosition : 'left'
-                            ])
-                        </div>
-                    @endif
-
-                        @if ($item->id)
-                            <div class="col-md-9">
-                                <h2 class="box-title">
+                    <div class="col-md-12" style="padding: 0px; margin: 0px;">
+                        <div class="col-md-9 text-left">
+                            @if ($item->id)
+                                <h2 class="box-title text-left" style="padding-top: 8px;">
                                     {{ $item->display_name }}
                                 </h2>
-                            </div>
-                        @endif
+                            @endif
+                        </div>
+                        <div class="col-md-3 text-right" style="padding-right: 10px;">
+                            <a class="btn btn-link text-left" href="{{ URL::previous() }}">
+                                {{ trans('button.cancel') }}
+                            </a>
+                            <button type="submit" class="btn btn-primary">
+                                <i class="fa fa-check icon-white" aria-hidden="true"></i>
+                                {{ trans('general.save') }}
+                            </button>
+                        </div>
+                    </div>
+                </div>
 
-                        @if ((isset($topSubmit)) && ($topSubmit =='true'))
-                            <div class="col-md-2 text-right">
-                            @include('partials.forms.edit.submit-button')
-                            </div>
-                        @endif
-
-                </div> <!-- /div.row -->
-
-
-
-            </div><!-- /.box-header -->
             </div><!-- /.box-header -->
 
             <!-- box-body -->
diff --git a/resources/views/partials/more-info.blade.php b/resources/views/partials/more-info.blade.php
index 7a00c10bea..0c45ca4eb8 100644
--- a/resources/views/partials/more-info.blade.php
+++ b/resources/views/partials/more-info.blade.php
@@ -1 +1,3 @@
-<a href="#" class="text-dark-gray pull-left" tabindex="0" role="button" data-toggle="popover" data-trigger="focus"  data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'right'  }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Info Missing'  }}"><i class="fa fa-life-ring fa-2x"></i></a>
+<a style="padding-left: 10px; font-size: 18px;" class="text-dark-gray" data-trigger="focus" tabindex="0" role="button" data-toggle="popover" title="More Info" data-placement="{{ (isset($helpPosition)) ? $helpPosition : 'right'  }}" data-html="true" data-content="{{ (isset($helpText)) ? $helpText : 'Help Info Missing'  }}">
+    <i class="fa fa-life-ring" aria-hidden="true"><span class="sr-only">More Info</span></i>
+</a>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 6fb5dec20f..aceb96f6b7 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -476,7 +476,7 @@
                     <td>{!!$accessory->present()->nameUrl()!!}</td>
                     <td class="hidden-print">
                       @can('checkin', $accessory)
-                        <a href="{{ route('checkin/accessory', array('accessory_id'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
+                        <a href="{{ route('checkin/accessory', array('accessoryID'=> $accessory->pivot->id, 'backto'=>'user')) }}" class="btn btn-primary btn-sm hidden-print">{{ trans('general.checkin') }}</a>
                       @endcan
                     </td>
                   </tr>