diff --git a/resources/views/account/accept/create.blade.php b/resources/views/account/accept/create.blade.php
index e5725e4897..c05bc3a892 100644
--- a/resources/views/account/accept/create.blade.php
+++ b/resources/views/account/accept/create.blade.php
@@ -43,35 +43,39 @@
             <div class="col-sm-12 col-sm-offset-1 col-md-10 col-md-offset-1">
                 <div class="panel box box-default">
                     <div class="box-body">
+                        <div class="col-md-12">
                         @if ($acceptance->checkoutable->getEula())
                             <div id="eula_div" style="padding-bottom: 20px">
                                 {!!  $acceptance->checkoutable->getEula() !!}
                             </div>
                         @endif
-
+                        </div>
+                        <div class="col-md-12">
                         <h3>{{$acceptance->checkoutable->present()->name()}}</h3>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" class="minimal" name="asset_acceptance" id="accepted" value="accepted">
+                        </div>
+                        <div class="col-md-12">
+                            <label class="form-control">
+                                <input type="radio" name="asset_acceptance" id="accepted" value="accepted">
                                 {{trans('general.i_accept')}}
                             </label>
-                        </div>
-                        <div class="radio">
-                            <label>
-                                <input type="radio" class="minimal" name="asset_acceptance" id="declined" value="declined">
+                            <label class="form-control">
+                                <input type="radio" name="asset_acceptance" id="declined" value="declined">
                                 {{trans('general.i_decline')}}
                             </label>
+
                         </div>
 
                         @if ($snipeSettings->require_accept_signature=='1')
-                            <h3 style="padding-top: 20px">{{trans('general.sign_tos')}}</h3>
-                            <div id="signature-pad" class="m-signature-pad">
-                                <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
-                                    <canvas></canvas>
-                                    <input type="hidden" name="signature_output" id="signature_output">
-                                </div>
-                                <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
-                                    <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
+                            <div class="col-md-12">
+                                <h3 style="padding-top: 20px">{{trans('general.sign_tos')}}</h3>
+                                <div id="signature-pad" class="m-signature-pad">
+                                    <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
+                                        <canvas></canvas>
+                                        <input type="hidden" name="signature_output" id="signature_output">
+                                    </div>
+                                    <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
+                                        <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{trans('general.clear_signature')}}</button>
+                                    </div>
                                 </div>
                             </div>
                         @endif
diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 86abc7aff9..887624c85f 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -107,11 +107,11 @@
         @if (($user->avatar) && ($user->avatar!=''))
           <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
             <div class="col-md-9 col-md-offset-3">
-              <label for="image_delete">
-                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['class'=>'minimal','aria-label'=>'image_delete']) }}
+              <label for="image_delete" class="form-control">
+                {{ Form::checkbox('image_delete', '1', old('image_delete'), ['id' => 'image_delete', 'aria-label'=>'image_delete']) }}
                 {{ trans('general.image_delete') }}
-                {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
               </label>
+              {!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
             </div>
           </div>
           <div class="form-group">
@@ -132,9 +132,9 @@
         <div class="form-group {{ $errors->has('two_factor_optin') ? 'has-error' : '' }}">
           <div class="col-md-7 col-md-offset-3">
             @can('self.two_factor')
-              <label for="two_factor_optin">{{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),array('class' => 'minimal')) }}
+              <label class="form-control">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin)) }}
             @else
