diff --git a/.github/ISSUE_TEMPLATE/Bug-Report.yml b/.github/ISSUE_TEMPLATE/Bug-Report.yml
index 523ebc5e26..badb94e95a 100644
--- a/.github/ISSUE_TEMPLATE/Bug-Report.yml
+++ b/.github/ISSUE_TEMPLATE/Bug-Report.yml
@@ -67,6 +67,31 @@ body:
         - Safari
         - Microsoft Edge
         - Other
+  - type: dropdown
+    id: on-demo
+    attributes:
+      label: Can you reproduce this on the demo at https://demo.snipeitapp.com?
+      options:
+        - 'Yes'
+        - 'No'
+        - N/A
+  - type: dropdown
+    id: fmcs
+    attributes:
+      label: Do you have full multiple company support enabled?
+      description: You can check this in Admin Settings > General Settings > Scoping.
+      options:
+        - 'Yes'
+        - 'No'
+  - type: dropdown
+    id: fmcs-location
+    attributes:
+      label: If you have full multiple company support enabled, do you have location scoping to company enabled?
+      description: You can check this in Admin Settings > General Settings > Scoping.
+      options:
+        - 'Yes'
+        - 'No'
+        - I do not have full multiple company support enabled
   - type: textarea
     id: server-logs
     attributes:
diff --git a/resources/views/blade/example.blade.php b/resources/views/blade/example.blade.php
deleted file mode 100644
index d1cbb4dee1..0000000000
--- a/resources/views/blade/example.blade.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>
-    Hi.
-</p>
diff --git a/resources/views/blade/filestable.blade.php b/resources/views/blade/filestable.blade.php
index c4b105d6bb..8b20ec067b 100644
--- a/resources/views/blade/filestable.blade.php
+++ b/resources/views/blade/filestable.blade.php
@@ -4,7 +4,7 @@
     'object_type' => '',
 ])
 
-<!-- begin non-ajaxed file listing table -->
+<!-- begin ajaxed file listing table -->
 <div class="table-responsive">
     <table
             data-columns="{{ \App\Presenters\UploadedFilesPresenter::dataTableLayout() }}"
@@ -30,6 +30,4 @@
 
 </div>
 
