diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 111eb1baed..6c286330b4 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -844,6 +844,14 @@ class SettingsController extends Controller
         if (is_null($setting = Setting::getSettings())) {
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
+        $setting->label2_enable = $request->input('label2_enable');
+        $setting->label2_template = $request->input('label2_template');
+        $setting->label2_title = $request->input('label2_title');
+        $setting->label2_asset_logo = $request->input('label2_asset_logo');
+        $setting->label2_1d_type = $request->input('label2_1d_type');
+        $setting->label2_2d_type = $request->input('label2_2d_type');
+        $setting->label2_2d_target = $request->input('label2_2d_target');
+        $setting->label2_fields = $request->input('label2_fields');
         $setting->labels_per_page = $request->input('labels_per_page');
         $setting->labels_width = $request->input('labels_width');
         $setting->labels_height = $request->input('labels_height');
diff --git a/app/Presenters/LabelPresenter.php b/app/Presenters/LabelPresenter.php
new file mode 100644
index 0000000000..387118432a
--- /dev/null
+++ b/app/Presenters/LabelPresenter.php
@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Presenters;
+
+/**
+ * Class LabelPresenter
+ */
+class LabelPresenter extends Presenter
+{
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'radio',
+                'radio' => true,
+                'formatter' => 'labelRadioFormatter'
+            ], [
+                'field' => 'name',
+                'searchable' => true,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('general.name'),
+                'visible' => true,
+            ], [
+                'field' => 'size',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/settings/table.size'),
+                'visible' => true,
+                'formatter' => 'labelSizeFormatter'
+            ], [
+                'field' => 'labels_per_page',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.labels_per_page'),
+                'visible' => true,
+                'formatter' => 'labelPerPageFormatter'
+            ], [
+                'field' => 'support_fields',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.support_fields'),
+                'visible' => true
+            ], [
+                'field' => 'support_1d_barcode',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.support_1d_barcode'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter'
+            ], [
+                'field' => 'support_2d_barcode',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.support_2d_barcode'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter'
+            ], [
+                'field' => 'support_logo',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.support_logo'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter'
+            ], [
+                'field' => 'support_title',
+                'searchable' => false,
+                'sortable' => true,
+                'switchable' => true,
+                'title' => trans('admin/labels/table.support_title'),
+                'visible' => true,
+                'formatter' => 'trueFalseFormatter'
+            ]
+        ];
+
+        return json_encode($layout);
+    }
+}
diff --git a/database/migrations/2022_10_25_215520_add_label2_settings.php b/database/migrations/2022_10_25_215520_add_label2_settings.php
new file mode 100644
index 0000000000..66b0a08718
--- /dev/null
+++ b/database/migrations/2022_10_25_215520_add_label2_settings.php
@@ -0,0 +1,51 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddLabel2Settings extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            $table->boolean('label2_enable')->default(false);
+            $table->string('label2_template')->nullable()->default('DefaultLabel');
+            $table->string('label2_title')->nullable()->default(null);
+            $table->boolean('label2_asset_logo')->default(false);
+            $table->string('label2_1d_type')->default('default');
+            $table->string('label2_2d_type')->default('default');
+            $table->string('label2_2d_target')->default('hardware_id');
+            $table->string('label2_fields')->default(
+                trans('admin/hardware/form.tag').'=asset_tag;'.
+                trans('admin/hardware/form.name').'=name;'.
+                trans('admin/hardware/form.serial').'=serial;'.
+                trans('admin/hardware/form.model').'=model.name;'
+            );
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function (Blueprint $table) {
+            if (Schema::hasColumn('settings', 'label2_enable'))     $table->dropColumn('label2_enable');
+            if (Schema::hasColumn('settings', 'label2_template'))   $table->dropColumn('label2_template');
+            if (Schema::hasColumn('settings', 'label2_title'))      $table->dropColumn('label2_title');
+            if (Schema::hasColumn('settings', 'label2_asset_logo')) $table->dropColumn('label2_asset_logo');
+            if (Schema::hasColumn('settings', 'label2_1d_type'))    $table->dropColumn('label2_1d_type');
+            if (Schema::hasColumn('settings', 'label2_2d_type'))    $table->dropColumn('label2_2d_type');
+            if (Schema::hasColumn('settings', 'label2_2d_target'))  $table->dropColumn('label2_2d_target');
+            if (Schema::hasColumn('settings', 'label2_fields'))     $table->dropColumn('label2_fields');
+        });
+    }
+}
diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php
index 57ac6a4d7e..de888dbe7f 100644
--- a/resources/views/partials/bootstrap-table.blade.php
+++ b/resources/views/partials/bootstrap-table.blade.php
@@ -663,6 +663,25 @@
         }
     }
 
