diff --git a/resources/views/blade/form-row-checkbox.blade.php b/resources/views/blade/form-row-checkbox.blade.php
deleted file mode 100644
index f46abec918..0000000000
--- a/resources/views/blade/form-row-checkbox.blade.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<!-- form-row blade component -->
-@props([
-    'errors',
-    'label' => null,
-    'name' => null,
-    'help_text' => null,
-    'label_style' => null,
-    'label_class' => 'col-md-3 col-sm-12 col-xs-12',
-    'input_div_class' => 'col-md-8 col-sm-12',
-    'type' => 'checkbox',
-    'item' => null,
-    'disabled' => false,
-    'error_offset_class' => 'col-md-7 col-md-offset-3',
-    'info_tooltip_text' => null,
-    'value_text' => null,
-    'checkbox_value' => null,
-])
-
-<div {{ $attributes->merge(['class' => 'form-group']) }}>
-
-    <x-form-label
-            :for="$name"
-            :style="$label_style ?? null"
-            class="{{ $label_class }}"
-    >
-        {{ $label ?? $value_text }}
-    </x-form-label>
-
-    <div {{ $attributes->merge(['class' => $input_div_class]) }}>
-
-        <label class="form-control{{ $disabled ? ' form-control--disabled' : ''  }}">
-            <input type="checkbox" name="{{ $name }}" aria-label="{{ $name }}" value="{{ $checkbox_value }}" @checked(old($name, $item->$name)) {!! $disabled ? 'class="disabled" disabled' : ''  !!}>
-            {{ $value_text ?? $label }}
-        </label>
-
-    </div>
-
-
-
-
-    @if ($info_tooltip_text)
-        <!-- Info Tooltip -->
-        <div class="col-md-1 text-left" style="padding-left:0; margin-top: 5px;">
-            <x-input.info-tooltip>
-                {{ $info_tooltip_text }}
-            </x-input.info-tooltip>
-        </div>
-    @endif
-
-
-    @error($name)
-    <!-- Form Error -->
-    <div {{ $attributes->merge(['class' => $error_offset_class]) }}>
-                <span class="alert-msg" role="alert">
-                    <i class="fas fa-times" aria-hidden="true"></i>
-                    {{ $message }}
-                </span>
-    </div>
-    @enderror
-
-    @if ($help_text)
-        <!-- Help Text -->
-        <div {{ $attributes->merge(['class' => $error_offset_class]) }}>
-            <p class="help-block">
-                {!! $help_text !!}
-            </p>
-        </div>
-    @endif
-
-</div>
diff --git a/resources/views/blade/form-row.blade.php b/resources/views/blade/form-row.blade.php
index 0a7f2b5cd6..377c357f14 100644
--- a/resources/views/blade/form-row.blade.php
+++ b/resources/views/blade/form-row.blade.php
@@ -1,29 +1,35 @@
 <!-- form-row blade component -->
 @props([
-    'errors',
-    'label',
-    'name' => null,
-    'help_text' => null,
-    'label_style' => null,
-    'label_class' => 'col-md-3 col-sm-12 col-xs-12',
+    'checkbox_value' => null,
+    'disabled' => false,
     'div_style' => null,
+    'error_offset_class' => 'col-md-7 col-md-offset-3',
+    'errors',
+    'help_text' => null,
+    'info_tooltip_text' => null,
+    'input_class' => null,
     'input_div_class' => 'col-md-8 col-sm-12',
+    'input_group_addon' => null,
     'input_style' => null,
     'item' => null,
-    'type' => 'text',
-    'placeholder' => null,
-    'maxlength' => 191,
-    'minlength' => null,
-    'min' => null,
+    'label' => null,
+    'label_class' => 'col-md-3 col-sm-12 col-xs-12',
+    'label_style' => null,
     'max' => null,
+    'maxlength' => 191,
+    'min' => null,
+    'minlength' => null,
+    'name' => null,
+    'placeholder' => null,
     'step' => null,
-    'disabled' => false,
-    'error_offset_class' => 'col-md-7 col-md-offset-3',
-    'info_tooltip_text' => null,
+    'type' => 'text',
+    'value' => null,
+    'value_text' => null,
 ])
 
 <div {{ $attributes->merge(['class' => 'form-group']) }}>
 