-                <label for="avatar">{{ Form::checkbox('two_factor_optin', '1', Request::old('two_factor_optin', $user->two_factor_optin),['class' => 'disabled minimal', 'disabled' => 'disabled']) }}
+                <label class="form-control form-control--disabled">{{ Form::checkbox('two_factor_optin', '1', old('two_factor_optin', $user->two_factor_optin),['disabled' => 'disabled']) }}
             @endcan
 
             {{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
diff --git a/resources/views/asset_maintenances/edit.blade.php b/resources/views/asset_maintenances/edit.blade.php
index 1645fff0a3..5c2cd1fa2d 100644
--- a/resources/views/asset_maintenances/edit.blade.php
+++ b/resources/views/asset_maintenances/edit.blade.php
@@ -87,11 +87,10 @@
         <!-- Warranty -->
         <div class="form-group">
           <div class="col-sm-offset-3 col-sm-9">
-            <div class="checkbox">
-              <label>
-                <input type="checkbox" value="1" name="is_warranty" id="is_warranty" {{ Request::old('is_warranty', $item->is_warranty) == '1' ? ' checked="checked"' : '' }} class="minimal"> {{ trans('admin/asset_maintenances/form.is_warranty') }}
+              <label class="form-control">
+                <input type="checkbox" value="1" name="is_warranty" id="is_warranty" {{ old('is_warranty', $item->is_warranty) == '1' ? ' checked="checked"' : '' }}>
+                {{ trans('admin/asset_maintenances/form.is_warranty') }}
               </label>
-            </div>
           </div>
         </div>
 
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 35f3e1b89a..8e025e4b6b 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -111,11 +111,29 @@
               </div>
           </div>
 
+          @if (!$field->id)
+              <!-- Encrypted  -->
+              <div class="form-group {{ $errors->has('encrypted') ? ' has-error' : '' }}">
+                  <div class="col-md-8 col-md-offset-4">
+                      <label class="form-control">
+                          <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted"{{ (Request::old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
+                          {{ trans('admin/custom_fields/general.encrypt_field') }}
+                      </label>
+                  </div>
+                  <div class="col-md-6 col-md-offset-4" id="encrypt_warning" style="display:none;">
+
+                      <div class="callout callout-danger">
+                          <p><i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
+                      </div>
+                  </div>
+              </div>
+          @endif
+
           <!-- Show in Email  -->
           <div class="form-group {{ $errors->has('show_in_email') ? ' has-error' : '' }}"  id="show_in_email">
               <div class="col-md-8 col-md-offset-4">
-                  <label for="show_in_email">
-                      <input type="checkbox" name="show_in_email" aria-label="show_in_email" value="1" class="minimal"{{ (old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
+                  <label class="form-control">
+                      <input type="checkbox" name="show_in_email" aria-label="show_in_email" value="1"{{ (old('show_in_email') || $field->show_in_email) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.show_in_email') }}
                   </label>
               </div>
@@ -125,8 +143,8 @@
           <!-- Show in View All Assets profile view  -->
           <div class="form-group {{ $errors->has('display_in_user_view') ? ' has-error' : '' }}"  id="display_in_user_view">
               <div class="col-md-8 col-md-offset-4">
-                  <label for="display_in_user_view">
-                      <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" class="minimal"{{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
+                  <label class="form-control">
+                      <input type="checkbox" name="display_in_user_view" aria-label="display_in_user_view" value="1" {{ (old('display_in_user_view') || $field->display_in_user_view) ? ' checked="checked"' : '' }}>
                       {{ trans('admin/custom_fields/general.display_in_user_view') }}
                   </label>
               </div>
@@ -136,8 +154,8 @@
           <!-- Value Must be Unique -->
           <div class="form-group {{ $errors->has('is_unique') ? ' has-error' : '' }}"  id="is_unique">
             <div class="col-md-8 col-md-offset-4">
-                <label for="is_unique">
-                    <input type="checkbox" name="is_unique" aria-label="is_unique" value="1" class="minimal"{{ (old('is_unique') || $field->is_unique) ? ' checked="checked"' : '' }}>
+                <label class="form-control">
+                    <input type="checkbox" name="is_unique" aria-label="is_unique" value="1"{{ (old('is_unique') || $field->is_unique) ? ' checked="checked"' : '' }}>
                     {{ trans('admin/custom_fields/general.is_unique') }}
                 </label>
             </div>
@@ -145,24 +163,6 @@
         </div>
 
 
-      @if (!$field->id)
-        <!-- Encrypted  -->
-        <div class="form-group {{ $errors->has('encrypted') ? ' has-error' : '' }}">
-          <div class="col-md-8 col-md-offset-4">
-            <label for="field_encrypted">
-              <input type="checkbox" value="1" name="field_encrypted" id="field_encrypted" class="minimal"{{ (Request::old('field_encrypted') || $field->field_encrypted) ? ' checked="checked"' : '' }}>
-              {{ trans('admin/custom_fields/general.encrypt_field') }}
-            </label>
-          </div>
-          <div class="col-md-6 col-md-offset-4" id="encrypt_warning" style="display:none;">
-
-              <div class="callout callout-danger">
-                <p><i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('admin/custom_fields/general.encrypt_field_help') }}</p>
-            </div>
-          </div>
-        </div>
-      @endif
-
       </div> <!-- /.box-body-->
 
       <div class="box-footer text-right">
@@ -219,18 +219,22 @@
         }).change();
     });
 
-    // Checkbox handling
-    $('#field_encrypted').on('ifChecked', function(event){
-        $("#encrypt_warning").show();
-        $("#show_in_email").hide();
-        $("#display_in_user_view").hide();
+
+    $("#field_encrypted").change(function() {
+        if (this.checked) {
+            $("#encrypt_warning").show();
+            $("#show_in_email").hide();
+            $("#display_in_user_view").hide();
+            $("#is_unique").hide();
+        } else {
+            $("#encrypt_warning").hide();
+            $("#show_in_email").show();
+            $("#display_in_user_view").show();
+            $("#is_unique").show();
+        }
     });
 
-    $('#field_encrypted').on('ifUnchecked', function(event){
-        $("#encrypt_warning").hide();
-        $("#show_in_email").show();
-        $("#display_in_user_view").show();
-    });
+
 
 </script>
 @stop
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 2f19a1f400..c330522cc1 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -104,8 +104,8 @@
 
                 <div class="form-group col-md-2" style="vertical-align: middle;">
 
-                  <label for="required">
-                    {{ Form::checkbox('required', 'on', old('required'), array('class' => 'minimal', 'aria-label'=>'required')) }}
+                  <label class="form-control">
+                    {{ Form::checkbox('required', 'on', old('required'), array('aria-label'=>'required')) }}
                     {{ trans('admin/custom_fields/general.required') }}
                   </label>
 
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php
index 3a474bb959..1745d74f38 100644
--- a/resources/views/hardware/quickscan.blade.php
+++ b/resources/views/hardware/quickscan.blade.php
@@ -50,9 +50,12 @@
                     <!-- Update location -->
                         <div class="form-group">
                             <div class="col-sm-offset-3 col-md-9">
-                                <label>
-                                    <input type="checkbox" value="1" name="update_location" class="minimal" {{ Request::old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
-                                </label> <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to."><i class="far fa-life-ring"></i></a>
+                                <label class="form-control">
+                                    <input type="checkbox" value="1" name="update_location" {{ old('update_location') == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/hardware/form.asset_location') }}
+                                </label>
+
+                                <a href="#" class="text-dark-gray" tabindex="0" role="button" data-toggle="popover" data-trigger="focus" title="<i class='far fa-life-ring'></i> More Info" data-html="true" data-content="Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that if this asset is checked out, it will not change the location of the person, asset or location it is checked out to."><i class="far fa-life-ring"></i></a>
+
                             </div>
                         </div>
 
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index 0936f8b2b7..efc10cec51 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -56,10 +56,14 @@
 
 <!-- Reassignable -->
 <div class="form-group {{ $errors->has('reassignable') ? ' has-error' : '' }}">
-    <label for="reassignable" class="col-md-3 control-label">{{ trans('admin/licenses/form.reassignable') }}</label>
-    <div class="col-md-7 input-group">
-        {{ Form::Checkbox('reassignable', '1', old('reassignable', $item->id ? $item->reassignable : '1'),array('class' => 'minimal', 'aria-label'=>'reassignable')) }}
+    <div class="col-md-3 control-label">
+        <strong>{{ trans('admin/licenses/form.reassignable') }}</strong>
+    </div>
+    <div class="col-md-7">
+        <label class="form-control">
+        {{ Form::Checkbox('reassignable', '1', old('reassignable', $item->id ? $item->reassignable : '1'),array('aria-label'=>'reassignable')) }}
         {{ trans('general.yes') }}
+        </label>
     </div>
 </div>
 
@@ -110,10 +114,12 @@
 
 <!-- Maintained -->
 <div class="form-group {{ $errors->has('maintained') ? ' has-error' : '' }}">
-    <label for="maintained" class="col-md-3 control-label">{{ trans('admin/licenses/form.maintained') }}</label>
-    <div class="checkbox col-md-7">
-        {{ Form::Checkbox('maintained', '1', old('maintained', $item->maintained),array('class' => 'minimal', 'aria-label'=>'maintained')) }}
+    <div class="col-md-3 control-label"><strong>{{ trans('admin/licenses/form.maintained') }}</strong></div>
+    <div class="col-md-7">
+        <label class="form-control">
+        {{ Form::Checkbox('maintained', '1', old('maintained', $item->maintained),array('aria-label'=>'maintained')) }}
         {{ trans('general.yes') }}
+        </label>
     </div>
 </div>
 
diff --git a/resources/views/livewire/login-form.blade.php b/resources/views/livewire/login-form.blade.php
index 6561adc8e1..264361c133 100644
--- a/resources/views/livewire/login-form.blade.php
+++ b/resources/views/livewire/login-form.blade.php
@@ -62,8 +62,9 @@
                                     </div>
                                     <div class="form-group">
                                         <div class="checkbox">
-                                            <label style="margin-left: -20px;">
-                                                <input name="remember" type="checkbox" value="1" class="minimal"> {{ trans('auth/general.remember_me')  }}
+                                            <label class="form-control">
+                                                <input name="remember" type="checkbox" value="1">
+                                                {{ trans('auth/general.remember_me')  }}
                                             </label>
                                         </div>
                                 </div>
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index 19f19d2b15..6a2efeecaa 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -78,15 +78,15 @@
                         </div>
                     </div>
                     
-					<!-- Space for keep consistance of layout -->
-					<div class="dynamic-form-row"></div>
+
                     
 					<!-- Checkbox for activation new user, by default set for activated -->
 					<div class="dynamic-form-row">
-                        <div class="col-md-3 col-xs-12"><label for="modal-activated">{{ trans('general.login_enabled') }}:</label></div>
-						<div class="col-md-8 col-xs-12">
-						<input type="checkbox" value="1" name="activated" id="modal-activated" class="minimal" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
-						{{ trans('admin/users/general.activated_help_text') }}
+						<div class="col-md-offset-3 col-md-8 col-xs-12">
+                            <label class="form-control">
+						        <input type="checkbox" value="1" name="activated" id="modal-activated" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} aria-label="activated">
+                                {{ trans('general.login_enabled') }}
+                            </label>
 						</div>
                     </div>                    
                     
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index f73a93903f..0f3ee9a3e6 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -18,8 +18,8 @@
                     <!-- Checkboxes -->
                   @foreach ($field->formatFieldValuesAsArray() as $key => $value)
                       <div>
-                          <label>
-                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" class="minimal" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
+                          <label class="form-control">
+                              <input type="checkbox" value="{{ $value }}" name="{{ $field->db_column_name() }}[]" {{  isset($item) ? (in_array($value, array_map('trim', explode(',', $item->{$field->db_column_name()}))) ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($key, array_map('trim', explode(',', $field->defaultValue($model->id)))) ? ' checked="checked"' : '')) }}>
                               {{ $value }}
                           </label>
                       </div>
@@ -29,8 +29,8 @@
               @foreach ($field->formatFieldValuesAsArray() as $value)
 
               <div>
-                  <label>
-                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
+                  <label class="form-control">
+                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : (in_array($value, explode(', ', $field->defaultValue($model->id))) ? ' checked="checked"' : '')) }}>
                       {{ $value }}
                   </label>
               </div>
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 6bbc116b64..5c48d9b3c4 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -47,8 +47,8 @@
     @if (($setting->$logoVariable!='') && (Storage::disk('public')->exists(e($snipeSettings->$logoVariable))))
 
     <div class="col-md-9 col-md-offset-3">
-        <label id="{{ $logoId }}-deleteCheckbox" for="{{ $logoClearVariable }}" style="font-weight: normal">
-            {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable),array('class' => 'minimal')) }}
+        <label id="{{ $logoId }}-deleteCheckbox" for="{{ $logoClearVariable }}" style="font-weight: normal" class="form-control">
+            {{ Form::checkbox($logoClearVariable, '1', Request::old($logoClearVariable)) }}
             Remove current {{ ucwords(str_replace('_', ' ', $logoVariable)) }} image
         </label>
     </div>