-
-
-<!-- end non-ajaxed file listing table -->
\ No newline at end of file
+<!-- end ajaxed file listing table -->
\ No newline at end of file
diff --git a/resources/views/blade/form-row.blade.php b/resources/views/blade/form-row.blade.php
new file mode 100644
index 0000000000..fdb5777d2b
--- /dev/null
+++ b/resources/views/blade/form-row.blade.php
@@ -0,0 +1,39 @@
+<!-- form-row blade component -->
+@props([
+    'errors',
+    'label',
+    'field_name',
+    'help_text' => null,
+    'label_style' => null,
+    'label_class' => 'control-label col-md-3 col-sm-12 col-xs-12',
+    'div_style' => null,
+    'input_style' => null,
+    'item' => null,
+    'type' => null,
+])
+
+<div class="form-group{{ $errors->has($field_name) ? ' has-error' : '' }}">
+    <label for="{{ $field_name }}"{{ $attributes->merge(['class' => $label_class]) }}{{ $label_style ? $attributes->merge(['style' => $label_style]) : '' }}>
+        {{ $label }}
+    </label>
+    <div {{ $attributes->merge(['class' => 'col-md-8 col-sm-12', 'style' => $div_style]) }}>
+        <x-input.text
+                :aria-label="$field_name"
+                :name="$field_name"
+                :item="$item ?? null"
+                :id="$field_name"
+                :required="Helper::checkIfRequired($item, $field_name)"
+                :style="$input_style"
+                :value="old($field_name, $item->{$field_name})"
+                :type="$type ?? 'text'"
+        />
+
+        {!! $errors->first($field_name, '<span class="alert-msg"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+
+        @if ($help_text)
+            <p class="help-block">
+                {!! $help_text !!}
+            </p>
+       @endif
+    </div>
+</div>
diff --git a/resources/views/blade/input/text.blade.php b/resources/views/blade/input/text.blade.php
new file mode 100644
index 0000000000..572d61a0a4
--- /dev/null
+++ b/resources/views/blade/input/text.blade.php
@@ -0,0 +1,7 @@
+@props([
+    'item' => null,
+    'field_name' => null,
+    'input_style' => null,
+])
+<!-- input-text blade component -->
+<input {{ $attributes->merge(['class' => 'form-control']) }} />
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 1c9b807776..fe1fa96381 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -9,57 +9,64 @@
 
 {{-- Page content --}}
 @section('inputFields')
-@include ('partials.forms.edit.name', ['translated_name' => trans('admin/manufacturers/table.name')])
+
+    <!-- Name -->
+    <x-form-row
+            :label="trans('admin/manufacturers/table.name')"
+            :item="$item"
+            :errors="$errors ?? null"
+            field_name="name"
+            input_style="width: 50%"
+            class="farts"
+            label_style="color: red"
+    />
+
     <!-- URL -->
-    <div class="form-group {{ $errors->has('url') ? ' has-error' : '' }}">
-        <label for="url" class="col-md-3 control-label">{{ trans('general.url') }}
-        </label>
-        <div class="col-md-6">
-            <input class="form-control" type="text" name="url" id="url" value="{{ old('url', $item->url) }}" />
-            {!! $errors->first('url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-        </div>
-    </div>
+    <x-form-row
+            :label="trans('general.url')"
+            :item="$item"
+            :errors="$errors ?? null"
+            field_name="url"
+            type="url"
+    />
 
     <!-- Support URL -->
-    <div class="form-group {{ $errors->has('support_url') ? ' has-error' : '' }}">
-        <label for="support_url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.support_url') }}
-        </label>
-        <div class="col-md-6">
-            <input class="form-control" type="url" name="support_url" id="support_url" value="{{ old('support_url', $item->support_url) }}" />
-            {!! $errors->first('support_url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-        </div>
-    </div>
+    <x-form-row
+            :label="trans('admin/manufacturers/table.support_url')"
+            :item="$item"
+            :errors="$errors ?? null"
+            field_name="support_url"
+            type="url"
+    />
 
     <!-- Warranty Lookup URL -->
-    <div class="form-group {{ $errors->has('warranty_lookup_url') ? ' has-error' : '' }}">
-        <label for="support_url" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.warranty_lookup_url') }}
-        </label>
-        <div class="col-md-6">
-            <input class="form-control" type="url" name="warranty_lookup_url" id="warranty_lookup_url" value="{{ old('warranty_lookup_url', $item->warranty_lookup_url) }}" />
-            <p class="help-block">{!! trans('admin/manufacturers/message.support_url_help') !!}</p>
-            {!! $errors->first('warranty_lookup_url', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-        </div>
-    </div>
+    <x-form-row
+            :label="trans('admin/manufacturers/table.warranty_lookup_url')"
+            :item="$item"
+            :errors="$errors ?? null"
+            :help_text="trans('admin/manufacturers/message.support_url_help')"
+            field_name="warranty_lookup_url"
+            type="url"
+    />
 
     <!-- Support Phone -->
-    <div class="form-group {{ $errors->has('support_phone') ? ' has-error' : '' }}">
-        <label for="support_phone" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.support_phone') }}
-        </label>
-        <div class="col-md-6">
-            <input class="form-control" type="text" name="support_phone" id="support_phone" value="{{ old('support_phone', $item->support_phone) }}" />
-            {!! $errors->first('support_phone', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-        </div>
-    </div>
+    <x-form-row
+            :label="trans('admin/manufacturers/table.support_phone')"
+            :item="$item"
+            :errors="$errors ?? null"
+            field_name="support_phone"
+            type="tel"
+    />
 
     <!-- Support Email -->
-    <div class="form-group {{ $errors->has('support_email') ? ' has-error' : '' }}">
-        <label for="support_email" class="col-md-3 control-label">{{ trans('admin/manufacturers/table.support_email') }}
-        </label>
-        <div class="col-md-6">
-            <input class="form-control" type="email" name="support_email" id="support_email" value="{{ old('support_email', $item->support_email) }}" />
-            {!! $errors->first('support_email', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-        </div>
-    </div>
+    <x-form-row
+            :label="trans('admin/manufacturers/table.support_email')"
+            :item="$item"
+            :errors="$errors ?? null"
+            field_name="support_email"
+            type="email"
+    />
+
 
 @include ('partials.forms.edit.image-upload', ['image_path' => app('manufacturers_upload_path')])