+    @if (isset($label))
     <x-form-label
             :for="$name"
             :style="$label_style ?? null"
@@ -31,31 +37,40 @@
     >
         {{ $label }}
     </x-form-label>
+    @else
+       @php
+          $input_div_class = $input_div_class . ' ' . $error_offset_class;
+       @endphp
+    @endif
     
 
-    <div {{ $attributes->merge(['class' => $input_div_class, 'style' => $div_style]) }} >
+    <div {{ $attributes->merge(['class' => $input_div_class, 'style' => $div_style]) }}>
 
         @php
             $blade_type = in_array($type, ['text', 'email', 'url', 'tel', 'number', 'password']) ? 'text' : $type;
         @endphp
 
         <x-dynamic-component
-                :component="'input.'.$blade_type"
-                :aria-label="$name"
-                :$name
-                :$placeholder
+                :$checkbox_value
+                :$disabled
+                :$input_group_addon
                 :$input_style
                 :$item
+                :$max
+                :$maxlength
+                :$min
+                :$minlength
+                :$name
+                :$placeholder
+                :$step
+                :$type
+                :$value_text
+                :aria-label="$name"
+                :class="$input_class"
+                :component="'input.'.$blade_type"
                 :id="$name"
                 :required="Helper::checkIfRequired($item, $name)"
                 :value="old($name, $item->{$name})"
-                :$type
-                :$maxlength
-                :$minlength
-                :$disabled
-                :$min
-                :$max
-                :$step
         />
     </div>
 
diff --git a/resources/views/blade/input/checkbox.blade.php b/resources/views/blade/input/checkbox.blade.php
new file mode 100644
index 0000000000..6e86cee325
--- /dev/null
+++ b/resources/views/blade/input/checkbox.blade.php
@@ -0,0 +1,16 @@
+@props([
+    'item' => null,
+    'field_name' => null,
+    'input_style' => null,
+    'required' => false,
+    'disabled' => false,
+    'checkbox_value' => null,
+    'name' => null,
+    'label' => null,
+    'value_text' => null,
+])
+
+<label class="form-control{{ $disabled ? ' form-control--disabled' : ''  }}">
+    <input type="checkbox" name="{{ $name }}" aria-label="{{ $name }}" value="{{ $checkbox_value }}" @checked(old($name, $item->$name)) {!! $disabled ? 'class="disabled" disabled' : ''  !!}>
+    {{ $value_text ?? $label }}
+</label>
\ No newline at end of file
diff --git a/resources/views/blade/input/radio.blade.php b/resources/views/blade/input/radio.blade.php
new file mode 100644
index 0000000000..2bb3ea2185
--- /dev/null
+++ b/resources/views/blade/input/radio.blade.php
@@ -0,0 +1,15 @@
+@props([
+    'item' => null,
+    'field_name' => null,
+    'input_style' => null,
+    'required' => false,
+    'disabled' => false,
+    'name' => null,
+    'label' => null,
+    'value_text' => null,
+])
+
+<label class="form-control{{ $disabled ? ' form-control--disabled' : ''  }}">
+    <input type="radio" name="{{ $name }}" aria-label="{{ $name }}" @checked(old($name)) {!! $disabled ? 'class="disabled" disabled' : ''  !!}>
+    {{ $value_text ?? $label }}
+</label>
\ No newline at end of file
diff --git a/resources/views/blade/input/text.blade.php b/resources/views/blade/input/text.blade.php
index 0d13581fd3..29b52c5468 100644
--- a/resources/views/blade/input/text.blade.php
+++ b/resources/views/blade/input/text.blade.php
@@ -1,7 +1,6 @@
 @props([
-    'item' => null,
-    'field_name' => null,
     'input_style' => null,
+    'input_group_addon' => null,
     'required' => false,
 ])
 <!-- input-text blade component -->
@@ -9,3 +8,7 @@
     {{ $attributes->merge(['class' => 'form-control', 'style' => $input_style]) }}
     @required($required)
 />
+
+@if ($input_group_addon)
+    <span class="input-group-addon">{{ $input_group_addon }}</span>
+@endif
diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php
index de4a1db6b6..710d13afca 100755
--- a/resources/views/licenses/edit.blade.php
+++ b/resources/views/licenses/edit.blade.php
@@ -79,10 +79,11 @@
     />
 
     <!-- Reassignable -->