diff --git a/resources/views/reports/custom.blade.php b/resources/views/reports/custom.blade.php
index 455b87dd02..d059781543 100644
--- a/resources/views/reports/custom.blade.php
+++ b/resources/views/reports/custom.blade.php
@@ -28,254 +28,210 @@
         </div><!-- /.box-header -->
 
         <div class="box-body">
-          <div class="col-md-4">
 
+            <div class="col-md-4">
 
-            <div class="checkbox col-md-12">
-              <label>
-                <input type="checkbox" class="all minimal" checked="checked">
+              <label class="form-control">
+                <input type="checkbox" id="checkAll" checked="checked">
                {{ trans('general.select_all') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('id', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('id', '1', '1') }}
                 {{ trans('general.id') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('company', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('company', '1', '1') }}
                 {{ trans('general.company') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-              {{ Form::checkbox('asset_tag', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+              {{ Form::checkbox('asset_tag', '1', '1') }}
                 {{ trans('general.asset_tag') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('asset_name', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('asset_name', '1', '1') }}
                 {{ trans('admin/hardware/form.name') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('manufacturer', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('manufacturer', '1', '1') }}
                 {{ trans('general.manufacturer') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('model', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('model', '1', '1') }}
                 {{ trans('general.asset_models') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('category', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('category', '1', '1') }}
                 {{ trans('general.category') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('serial', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('serial', '1', '1') }}
                 {{ trans('admin/hardware/table.serial') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('purchase_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('purchase_date', '1', '1') }}
                 {{ trans('admin/licenses/table.purchase_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('purchase_cost', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('purchase_cost', '1', '1') }}
                 {{ trans('admin/hardware/form.cost') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('eol', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('eol', '1', '1') }}
                 {{ trans('admin/hardware/table.eol') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('order', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('order', '1', '1') }}
                 {{ trans('admin/hardware/form.order') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('supplier', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('supplier', '1', '1') }}
                 {{ trans('general.suppliers') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('location', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('location', '1', '1') }}
                 {{ trans('general.location') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('location_address', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('location_address', '1', '1') }}
                 - {{ trans('general.address') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('rtd_location', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('rtd_location', '1', '1') }}
                 {{ trans('admin/hardware/form.default_location') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('rtd_location_address', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('rtd_location_address', '1', '1') }}
                 - {{ trans('general.address') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('status', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('status', '1', '1') }}
                 {{ trans('general.status') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('warranty', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('warranty', '1', '1') }}
                 {{ trans('admin/hardware/form.warranty') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('depreciation', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('depreciation', '1', '1') }}
                 {{ trans('general.depreciation') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('checkout_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('checkout_date', '1', '1') }}
                 {{ trans('admin/hardware/table.checkout_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('expected_checkin', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('expected_checkin', '1', '1') }}
                 {{ trans('admin/hardware/form.expected_checkin') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('created_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('created_at', '1', '1') }}
                 {{ trans('general.created_at') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('updated_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('updated_at', '1', '1') }}
                 {{ trans('general.updated_at') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('deleted_at', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('deleted_at', '1', '1') }}
                 {{ trans('general.deleted') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('last_audit_date', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('last_audit_date', '1', '1') }}
                 {{ trans('general.last_audit') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('next_audit_date', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('next_audit_date', '1', '1') }}
                 {{ trans('general.next_audit_date') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('notes', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('notes', '1', '1') }}
                 {{ trans('general.notes') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('url', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('url', '1', '1') }}
                 - {{ trans('admin/manufacturers/table.url') }}
               </label>
-            </div>
+
 
             <!-- User fields -->
-            <div class="checkbox col-md-12">
+
               <h2>{{ trans('general.checked_out_to') }} {{ trans('general.fields') }}:</h2>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('assigned_to', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('assigned_to', '1', '1') }}
                 {{ trans('admin/licenses/table.assigned_to') }}
               </label>
-            </div>
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('username', '1', '1', ['class' => 'minimal']) }}
+
+              <label class="form-control">
+                {{ Form::checkbox('username', '1', '1') }}
                 {{ trans('admin/users/table.username') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('employee_num', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('employee_num', '1', '1') }}
                 {{ trans('general.employee_number') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('manager', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('manager', '1', '1') }}
                 {{ trans('admin/users/table.manager') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('department', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('department', '1', '1') }}
                 {{ trans('general.department') }}
               </label>
-            </div>
 
-            <div class="checkbox col-md-12">
-              <label>
-                {{ Form::checkbox('title', '1', '1', ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('title', '1', '1') }}
                 {{ trans('admin/users/table.title') }}
               </label>
-            </div>
+
 
 
             @if ($customfields->count() > 0)
-              <div class="checkbox col-md-12">
-                <h2>{{ trans('admin/custom_fields/general.custom_fields') }}</h>:</h4>
-              </div>
+
+                <h2>{{ trans('admin/custom_fields/general.custom_fields') }}</h2>
+
               @foreach ($customfields as $customfield)
-                <div class="checkbox col-md-12">
-                  <label>
-                    {{ Form::checkbox($customfield->db_column_name(), '1', '1', ['class' => 'minimal']) }}
+
+                  <label class="form-control">
+                    {{ Form::checkbox($customfield->db_column_name(), '1', '1') }}
                     {{ $customfield->name }}
                   </label>
-                </div>
+
               @endforeach
             @endif
-
-          </div> <!-- /.col-md-3-->
+          </div> <!-- /.col-md-4-->
 
           <div class="col-md-8">
 
@@ -311,9 +267,9 @@
             <div class="form-group purchase-range">
               <label for="purchase_start" class="col-md-3 control-label">{{ trans('general.purchase_date') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="purchase_start" aria-label="purchase_start">
+                <input type="text" class="form-control" name="purchase_start" aria-label="purchase_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="purchase_end" aria-label="purchase_end">
+                <input type="text" class="form-control" name="purchase_end" aria-label="purchase_end">
               </div>
             </div>
 
@@ -321,9 +277,9 @@
             <div class="form-group purchase-range">
               <label for="created_start" class="col-md-3 control-label">{{ trans('general.created_at') }} {{  trans('general.range') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="created_start" aria-label="created_start">
+                <input type="text" class="form-control" name="created_start" aria-label="created_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="created_end" aria-label="created_end">
+                <input type="text" class="form-control" name="created_end" aria-label="created_end">
               </div>
             </div>
 
@@ -331,9 +287,9 @@
             <div class="form-group expected_checkin-range">
               <label for="expected_checkin_start" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
               <div class="input-daterange input-group col-md-6" id="datepicker">
-                <input type="text" class="input-sm form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
+                <input type="text" class="form-control" name="expected_checkin_start" aria-label="expected_checkin_start">
                 <span class="input-group-addon">to</span>
-                <input type="text" class="input-sm form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
+                <input type="text" class="form-control" name="expected_checkin_end" aria-label="expected_checkin_end">
               </div>
             </div>
 
@@ -341,9 +297,9 @@
               <div class="form-group last_audit-range">
                   <label for="last_audit_start" class="col-md-3 control-label">{{ trans('general.last_audit') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="input-sm form-control" name="last_audit_start" aria-label="last_audit_start">
+                      <input type="text" class="form-control" name="last_audit_start" aria-label="last_audit_start">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="input-sm form-control" name="last_audit_end" aria-label="last_audit_end">
+                      <input type="text" class="form-control" name="last_audit_end" aria-label="last_audit_end">
                   </div>
               </div>
 
@@ -351,43 +307,50 @@
               <div class="form-group next_audit-range">
                   <label for="next_audit_start" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
                   <div class="input-daterange input-group col-md-6" id="datepicker">
-                      <input type="text" class="input-sm form-control" name="next_audit_start" aria-label="nex_audit_start">
+                      <input type="text" class="form-control" name="next_audit_start" aria-label="nex_audit_start">
                       <span class="input-group-addon">to</span>
-                      <input type="text" class="input-sm form-control" name="next_audit_end" aria-label="next_audit_end">
+                      <input type="text" class="form-control" name="next_audit_end" aria-label="next_audit_end">
                   </div>
               </div>
 
             <div class="col-md-9 col-md-offset-3">
-            <label>
-              {{ Form::checkbox('exclude_archived', '1', old('exclude_archived'), ['class' => 'minimal']) }}
+            <label class="form-control">
+              {{ Form::checkbox('exclude_archived', '1', old('exclude_archived')) }}
               {{ trans('general.exclude_archived') }}
             </label>
             </div>
             <div class="col-md-9 col-md-offset-3">
-              <label>
-                {{ Form::checkbox('use_bom', '1', old('use_bom'), ['class' => 'minimal']) }}
+              <label class="form-control">
+                {{ Form::checkbox('use_bom', '1', old('use_bom')) }}
                 {{ trans('general.bom_remark') }}
               </label>
             </div>
 
               <div class="col-md-9 col-md-offset-3">
-                <br>
-                  {{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'class'=>'minimal', 'id'=>'deleted_assets_exclude_deleted'])}}
-                  <label for="deleted_assets_exclude_deleted">{{ trans('general.exclude_deleted') }}</label>
-                  <br>
-                  {{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal', 'id'=>'deleted_assets_include_deleted']) }}
-                  <label for="deleted_assets_include_deleted">{{ trans('general.include_deleted') }}</label>
-                  <br>
-                  {{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','class' => 'minimal','id'=>'deleted_assets_only_deleted']) }}
-                <label for="deleted_assets_only_deleted">{{ trans('general.only_deleted') }}</label>
-              </div>
 
+                  <label class="form-control">
+                    {{ Form::radio('deleted_assets', '', true, ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_exclude_deleted'])}}
+                    {{ trans('general.exclude_deleted') }}
+                  </label>
+                  <label class="form-control">
+                    {{ Form::radio('deleted_assets', '1', old('deleted_assets'), ['aria-label'=>'deleted_assets', 'id'=>'deleted_assets_include_deleted']) }}
+                    {{ trans('general.include_deleted') }}
+                  </label>
+                  <label class="form-control">
+                  {{ Form::radio('deleted_assets', '0', old('deleted_assets'), ['aria-label'=>'deleted_assets','id'=>'deleted_assets_only_deleted']) }}
+                    {{ trans('general.only_deleted') }}
+                  </label>
+              </div>
           </div>
 
 
+
         </div> <!-- /.box-body-->
         <div class="box-footer text-right">
-          <button type="submit" class="btn btn-success"><i class="fas fa-download icon-white" aria-hidden="true"></i> {{ trans('general.generate') }}</button>
+          <button type="submit" class="btn btn-success">
+            <i class="fas fa-download icon-white" aria-hidden="true"></i>
+            {{ trans('general.generate') }}
+          </button>
         </div>
       </div> <!--/.box.box-default-->
     {{ Form::close() }}
@@ -425,28 +388,9 @@
           format: 'yyyy-mm-dd'
       });
 
-    // Check-all / Uncheck all
-      $(function () {
-          var checkAll = $('input.all');
-          var checkboxes = $('input.minimal');
-
-
-          checkAll.on('ifChecked ifUnchecked', function(event) {
-              if (event.type == 'ifChecked') {
-                  checkboxes.iCheck('check');
-              } else {
-                  checkboxes.iCheck('uncheck');
-              }
-          });
-
-          checkboxes.on('ifChanged', function(event){
-              if(checkboxes.filter(':checked').length == checkboxes.length) {
-                  checkAll.prop('checked', 'checked');
-              } else {
-                  checkAll.removeProp('checked');
-              }
-              checkAll.iCheck('update');
-          });
+      $("#checkAll").change(function () {
+        $("input:checkbox").prop('checked', $(this).prop("checked"));
       });
+
   </script>
 @stop
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index aa6f94f672..9b2f57a1c6 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -42,23 +42,21 @@
 
                         <!-- Alerts Enabled -->
                         <div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('alerts_enabled', trans('admin/settings/general.alerts_enabled')) }}
-                            </div>
-                            <div class="col-md-5">
-                                {{ Form::checkbox('alerts_enabled', '1', Request::old('alerts_enabled', $setting->alerts_enabled),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                            <div class="col-md-9 col-md-offset-3">
+                                <label class="form-control">
+                                    {{ Form::checkbox('alerts_enabled', '1', Request::old('alerts_enabled', $setting->alerts_enabled)) }}
+                                    {{  trans('admin/settings/general.alerts_enabled') }}
+                                </label>
                             </div>
                         </div>
 
                         <!-- Menu Alerts Enabled -->
                         <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('show_alerts_in_menu', trans('admin/settings/general.show_alerts_in_menu')) }}
-                            </div>
-                            <div class="col-md-5">
-                                {{ Form::checkbox('show_alerts_in_menu', '1', Request::old('show_alerts_in_menu', $setting->show_alerts_in_menu),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                            <div class="col-md-9 col-md-offset-3">
+                                <label class="form-control">
+                                    {{ Form::checkbox('show_alerts_in_menu', '1', Request::old('show_alerts_in_menu', $setting->show_alerts_in_menu)) }}
+                                    {{ trans('admin/settings/general.show_alerts_in_menu') }}
+                                </label>
                             </div>
                         </div>
 
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php
index ec11053e9f..858ad718cb 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -43,11 +43,13 @@
                         <!-- auto ids -->
                         <div class="form-group">
                             <div class="col-md-5">
-                                {{ Form::label('auto_increment_assets', trans('admin/settings/general.auto_increment_assets')) }}
+                                <strong>{{  trans('admin/settings/general.auto_increment_assets') }}</strong>
                             </div>
                             <div class="col-md-7">
-                                {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('class' => 'minimal', 'aria-label'=>'auto_increment_assets')) }}
-                                {{ trans('admin/settings/general.enabled') }}
+                                <label class="form-control">
+                                    {{ Form::checkbox('auto_increment_assets', '1', old('auto_increment_assets', $setting->auto_increment_assets),array('aria-label'=>'auto_increment_assets')) }}
+                                    {{ trans('admin/settings/general.enabled') }}
+                                </label>
                             </div>
                         </div>
 
diff --git a/resources/views/settings/barcodes.blade.php b/resources/views/settings/barcodes.blade.php
index 4a421eec74..2d79ef484d 100644
--- a/resources/views/settings/barcodes.blade.php
+++ b/resources/views/settings/barcodes.blade.php
@@ -43,12 +43,11 @@
                     @if ($is_gd_installed)
                         <!-- qr code -->
                             <div class="form-group">
-                                <div class="col-md-3">
-                                    {{ Form::label('qr_code', trans('admin/settings/general.display_qr')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {{ Form::checkbox('qr_code', '1', old('qr_code', $setting->qr_code),array('class' => 'minimal', 'aria-label'=>'qr_code')) }}
-                                    {{ trans('general.yes') }}
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        {{ Form::checkbox('qr_code', '1', old('qr_code', $setting->qr_code),array('aria-label'=>'qr_code')) }}
+                                        {{ trans('admin/settings/general.display_qr') }}
+                                    </label>
                                 </div>
                             </div>
 
@@ -65,12 +64,12 @@
 
                             <!-- barcode -->
                             <div class="form-group">
-                                <div class="col-md-3">
-                                    {{ Form::label('alt_barcode_enabled', trans('admin/settings/general.display_alt_barcode')) }}
-                                </div>
-                                <div class="col-md-9">
-                                    {{ Form::checkbox('alt_barcode_enabled', '1', old('alt_barcode_enabled', $setting->alt_barcode_enabled),array('class' => 'minimal', 'aria-label'=>'alt_barcode_enabled')) }}
-                                    {{ trans('general.yes') }}
+
+                                <div class="col-md-9 col-md-offset-3">
+                                    <label class="form-control">
+                                        {{ Form::checkbox('alt_barcode_enabled', '1', old('alt_barcode_enabled', $setting->alt_barcode_enabled),array( 'aria-label'=>'alt_barcode_enabled')) }}
+                                        {{ trans('admin/settings/general.display_alt_barcode') }}
+                                    </label>
                                 </div>
                             </div>
 
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 104e426a7c..56865d451f 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -112,11 +112,13 @@
                     <!-- Include logo in print assets -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }}
+                                <strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('logo_print_assets', '1', old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal', 'aria-label'=>'logo_print_assets')) }}
+                                <label class="form-control">
+                                {{ Form::checkbox('logo_print_assets', '1', old('logo_print_assets', $setting->logo_print_assets),array('aria-label'=>'logo_print_assets')) }}
                                 {{ trans('admin/settings/general.logo_print_assets_help') }}
+                                </label>
 
                             </div>
                         </div>
@@ -125,11 +127,13 @@
                         <!-- show urls in emails-->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }}
+                                <strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('show_url_in_emails', '1', old('show_url_in_emails', $setting->show_url_in_emails),array('class' => 'minimal', 'aria-label'=>'show_url_in_emails')) }}
-                                {{ trans('general.yes') }}
+                                <label class="form-control">
+                                    {{ Form::checkbox('show_url_in_emails', '1', old('show_url_in_emails', $setting->show_url_in_emails),array('aria-label'=>'show_url_in_emails')) }}
+                                    {{ trans('general.yes') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.show_url_in_emails_help_text') }}</p>
                             </div>
                         </div>
@@ -164,11 +168,13 @@
                         <!-- Allow User Skin -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('allow_user_skin', trans('admin/settings/general.allow_user_skin')) }}
+                                <strong>{{ trans('admin/settings/general.allow_user_skin') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('allow_user_skin', '1', old('allow_user_skin', $setting->allow_user_skin),array('class' => 'minimal')) }}
-                                {{ trans('general.yes') }}
+                                <label class="form-control">
+                                    {{ Form::checkbox('allow_user_skin', '1', old('allow_user_skin', $setting->allow_user_skin)) }}
+                                    {{ trans('general.yes') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.allow_user_skin_help_text') }}</p>
                             </div>
                         </div>
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 6c0655abd5..433f6c8123 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -45,11 +45,13 @@
                     <!-- Full Multiple Companies Support -->
                     <div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }}
+                            <strong>{{ trans('admin/settings/general.full_multiple_companies_support_text') }}</strong>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::checkbox('full_multiple_companies_support', '1', old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('class' => 'minimal', 'aria-label'=>'full_multiple_companies_support')) }}
-                            {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
+                            <label class="form-control">
+                                {{ Form::checkbox('full_multiple_companies_support', '1', old('full_multiple_companies_support', $setting->full_multiple_companies_support),array('aria-label'=>'full_multiple_companies_support')) }}
+                                {{ trans('admin/settings/general.full_multiple_companies_support_text') }}
+                            </label>
                             {!! $errors->first('full_multiple_companies_support', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             <p class="help-block">
                                 {{ trans('admin/settings/general.full_multiple_companies_support_help_text') }}
@@ -62,12 +64,13 @@
                     <!-- Require signature for acceptance -->
                     <div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
                         <div class="col-md-3">
-                            {{ Form::label('require_accept_signature',
-                                           trans('admin/settings/general.require_accept_signature')) }}
+                           <strong> {{ trans('admin/settings/general.require_accept_signature') }}</strong>
                         </div>
                         <div class="col-md-9">
-                            {{ Form::checkbox('require_accept_signature', '1', Request::old('require_accept_signature', $setting->require_accept_signature),array('class' => 'minimal')) }}
-                            {{ trans('general.yes') }}
+                            <label class="form-control">
+                                {{ Form::checkbox('require_accept_signature', '1', Request::old('require_accept_signature', $setting->require_accept_signature)) }}
+                                {{ trans('general.yes') }}
+                            </label>
                             {!! $errors->first('require_accept_signature', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             <p class="help-block">{{ trans('admin/settings/general.require_accept_signature_help_text') }}</p>
                         </div>
@@ -117,12 +120,14 @@
                        <!-- Load images in emails -->
                        <div class="form-group {{ $errors->has('show_images_in_email') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_images_in_email', trans('admin/settings/general.show_images_in_email')) }}
+                               <strong>{{ trans('admin/settings/general.show_images_in_email') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ Form::checkbox('show_images_in_email', '1', Request::old('show_images_in_email', $setting->show_images_in_email),array('class' => 'minimal')) }}
-                               {{ trans('general.yes') }}
-                               {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                               <label class="form-control">
+                                   {{ Form::checkbox('show_images_in_email', '1', old('show_images_in_email', $setting->show_images_in_email)) }}
+                                   {{ trans('general.yes') }}
+                                   {!! $errors->first('show_images_in_email', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                               </label>
 
                            </div>
                        </div>
@@ -130,11 +135,13 @@
                        <!-- unique serial -->
                        <div class="form-group">
                            <div class="col-md-3">
-                               {{ Form::label('unique_serial', trans('admin/settings/general.unique_serial')) }}
+                               <strong>{{ trans('admin/settings/general.unique_serial') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
-                               {{ trans('general.yes') }}
+                               <label class="form-control">
+                                   {{ Form::checkbox('unique_serial', '1', Request::old('unique_serial', $setting->unique_serial),array('class' => 'minimal')) }}
+                                   {{ trans('general.yes') }}
+                               </label>
                                {!! $errors->first('unique_serial', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                <p class="help-block">
                                {{ trans('admin/settings/general.unique_serial_help_text') }}
@@ -277,14 +284,20 @@
                        <!-- Model List prefs -->
                        <div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
                            <div class="col-md-3">
-                               {{ Form::label('show_in_model_list',
-                                              trans('admin/settings/general.show_in_model_list')) }}
+                               <strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
                            </div>
                            <div class="col-md-9">
-                               {{ Form::checkbox('show_in_model_list[]', 'image', old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }} <br>
-                               {{ Form::checkbox('show_in_model_list[]', 'category', old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }} <br>
-                               {{ Form::checkbox('show_in_model_list[]', 'manufacturer', old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }}  {{ trans('general.manufacturer') }} <br>
-                               {{ Form::checkbox('show_in_model_list[]', 'model_number', old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}<br>
+                               <label class="form-control">
+                               {{ Form::checkbox('show_in_model_list[]', 'image', old('show_in_model_list', $snipeSettings->modellistCheckedValue('image')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.image') }}
+                               </label>
+                               <label class="form-control">
+                               {{ Form::checkbox('show_in_model_list[]', 'category', old('show_in_model_list', $snipeSettings->modellistCheckedValue('category')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.category') }}
+                               </label>
+                               <label class="form-control">
+                               {{ Form::checkbox('show_in_model_list[]', 'manufacturer', old('show_in_model_list', $snipeSettings->modellistCheckedValue('manufacturer')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }}  {{ trans('general.manufacturer') }} </label>
+                               <label class="form-control">
+                               {{ Form::checkbox('show_in_model_list[]', 'model_number', old('show_in_model_list', $snipeSettings->modellistCheckedValue('model_number')),array('class' => 'minimal', 'aria-label'=>'show_in_model_list' )) }} {{ trans('general.model_no') }}
+                               </label>
                            </div>
                        </div>
 
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index a509769dee..e214ce0f41 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -54,7 +54,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('labels_fontsize', trans('admin/settings/general.labels_fontsize')) }}
                             </div>
-                            <div class="col-md-2 form-group">
+                            <div class="col-md-2">
                                 <div class="input-group">
                                     {{ Form::text('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.text_pt') }}</div>
@@ -69,13 +69,13 @@
                             <div class="col-md-3">
                                 {{ Form::label('labels_width', trans('admin/settings/general.label_dimensions')) }}
                             </div>
-                            <div class="col-md-3 form-group">
+                            <div class="col-md-3">
                                 <div class="input-group">
                                     {{ Form::text('labels_width', old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px">
+                            <div class="col-md-3">
                                 <div class="input-group">
                                     {{ Form::text('labels_height', old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
@@ -91,13 +91,13 @@
                             <div class="col-md-3">
                                 {{ Form::label('labels_display_sgutter', trans('admin/settings/general.label_gutters')) }}
                             </div>
-                            <div class="col-md-3 form-group">
+                            <div class="col-md-3">
                                 <div class="input-group">
                                     {{ Form::text('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px">
+                            <div class="col-md-3">
                                 <div class="input-group">
                                     {{ Form::text('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
@@ -113,7 +113,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('labels_pmargin_top', trans('admin/settings/general.page_padding')) }}
                             </div>
-                            <div class="col-md-3 form-group">
+                            <div class="col-md-3">
                                 <div class="input-group" style="margin-bottom: 15px;">
                                     {{ Form::text('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
@@ -123,7 +123,7 @@
                                     <div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px; ">
+                            <div class="col-md-3" style="margin-left: 10px; ">
                                 <div class="input-group" style="margin-bottom: 15px;">
                                     {{ Form::text('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.bottom') }}</div>
@@ -144,7 +144,7 @@
                             <div class="col-md-3">
                                 {{ Form::label('labels_pagewidth', trans('admin/settings/general.page_dimensions')) }}
                             </div>
-                            <div class="col-md-3 form-group">
+                            <div class="col-md-3">
                                 <div class="input-group">
                                     {{ Form::text('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }}
                                     <div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
@@ -167,29 +167,27 @@
 			                {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
                             </div>
                             <div class="col-md-9">
-                                <div class="checkbox">
-                                    <label for="labels_display_name">
+                                    <label class="form-control">
                                         {{ Form::checkbox('labels_display_name', '1', old('labels_display_name',   $setting->labels_display_name),['class' => 'minimal', 'aria-label'=>'labels_display_name']) }}
                                         {{ trans('admin/hardware/form.name') }}
                                     </label>
-                                    <label for="labels_display_serial">
+                                    <label class="form-control">
                                         {{ Form::checkbox('labels_display_serial', '1', old('labels_display_serial',   $setting->labels_display_serial),['class' => 'minimal', 'aria-label'=>'labels_display_serial']) }}
                                         {{ trans('admin/hardware/form.serial') }}
                                     </label>
-                                    <label for="labels_display_tag">
+                                    <label class="form-control">
                                         {{ Form::checkbox('labels_display_tag', '1', old('labels_display_tag',   $setting->labels_display_tag),['class' => 'minimal', 'aria-label'=>'labels_display_tag']) }}
                                         {{ trans('admin/hardware/form.tag') }}
                                     </label>
-                                    <label for="labels_display_model">
+                                    <label class="form-control">
                                         {{ Form::checkbox('labels_display_model', '1', old('labels_display_model',   $setting->labels_display_model),['class' => 'minimal', 'aria-label'=>'labels_display_model']) }}
                                         {{ trans('admin/hardware/form.model') }}
                                     </label>
-                                    <label for="labels_display_company_name">
+                                     <label class="form-control">
                                         {{ Form::checkbox('labels_display_company_name', '1', old('labels_display_company_name',   $setting->labels_display_company_name),['class' => 'minimal', 'aria-label'=>'labels_display_company_name']) }}
                                         {{ trans('admin/companies/table.name') }}
-				    </label>
+				                    </label>
 
-                                </div> <!--/.CHECKBOX-->
                             </div> <!--/.col-md-9-->
                         </div> <!--/.form-group-->
 
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 09990db2e9..6a193a635f 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -43,27 +43,29 @@
                 </div>
                 <div class="box-body">
 
-
-                    <div class="col-md-11 col-md-offset-1">
-
                         <!-- Enable SAML -->
-                        <div class="form-group {{ $errors->has('saml_integration') ? 'error' : '' }}">
+                        <div class="form-group{{ $errors->has('saml_integration') ? ' error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('saml_integration', trans('admin/settings/general.saml_integration')) }}
+                                <strong>{{ trans('admin/settings/general.saml_integration') }}</strong>
                             </div>
                             <div class="col-md-9">
 
-                                {{ Form::checkbox('saml_enabled', '1', Request::old('saml_enabled', $setting->saml_enabled), [((config('app.lock_passwords')===true)) ? 'disabled ': '', 'class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_enabled') }}
-                                {!! $errors->first('saml_integration', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
-                                @if (config('app.lock_passwords')===true)
-                                <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
+                                <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
+                                    {{ Form::checkbox('saml_enabled', '1', old('saml_enabled', $setting->saml_enabled), ['class' => config('app.lock_passwords') === true ? 'disabled ': '',  config('app.lock_passwords') === true ? 'disabled ': '', ]) }}
+                                    {{ trans('admin/settings/general.saml_enabled') }}
+                                </label>
+
+                                {!! $errors->first('saml_integration', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                @if (config('app.lock_passwords') === true)
+                                    <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @endif
+                            </div>
 
 
 
 
                                 @if ($setting->saml_enabled)
+                                    <div class="col-md-9 col-md-offset-3">
                                     <!-- SAML SP Details -->
                                     <!-- SAML SP Entity ID -->
                                     {{ Form::label('saml_sp_entitiyid', trans('admin/settings/general.saml_sp_entityid')) }}
@@ -95,6 +97,7 @@
                             </div>
                         </div>
 
+
                         <!-- SAML IdP Metadata -->
                         <div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
                         <div class="col-md-3">
@@ -103,10 +106,10 @@
                         <div class="col-md-9">
                             {{ Form::textarea('saml_idp_metadata', old('saml_idp_metadata', $setting->saml_idp_metadata), ['class' => 'form-control','placeholder' => 'https://example.com/idp/metadata', 'wrap' => 'off', $setting->demoMode]) }}
                             {!! $errors->first('saml_idp_metadata', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
-                            <button type="button" class="btn btn-default" id="saml_idp_metadata_upload_btn">{{ trans('button.select_file') }}</button>
+                            <button type="button" class="btn btn-default" id="saml_idp_metadata_upload_btn" {{ $setting->demoMode }}>{{ trans('button.select_file') }}</button>
                             <input type="file" class="js-uploadFile" id="saml_idp_metadata_upload"
                                 data-maxsize="{{ Helper::file_upload_max_size() }}"
-                                accept="text/xml,application/xml" style="display:none; max-width: 90%">
+                                accept="text/xml,application/xml" style="display:none; max-width: 90%" {{ $setting->demoMode }}>
                             
                             <p class="help-block">{{ trans('admin/settings/general.saml_idp_metadata_help') }}</p>
                         </div>
@@ -118,7 +121,7 @@
                                 {{ Form::label('saml_attr_mapping_username', trans('admin/settings/general.saml_attr_mapping_username')) }}
                             </div>
                             <div class="col-md-9">
-                                {{ Form::text('saml_attr_mapping_username', Request::old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
+                                {{ Form::text('saml_attr_mapping_username', old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }}
                                 <p class="help-block">{{ trans('admin/settings/general.saml_attr_mapping_username_help') }}</p>
                                 {!! $errors->first('saml_attr_mapping_username', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -127,11 +130,13 @@
                         <!-- SAML Force Login -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('saml_forcelogin', trans('admin/settings/general.saml_forcelogin_label')) }}
+                                <strong>{{  trans('admin/settings/general.saml_forcelogin_label') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('saml_forcelogin', '1', Request::old('saml_forcelogin', $setting->saml_forcelogin),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_forcelogin') }}
+                                <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
+                                    {{ Form::checkbox('saml_forcelogin', '1', old('saml_forcelogin', $setting->saml_forcelogin),['class' =>  $setting->demoMode, $setting->demoMode]) }}
+                                    {{ trans('admin/settings/general.saml_forcelogin') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_forcelogin_help') }}</p>
                                 <p class="help-block">{{ route('login', ['nosaml']) }}</p>
                                 {!! $errors->first('saml_forcelogin', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -141,11 +146,13 @@
                         <!-- SAML Single Log Out -->
                         <div class="form-group">
                             <div class="col-md-3">
-                                {{ Form::label('saml_slo', trans('admin/settings/general.saml_slo_label')) }}
+                                <strong>{{ trans('admin/settings/general.saml_slo_label') }}</strong>
                             </div>
                             <div class="col-md-9">
-                                {{ Form::checkbox('saml_slo', '1', Request::old('saml_slo', $setting->saml_slo),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
-                                {{ trans('admin/settings/general.saml_slo') }}
+                                <label class="form-control{{ config('app.lock_passwords') === true ? ' form-control--disabled': '' }}">
+                                    {{ Form::checkbox('saml_slo', '1', old('saml_slo', $setting->saml_slo),['class' => 'minimal '. $setting->demoMode, $setting->demoMode]) }}
+                                    {{ trans('admin/settings/general.saml_slo') }}
+                                </label>
                                 <p class="help-block">{{ trans('admin/settings/general.saml_slo_help') }}</p>
                                 {!! $errors->first('saml_slo', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
@@ -161,10 +168,8 @@
                             <p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p>
                             {!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                         </div>
-                        </div>
-
-
                     </div>
+
                 </div> <!--/.box-body-->
                 <div class="box-footer">
                     <div class="text-left col-md-6">
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index cf223b5537..a23b8cece9 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -72,25 +72,6 @@
                         </div>
 
 
-                        <!-- Common Passwords -->
-                        <div class="form-group {{ $errors->has('pwd_secure_uncommon') ? 'error' : '' }}">
-                            <div class="col-md-3">
-                                {{ Form::label('pwd_secure_text_label',
-                                              trans('admin/settings/general.pwd_secure_uncommon')) }}
-
-                            </div>
-                            <div class="col-md-9">
-                                <label for="pwd_secure_uncommon"><span class="sr-only">Prevent common insecure passwords</span>
-                                {{ Form::checkbox('pwd_secure_uncommon', '1', old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array('class' => 'minimal', 'aria-label'=>'pwd_secure_uncommon')) }}
-                                    {{ trans('general.yes') }}
-                                </label>
-                                {!! $errors->first('pwd_secure_uncommon', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                <p class="help-block">
-                                    {{ trans('admin/settings/general.pwd_secure_uncommon_help') }}
-                                </p>
-                            </div>
-                        </div>
-                        <!-- /.form-group -->
 
                         <!-- Common Passwords -->
                         <div class="form-group">
@@ -99,21 +80,31 @@
                             </div>
                             <div class="col-md-9">
 
-                                {{ Form::checkbox("pwd_secure_complexity['disallow_same_pwd_as_user_fields']", 'disallow_same_pwd_as_user_fields', old('disallow_same_pwd_as_user_fields', strpos($setting->pwd_secure_complexity, 'disallow_same_pwd_as_user_fields')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}<br>
-
-
-                                {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}<br>
-
-                                {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('class' => 'minimal', 'aria-label'=>'pwd_secure_complexity')) }}
-                                {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}
+                                <label class="form-control">
+                                    <span class="sr-only">{{ trans('admin/settings/general.pwd_secure_uncommon') }}</span>
+                                    {{ Form::checkbox('pwd_secure_uncommon', '1', old('pwd_secure_uncommon', $setting->pwd_secure_uncommon),array( 'aria-label'=>'pwd_secure_uncommon')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_uncommon') }}
+                                </label>
+                                <label class="form-control">
+                                    {{ Form::checkbox("pwd_secure_complexity['disallow_same_pwd_as_user_fields']", 'disallow_same_pwd_as_user_fields', old('disallow_same_pwd_as_user_fields', strpos($setting->pwd_secure_complexity, 'disallow_same_pwd_as_user_fields')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_disallow_same_pwd_as_user_fields') }}
+                                </label>
+                                <label class="form-control">
+                                    {{ Form::checkbox("pwd_secure_complexity['letters']", 'letters', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'letters')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_letters') }}
+                                </label>
+                                <label class="form-control">
+                                    {{ Form::checkbox("pwd_secure_complexity['numbers']", 'numbers', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'numbers')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_numbers') }}
+                                </label>
+                                <label class="form-control">
+                                    {{ Form::checkbox("pwd_secure_complexity['symbols']", 'symbols', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'symbols')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_symbols') }}
+                                </label>
+                                <label class="form-control">
+                                    {{ Form::checkbox("pwd_secure_complexity['case_diff']", 'case_diff', old('pwd_secure_uncommon', strpos($setting->pwd_secure_complexity, 'case_diff')!==false), array('aria-label'=>'pwd_secure_complexity')) }}
+                                    {{ trans('admin/settings/general.pwd_secure_complexity_case_diff') }}
+                                </label>
 
                                 <p class="help-block">
                                     {{ trans('admin/settings/general.pwd_secure_complexity_help') }}
@@ -125,7 +116,7 @@
                         <!-- Remote User Authentication -->
                         <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('login_remote_user_label', trans('admin/settings/general.login_remote_user_text')) }}
+                                <strong>{{ trans('admin/settings/general.login_remote_user_text') }}</strong>
                             </div>
                             <div class="col-md-9">
                                 <!--  Enable Remote User Login -->
@@ -133,8 +124,11 @@
                                 @if (config('app.lock_passwords'))
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('class' => 'minimal', 'aria-label'=>'login_remote_user')) }}
-                                    {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                    <label class="form-control">
+                                        {{ Form::checkbox('login_remote_user_enabled', '1', old('login_remote_user_enabled', $setting->login_remote_user_enabled),array('aria-label'=>'login_remote_user')) }}
+                                        {{ Form::label('login_remote_user_enabled',  trans('admin/settings/general.login_remote_user_enabled_text')) }}
+                                    </label>
+
                                     {!! $errors->first('login_remote_user_enabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="help-block">
                                         {{ trans('admin/settings/general.login_remote_user_enabled_help') }}
@@ -155,9 +149,9 @@
                                         {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }}
                                     </p>
                                     <!--  Disable other logins mechanism -->
-                                    <label>
+                                    <label class="form-control">
 
-                                        {{ Form::checkbox('login_common_disabled', '1', old('login_common_disabled', $setting->login_common_disabled),array('class' => 'minimal', 'aria-label'=>'login_common_disabled')) }}
+                                        {{ Form::checkbox('login_common_disabled', '1', old('login_common_disabled', $setting->login_common_disabled),array('aria-label'=>'login_common_disabled')) }}
                                         {{ trans('admin/settings/general.login_common_disabled_text') }}
                                     </label>
                                     {!! $errors->first('login_common_disabled', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 37f15a98b9..fb74e702d5 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -23,9 +23,11 @@
 
 <!-- Label type -->
 <div class="form-group{{ $errors->has('statuslabel_types') ? ' has-error' : '' }}">
-    <label for="statuslabel_types" class="col-md-3 control-label">{{ trans('admin/statuslabels/table.status_type') }} </label>
+    <label for="statuslabel_types" class="col-md-3 control-label">
+        {{ trans('admin/statuslabels/table.status_type') }}
+    </label>
     <div class="col-md-7 required">
-        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px', 'aria-label'=>'statuslabel_types')) }}
+        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'width: 100%; min-width:400px', 'aria-label'=>'statuslabel_types')) }}
         {!! $errors->first('statuslabel_types', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
@@ -46,19 +48,23 @@
 
 <!-- Show in Nav -->
 <div class="form-group{{ $errors->has('notes') ? ' has-error' : '' }}">
-
-    <label class="col-md-offset-3" style="padding-left: 15px;">
-        <input type="checkbox" value="1" name="show_in_nav" id="show_in_nav" class="minimal" {{ Request::old('show_in_nav', $item->show_in_nav) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.show_in_nav') }}
-    </label>
+    <div class="col-md-9 col-md-offset-3">
+        <label class="form-control">
+            <input type="checkbox" value="1" name="show_in_nav" id="show_in_nav" {{ Request::old('show_in_nav', $item->show_in_nav) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.show_in_nav') }}
+        </label>
+    </div>
 </div>
 
 <!-- Set as Default -->
 <div class="form-group{{ $errors->has('default_label') ? ' has-error' : '' }}">
 
-    <label class="col-md-offset-3" style="padding-left: 15px;">
-        <input type="checkbox" value="1" name="default_label" id="default_label" class="minimal" {{ Request::old('default_label', $item->default_label) == '1' ? ' checked="checked"' : '' }}> {{ trans('admin/statuslabels/table.default_label') }}
-    </label>
-    <p class="col-md-offset-3 help-block"> {{ trans('admin/statuslabels/table.default_label_help') }}</p>
+    <div class="col-md-9 col-md-offset-3">
+        <label class="form-control">
+            <input type="checkbox" value="1" name="default_label" id="default_label" {{ Request::old('default_label', $item->default_label) == '1' ? ' checked="checked"' : '' }}>
+             {{ trans('admin/statuslabels/table.default_label') }}
+        </label>
+        <p class="help-block"> {{ trans('admin/statuslabels/table.default_label_help') }}</p>
+    </div>
 </div>
 
 @stop
diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php
index 2916fd1a85..327dabe64a 100644
--- a/resources/views/users/bulk-edit.blade.php
+++ b/resources/views/users/bulk-edit.blade.php
@@ -44,8 +44,8 @@
 
                         <div class="form-group">
                             <div class=" col-md-9 col-md-offset-3">
-                                <label>
-                                    {{ Form::checkbox('null_location_id', '1', false, ['class' => 'minimal']) }}
+                                <label class="form-control">
+                                    {{ Form::checkbox('null_location_id', '1', false) }}
                                     {{ trans_choice('general.set_users_field_to_null', count($users), ['field' => trans('general.location'), 'user_count' => count($users)]) }}
                                 </label>
                             </div>
@@ -84,14 +84,21 @@
                                 {{ trans('admin/users/general.remote') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="remote">
-                                        {{ Form::radio('remote', '', true, ['aria-label'=>'remote', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('remote', '1', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.remote_label') }}<br>
-                                        {{ Form::radio('remote', '0', old('remote'), ['aria-label'=>'remote', 'class'=>'minimal']) }}   {{ trans('admin/users/general.not_remote_label') }}
 
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('remote', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                        {{  trans('general.do_not_change') }}
                                     </label>
-                                </div>
+                                    <label for="remote" class="form-control">
+                                        {{ Form::radio('remote', '1', old('remote'), ['id' => 'remote', 'aria-label'=>'remote']) }}
+                                        {{ trans('admin/users/general.remote_label') }}
+                                    </label>
+                                    <label for="not_remote" class="form-control">
+                                        {{ Form::radio('remote', '0', old('remote'), ['id' => 'not_remote', 'aria-label'=>'not_remote']) }}
+                                        {{ trans('admin/users/general.not_remote_label') }}
+                                    </label>
+
+
                             </div>
                         </div> <!--/form-group-->
 
@@ -101,12 +108,14 @@
                                 {{ trans('general.ldap_sync') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="ldap_import">
-                                        {{ Form::radio('ldap_import', '', true, ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['aria-label'=>'ldap_import', 'class'=>'minimal']) }} {{ trans('general.ldap_import') }}
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('ldap_import', '', true, ['id' => 'no_change', 'aria-label'=>'ldap_import']) }}
+                                        {{  trans('general.do_not_change') }}
+                                    </label>
+                                    <label for="ldap_import" class="form-control">
+                                        {{ Form::radio('ldap_import', '0', old('ldap_import'), ['id' => 'ldap_import', 'aria-label'=>'ldap_import']) }}
+                                        {{ trans('general.ldap_import') }}
                                     </label>
-                                </div>
                             </div>
                         </div> <!--/form-group-->
 
@@ -116,14 +125,20 @@
                                 {{ trans('general.login_enabled') }}
                             </div>
                             <div class="col-sm-9">
-                                <div class="radio">
-                                    <label for="activated">
-                                        {{ Form::radio('activated', '', true, ['aria-label'=>'activated', 'class'=>'minimal']) }} {{  trans('general.do_not_change') }} <br>
-                                        {{ Form::radio('activated', '1', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('admin/users/general.user_activated')}} <br>
-                                        {{ Form::radio('activated', '0', old('activated'), ['aria-label'=>'activated', 'class'=>'minimal']) }}  {{  trans('admin/users/general.user_deactivated')}}
 
+                                    <label for="no_change" class="form-control">
+                                        {{ Form::radio('activated', '', true, ['id' => 'no_change', 'aria-label'=>'no_change']) }}
+                                        {{  trans('general.do_not_change') }}
                                     </label>
-                                </div>
+                                    <label for="activated" class="form-control">
+                                        {{ Form::radio('activated', '1', old('activated'), ['id' => 'activated', 'aria-label'=>'activated']) }}
+                                        {{  trans('admin/users/general.user_activated')}}
+                                    </label>
+                                    <label for="deactivated" class="form-control">
+                                        {{ Form::radio('activated', '0', old('activated'), ['id' => 'deactivated', 'aria-label'=>'deactivated']) }}
+                                        {{  trans('admin/users/general.user_deactivated')}}
+                                    </label>
+
                             </div>
                         </div> <!--/form-group-->
 
@@ -158,9 +173,15 @@
                         @endforeach
                     </div> <!--/.box-body-->
 
-                    <div class="text-right box-footer">
-                        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
-                    </div>
+                    <div class="box-footer text-right">
+                        <a class="btn btn-link pull-left" href="{{ URL::previous() }}">{{ trans('button.cancel') }}</a>
+
+                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords') ? ' disabled' : '') }}>
+                            <i class="fas fa-check icon-white" aria-hidden="true"></i>
+                            {{ trans('button.update') }}
+                        </button>
+
+                    </div><!-- /.box-footer -->
                 </div> <!--/.box.box-default-->
             </form>
         </div> <!--/.col-md-8-->
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 0bccfada85..a3a37d4a35 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -36,7 +36,9 @@
               <table class="display table table-hover">
                 <thead>
                   <tr>
-                    <th class="col-md-1"><input type="checkbox" id="checkAll"></th>
+                    <th class="col-md-1">
+                      <!-- <input type="checkbox" id="checkAll"> -->
+                      </th>
                     <th class="col-md-6">{{ trans('general.name') }}</th>
                     <th class="col-md-5">{{ trans('general.groups') }}</th>
                     <th class="col-md-5">{{ trans('general.assets') }}</th>
@@ -122,9 +124,10 @@
 <script>
 
 
-  $("#checkAll").change(function () {
-    $("input:checkbox").prop('checked', $(this).prop("checked"));
-  });
+  // TODO: include a class that excludes certain checkboxes by class to not be select-all'd
+  // $("#checkAll").change(function () {
+  //   $("input:checkbox").prop('checked', $(this).prop("checked"));
+  // });
 
 
   $(":submit").attr("disabled", "disabled");
diff --git a/resources/views/users/confirm-merge.blade.php b/resources/views/users/confirm-merge.blade.php
index c8d87916a4..43b38061fe 100644
--- a/resources/views/users/confirm-merge.blade.php
+++ b/resources/views/users/confirm-merge.blade.php
@@ -71,8 +71,7 @@
                                     @foreach ($users as $user)
                                         <tr {!! ($user->isSuperUser() ? ' class="danger"':'') !!}>
                                             <td>
-                                              <input type="radio" name="merge_into_id" id="{{ $user->id }}" value="{{ $user->id }}" class="minimal">
-                                                <label for="{{ $user->id }}"> {{ $user->present()->fullName() }}</label>
+                                                <label class="form-control" for="{{ $user->id }}"><input type="radio" name="merge_into_id" id="{{ $user->id }}" value="{{ $user->id }}">  {{ $user->present()->fullName() }}</label>
                                             </td>
                                             <td>
                                                 {{ $user->email }}