+    function labelPerPageFormatter(value, row, index, field) {
+        if (row) {
+            if (row.sheet_labels) { return 1; }
+            else { return row.sheet_info.labels_per_page; }
+        }
+    }
+
+    function labelRadioFormatter(value, row, index, field) {
+        if (row) {
+            return row.name == '{{ str_replace("\\", "\\\\", $snipeSettings->label2_template) }}';
+        }
+    }
+
+    function labelSizeFormatter(value, row) {
+        if (row) {
+            return row.width + ' x ' + row.height + ' ' + row.unit;
+        }
+    }
+
     function cleanFloat(number) {
         if(!number) { // in a JavaScript context, meaning, if it's null or zero or unset
             return 0.0;
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index a509769dee..dd9b302b2d 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -40,160 +40,363 @@
 
                     <div class="col-md-11 col-md-offset-1">
 
-                        <div class="form-group {{ $errors->has('labels_per_page') ? 'error' : '' }}">
+                        <!-- New Label Engine -->
+                        <div class="form-group {{ $errors->has('label2_enable') ? 'error' : '' }}">
                             <div class="col-md-3">
-                                {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page')) }}
+                                {{ Form::label('label2_enable', trans('admin/settings/general.label2_enable')) }}
                             </div>
                             <div class="col-md-9">
-                                {{ Form::text('labels_per_page', old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }}
-                                {!! $errors->first('labels_per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                {{ Form::checkbox('label2_enable', '1', old('label2_enable', $setting->label2_enable, [ 'class'=>'minimal', 'aria-label'=>'label2_enable' ])) }}
+                                {{ trans('general.yes') }}
+                                {!! $errors->first('label2_enable', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                <p class="help-block">{!! trans('admin/settings/general.label2_enable_help') !!}</p>
                             </div>
                         </div>
 
-                        <div class="form-group {{ $errors->has('labels_fontsize') ? 'error' : '' }}">
-                            <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="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>
-                                </div>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('labels_fontsize', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
+                        @if ($setting->label2_enable)
+                            <!-- New Settings -->
 
-                        <div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
-                            <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="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>
+                            <!-- Template -->
+                            <div class="form-group {{ $errors->has('label2_template') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_template', trans('admin/settings/general.label2_template')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    <table
+                                        data-click-to-select="true"
+                                        data-columns="{{ \App\Presenters\LabelPresenter::dataTableLayout() }}"
+                                        data-cookie="true"
+                                        data-cookie-id-table="label2TemplateTable"
+                                        data-id-table="label2TemplateTable"
+                                        data-pagination="true"
+                                        data-search="true"
+                                        data-select-item-name="label2_template"
+                                        data-id-field="name"
+                                        data-show-columns="true"
+                                        data-show-fullscreen="true"
+                                        data-show-refresh="true"
+                                        data-side-pagination="server"
+                                        data-sort-name="name"
+                                        data-sort-order="asc"
+                                        data-url="{{ route('api.labels.index') }}"
+                                        id="label2TemplateTable"
+                                        class="table table-striped snipe-table"
+                                    ></table>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px">
-                                <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>
-                                </div>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
 
-                        <div class="form-group {{ $errors->has('labels_display_sgutter') ? 'error' : '' }}">
-                            <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="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>
+                            <!-- Title -->
+                            <div class="form-group {{ $errors->has('label2_title') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_title', trans('admin/settings/general.label2_title')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    {{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }}
+                                    {!! $errors->first('label2_title', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{!! trans('admin/settings/general.label2_title_help') !!}</p>
+                                    <p class="help-block">
+                                        {!! trans('admin/settings/general.label2_title_help_phold') !!}.<br />
+                                        {!! trans('admin/settings/general.help_asterisk_bold') !!}.<br />
+                                        {!!
+                                            trans('admin/settings/general.help_blank_to_use', [
+                                                'setting_name' => trans('admin/settings/general.barcodes').' &gt; '.trans('admin/settings/general.qr_text')
+                                            ])
+                                        !!}
+                                    </p>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px">
-                                <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>
-                                </div>
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('labels_display_sgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                {!! $errors->first('labels_display_bgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
 
-                        <div class="form-group {{ $errors->has('labels_pmargin_top') ? 'error' : '' }}">
-                            <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="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>
+                            <!-- Use Asset Logo -->
+                            <div class="form-group {{ $errors->has('label2_asset_logo') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_asset_logo', trans('admin/settings/general.label2_asset_logo')) }}
                                 </div>
-                                <div class="input-group">
-                                    {{ Form::text('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }}
-                                    <div class="input-group-addon">{{ trans('admin/settings/general.right') }}</div>
+                                <div class="col-md-9">
+                                    {{ Form::checkbox('label2_asset_logo', '1', old('label2_asset_logo', $setting->label2_asset_logo, [ 'class'=>'minimal', 'aria-label'=>'label2_asset_logo' ])) }}
+                                    {{ trans('general.yes') }}
+                                    {!! $errors->first('label2_asset_logo', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{!! trans('admin/settings/general.label2_asset_logo_help', ['setting_name' => trans('admin/settings/general.brand').' &gt; '.trans('admin/settings/general.label_logo')]) !!}</p>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" 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>
+                            
+                            <!-- 1D Barcode Type -->
+                            <div class="form-group{{ $errors->has('label2_1d_type') ? ' has-error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_1d_type', trans('admin/settings/general.label2_1d_type')) }}
                                 </div>
-                                <div class="input-group">
-                                    {{ Form::text('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }}
-                                    <div class="input-group-addon">{{ trans('admin/settings/general.left') }}</div>
-                                </div>
-
-                            </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                            </div>
-                        </div>
-
-                        <div class="form-group {{ (($errors->has('labels_pageheight')) || $errors->has('labels_pagewidth')) ? 'error' : '' }}">
-                            <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="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>
+                                <div class="col-md-9">
+                                    @php
+                                        $select1DValues = [
+                                            'default' => trans('admin/settings/general.default').' [ '.$setting->alt_barcode.' ]',
+                                            'none'    => trans('admin/settings/general.none'),
+                                            'C128'    => 'C128',
+                                            'C39'     => 'C39',
+                                            'EAN5'    => 'EAN5',
+                                            'EAN13'   => 'EAN13',
+                                            'UPCA'    => 'UPCA',
+                                            'UPCE'    => 'UPCE'
+                                        ];
+                                    @endphp
+                                    {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
+                                    {!! $errors->first('label2_1d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.label2_1d_type_help') }}.
+                                        {!! 
+                                            trans('admin/settings/general.help_default_will_use', [
+                                                'default' => trans('admin/settings/general.default'),
+                                                'setting_name' => trans('admin/settings/general.barcodes').' &gt; '.trans('admin/settings/general.alt_barcode_type'),
+                                            ])
+                                        !!}
+                                    </p>
                                 </div>
                             </div>
-                            <div class="col-md-3 form-group" style="margin-left: 10px">
-                                <div class="input-group">
-                                    {{ Form::text('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }}
-                                    <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
+                            
+                            <!-- 2D Barcode Type -->
+                            <div class="form-group{{ $errors->has('label2_2d_type') ? ' has-error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_2d_type', trans('admin/settings/general.label2_2d_type')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    @php
+                                        $select2DValues = [
+                                            'default'    => trans('admin/settings/general.default').' [ '.$setting->barcode_type.' ]',
+                                            'none'       => trans('admin/settings/general.none'),
+                                            'QRCODE'     => 'QRCODE',
+                                            'DATAMATRIX' => 'DATAMATRIX',
+                                            'PDF417'     => 'PDF417',
+                                        ];
+                                    @endphp
+                                    {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
+                                    {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                    <p class="help-block">
+                                        {{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
+                                        {!! 
+                                            trans('admin/settings/general.help_default_will_use', [
+                                                'default' => trans('admin/settings/general.default'),
+                                                'setting_name' => trans('admin/settings/general.barcodes').' &gt; '.trans('admin/settings/general.barcode_type'),
+                                            ])
+                                        !!}
+                                    </p>
                                 </div>
                             </div>
-                            <div class="col-md-9 col-md-offset-3">
-                                {!! $errors->first('labels_pagewidth', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                {!! $errors->first('labels_pageheight', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                            
+                            <!-- 2D Barcode Target -->
+                            <div class="form-group{{ $errors->has('label2_2d_target') ? ' has-error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                    {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                    <p class="help-block">{!! trans('admin/settings/general.label2_2d_target_help') !!}</p>
+                                </div>
                             </div>
-                        </div>
 
-                        <div class="form-group">
-                            <div class="col-md-3">
-			                {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
+                            <!-- Fields -->
+                            <div class="form-group {{ $errors->has('label2_fields') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('label2_fields', trans('admin/settings/general.label2_fields')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    {{ Form::text('label2_fields', old('label2_fields', $setting->label2_fields), [ 'class'=>'form-control', 'aria-label'=>'label2_fields' ]) }}
+                                    {!! $errors->first('label2_fields', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    <p class="help-block">{!! trans('admin/settings/general.label2_fields_help') !!}</p>
+                                    <p class="help-block">
+                                        {!! trans('admin/settings/general.label2_fields_help_semi') !!}.<br />
+                                        {!! trans('admin/settings/general.label2_fields_help_pipe') !!}.<br />
+                                        {!! trans('admin/settings/general.label2_fields_help_once') !!}.
+                                    </p>
+                                </div>
                             </div>
-                            <div class="col-md-9">
-                                <div class="checkbox">
-                                    <label for="labels_display_name">
-                                        {{ 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">
-                                        {{ 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">
-                                        {{ 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">
-                                        {{ 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">
-                                        {{ 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>
 
-                                </div> <!--/.CHECKBOX-->
-                            </div> <!--/.col-md-9-->
-                        </div> <!--/.form-group-->
+                            @include('partials.bootstrap-table')
+                        
+                        @else
+                            <!-- Hidden version of new settings -->
+                            {{ Form::hidden('label2_template', old('label2_template', $setting->label2_template)) }}
+                            {{ Form::hidden('label2_title', old('label2_title', $setting->label2_title)) }}
+                            {{ Form::hidden('label2_asset_logo', old('label2_asset_logo', $setting->label2_asset_logo)) }}
+                            {{ Form::hidden('label2_1d_type', old('label2_1d_type', $setting->label2_1d_type)) }}
+                            {{ Form::hidden('label2_2d_type', old('label2_2d_type', $setting->label2_2d_type)) }}
+                            {{ Form::hidden('label2_2d_target', old('label2_2d_target', $setting->label2_2d_target)) }}
+                            {{ Form::hidden('label2_fields', old('label2_fields', $setting->label2_fields)) }}
+                        @endif
 
+                        @if ($setting->label2_enable && ($setting->label2_template != 'DefaultLabel'))
+                            <!-- Hidden version of legacy settings -->
+                            {{ Form::hidden('labels_per_page', old('labels_per_page', $setting->labels_per_page)) }}
+                            {{ Form::hidden('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize)) }}
+                            {{ Form::hidden('labels_width', old('labels_width', $setting->labels_width)) }}
+                            {{ Form::hidden('labels_height', old('labels_height', $setting->labels_height)) }}
+                            {{ Form::hidden('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter)) }}
+                            {{ Form::hidden('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter)) }}
+                            {{ Form::hidden('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top)) }}
+                            {{ Form::hidden('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom)) }}
+                            {{ Form::hidden('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left)) }}
+                            {{ Form::hidden('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right)) }}
+                            {{ Form::hidden('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth)) }}
+                            {{ Form::hidden('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight)) }}
+                            {{ Form::hidden('labels_display_name', old('labels_display_name', $setting->labels_display_name)) }}
+                            {{ Form::hidden('labels_display_serial', old('labels_display_serial', $setting->labels_display_serial)) }}
+                            {{ Form::hidden('labels_display_tag', old('labels_display_tag', $setting->labels_display_tag)) }}
+                            {{ Form::hidden('labels_display_model', old('labels_display_model', $setting->labels_display_model)) }}
+                            {{ Form::hidden('labels_display_company_name', old('labels_display_company_name', $setting->labels_display_company_name)) }}
+                        @else
 
+                            <!-- Legacy settings -->
+                            <div class="form-group {{ $errors->has('labels_per_page') ? 'error' : '' }}">
+                                <div class="col-md-3">
+                                    {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    {{ Form::text('labels_per_page', old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }}
+                                    {!! $errors->first('labels_per_page', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group {{ $errors->has('labels_fontsize') ? 'error' : '' }}">
+                                <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="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>
+                                    </div>
+                                </div>
+                                <div class="col-md-9 col-md-offset-3">
+                                    {!! $errors->first('labels_fontsize', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group {{ $errors->has('labels_width') ? 'error' : '' }}">
+                                <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="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="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>
+                                    </div>
+                                </div>
+                                <div class="col-md-9 col-md-offset-3">
+                                    {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group {{ $errors->has('labels_display_sgutter') ? 'error' : '' }}">
+                                <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="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="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>
+                                    </div>
+                                </div>
+                                <div class="col-md-9 col-md-offset-3">
+                                    {!! $errors->first('labels_display_sgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    {!! $errors->first('labels_display_bgutter', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group {{ $errors->has('labels_pmargin_top') ? 'error' : '' }}">
+                                <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="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>
+                                    </div>
+                                    <div class="input-group">
+                                        {{ Form::text('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }}
+                                        <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="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>
+                                    </div>
+                                    <div class="input-group">
+                                        {{ Form::text('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }}
+                                        <div class="input-group-addon">{{ trans('admin/settings/general.left') }}</div>
+                                    </div>
+
+                                </div>
+                                <div class="col-md-9 col-md-offset-3">
+                                    {!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    {!! $errors->first('labels_height', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group {{ (($errors->has('labels_pageheight')) || $errors->has('labels_pagewidth')) ? 'error' : '' }}">
+                                <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="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>
+                                    </div>
+                                </div>
+                                <div class="col-md-3 form-group" style="margin-left: 10px">
+                                    <div class="input-group">
+                                        {{ Form::text('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }}
+                                        <div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
+                                    </div>
+                                </div>
+                                <div class="col-md-9 col-md-offset-3">
+                                    {!! $errors->first('labels_pagewidth', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                    {!! $errors->first('labels_pageheight', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
+                                </div>
+                            </div>
+
+                            <div class="form-group">
+                                <div class="col-md-3">
+                                    {{ Form::label('labels_display', trans('admin/settings/general.label_fields')) }}
+                                </div>
+                                <div class="col-md-9">
+                                    <div class="checkbox">
+                                        <label for="labels_display_name">
+                                            {{ 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">
+                                            {{ 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">
+                                            {{ 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">
+                                            {{ 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">
+                                            {{ 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>
+                                    </div> <!--/.CHECKBOX-->
+                                </div> <!--/.col-md-9-->
+                            </div> <!--/.form-group-->
+
+                        @endif
 
 
                     </div>