-    <x-form-row-checkbox
+    <x-form-row
             :label="trans('admin/licenses/form.reassignable')"
             :$item
             name="reassignable"
+            type="checkbox"
             checkbox_value="1"
             :value_text="trans('general.yes')"
     />
@@ -155,11 +156,12 @@
 @include ('partials.forms.edit.depreciation')
 
     <!-- Maintained -->
-    <x-form-row-checkbox
+    <x-form-row
             :label="trans('admin/licenses/form.maintained')"
             :$item
             :value_text="trans('general.yes')"
             name="maintained"
+            type="checkbox"
             checkbox_value="1"
     />
 
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index c861cc63bf..9800fb29ec 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -47,24 +47,22 @@
                             </legend>
 
                             <!-- Menu Alerts Enabled -->
-                            <div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
-                                <div class="col-md-9 col-md-offset-3">
-                                    <label class="form-control">
-                                        <input type="checkbox" name="show_alerts_in_menu" value="1" @checked(old('show_alerts_in_menu', $setting->show_alerts_in_menu))>
-                                        {{ trans('admin/settings/general.show_alerts_in_menu') }}
-                                    </label>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :item="$setting"
+                                    name="show_alerts_in_menu"
+                                    type="checkbox"
+                                    checkbox_value="1"
+                                    :value_text="trans('admin/settings/general.show_alerts_in_menu')"
+                            />
 
                             <!-- Alerts Enabled -->
-                            <div class="form-group {{ $errors->has('alerts_enabled') ? 'error' : '' }}">
-                                <div class="col-md-9 col-md-offset-3">
-                                    <label class="form-control">
-                                        <input type="checkbox" name="alerts_enabled" value="1" @checked(old('alerts_enabled', $setting->alerts_enabled))>
-                                        {{  trans('admin/settings/general.alerts_enabled') }}
-                                    </label>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :item="$setting"
+                                    type="checkbox"
+                                    name="alerts_enabled"
+                                    checkbox_value="1"
+                                    :value_text="trans('admin/settings/general.alerts_enabled')"
+                            />
 
                         </fieldset>
 
@@ -74,30 +72,41 @@
                             </legend>
 
                             <!-- Alert Email -->
-                            <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
-                                </div>
-                                <div class="col-md-7">
-                                    <input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com,it@yourcompany.com" maxlength="191">
-                                    {!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
-                                    <p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
-
-                                </div>
-                            </div>
-
+                            <x-form-row
+                                    :label="trans('admin/settings/general.alert_email')"
+                                    :item="$setting"
+                                    name="alert_email"
+                                    :help_text="trans('admin/settings/general.alert_email_help')"
+                                    placeholder="admin@yourcompany.com,it@yourcompany.com"
+                            />
 
                             <!-- Admin CC Email -->
-                            <div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
-                                </div>
-                                <div class="col-md-7">
-                                    <input type="email" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
-                                    {!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
-                                    <p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :label="trans('admin/settings/general.admin_cc_email')"
+                                    :item="$setting"
+                                    name="admin_cc_email"
+                                    :help_text="trans('admin/settings/general.admin_cc_email_help')"
+                                    placeholder="admin@yourcompany.com"
+                            />
+
+                            <!-- Always CC Admins -->
+                            <!-- TODO - this doesn't work as expected -->
+                            <x-form-row
+                                    :item="$setting"
+                                    type="radio"
+                                    name="admin_cc_always"
+                                    value="1"
+                                    :value_text="trans('admin/settings/general.admin_cc_always')"
+                            />
+
+                            <x-form-row
+                                    :item="$setting"
+                                    type="radio"
+                                    name="admin_cc_always"
+                                    value="0"
+                                    :value_text="trans('admin/settings/general.admin_cc_when_acceptance_required')"
+                            />
+
                             <div class="form-group">
                                 <div class="col-md-9 col-md-offset-3">
                                     <label class="form-control">
@@ -129,72 +138,77 @@
 
 
                             <!-- Alert interval -->
-                            <div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
-                                </div>
-                                <div class="col-md-9">
-                                    <input class="form-control" placeholder="30" maxlength="3" style="width: 70px;" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
-                                    {!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                </div>
-                            </div>
 
-                            <!-- Alert threshold -->
-                            <div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
-                                </div>
-                                <div class="col-md-8">
-                                    <input class="form-control" placeholder="5" maxlength="3" style="width: 70px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
-                                    {!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :label="trans('admin/settings/general.alert_interval')"
+                                    :item="$setting"
+                                    name="alert_interval"
+                                    type="number"
+                                    maxlength="3"
+                                    min="0"
+                                    max="999"
+                                    step="1"
+                                    input_div_class="col-md-2 col-sm-6"
+                            />
 
 
-                            <!-- Audit interval -->
-                            <div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
-                                </div>
-                                <div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
-                                    <input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
-                                    <span class="input-group-addon">{{ trans('general.months') }}</span>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    {!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :label="trans('admin/settings/general.alert_inv_threshold')"
+                                    :item="$setting"
+                                    name="alert_threshold"
+                                    type="number"
+                                    maxlength="3"
+                                    min="0"
+                                    max="999"
+                                    step="1"
+                                    input_div_class="col-md-2 col-sm-6"
+                            />
 
-                            <!-- Alert threshold -->
-                            <div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
-                                </div>
-                                <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
-                                    <input class="form-control" placeholder="14" maxlength="3" name="audit_warning_days" type="number" id="audit_warning_days" value="{{ old('audit_warning_days', $setting->audit_warning_days) }}">
-                                    <span class="input-group-addon">{{ trans('general.days') }}</span>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    {!! $errors->first('audit_warning_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">{{ trans('admin/settings/general.audit_warning_days_help') }}</p>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :label="trans('admin/settings/general.audit_interval')"
+                                    :item="$setting"
+                                    :help_text="trans('admin/settings/general.audit_interval_help')"
+                                    :input_group_addon="trans('general.months')"
+                                    name="audit_interval"
+                                    type="number"
+                                    maxlength="3"
+                                    min="0"
+                                    max="999"
+                                    step="1"
+                                    input_div_class="col-md-2 col-sm-6 input-group"
+                            />
+
+                            <x-form-row
+                                    :label="trans('admin/settings/general.audit_warning_days')"
+                                    :item="$setting"
+                                    :help_text="trans('admin/settings/general.audit_warning_days_help')"
+                                    :input_group_addon="trans('general.days')"
+                                    name="audit_warning_days"
+                                    type="number"
+                                    maxlength="3"
+                                    min="0"
+                                    max="999"
+                                    step="1"
+                                    input_div_class="col-md-2 col-sm-6 input-group"
+
+                            />
 
                             <!-- Due for checkin days -->
-                            <div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
-                                <div class="col-md-3">
-                                    <label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
-                                </div>
-                                <div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
-                                    <input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
-                                    <span class="input-group-addon">{{ trans('general.days') }}</span>
-                                </div>
-                                <div class="col-md-8 col-md-offset-3">
-                                    {!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
-                                </div>
-                            </div>
+                            <x-form-row
+                                    :label="trans('admin/settings/general.due_checkin_days')"
+                                    :item="$setting"
+                                    :help_text="trans('admin/settings/general.due_checkin_days_help')"
+                                    :input_group_addon="trans('general.days')"
+                                    name="due_checkin_days"
+                                    type="number"
+                                    maxlength="3"
+                                    min="0"
+                                    max="999"
+                                    step="1"
+                                    input_div_class="col-md-2 col-sm-6 input-group"
+                                    placeholder="14"
+                            />
+
                         </fieldset>
 
                         </div>
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 6ad2d286e9..454b7ace57 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -67,20 +67,22 @@
     />
 
 <!-- Show in Nav -->
-    <x-form-row-checkbox
+    <x-form-row
             :label="trans('admin/statuslabels/table.show_in_nav')"
             :$item
             :value_text="trans('general.yes')"
             name="show_in_nav"
+            type="checkbox"
             checkbox_value="1"
     />
 
 <!-- Set as Default -->
-    <x-form-row-checkbox
+    <x-form-row
             :$item
             :value_text="trans('general.yes')"
             name="default_label"
             checkbox_value="1"
+            type="checkbox"
             help_text="{!! trans('admin/statuslabels/table.default_label_help') !!}"
     />