diff --git a/resources/views/blade/form-input.blade.php b/resources/views/blade/form-input.blade.php
index a7e8910f80..5a040ccc30 100644
--- a/resources/views/blade/form-input.blade.php
+++ b/resources/views/blade/form-input.blade.php
@@ -1,7 +1,21 @@
+@aware(['name'])
+
 @props([
     'class' => 'col-md-8',
 ])
+
+
 <!-- form-input blade component -->
 <div {{ $attributes->merge(['class' => $class]) }}>
     {{ $slot }}
-</div>
\ No newline at end of file
+</div>
+
+
+@error($name)
+<div class="col-md-8 col-md-offset-3">
+        <span class="alert-msg" aria-hidden="true">
+            <x-icon type="x" />
+            {{ $message }}
+        </span>
+</div>
+@enderror
diff --git a/resources/views/blade/form-label.blade.php b/resources/views/blade/form-label.blade.php
index 2f7769378d..ccaa51752b 100644
--- a/resources/views/blade/form-label.blade.php
+++ b/resources/views/blade/form-label.blade.php
@@ -1,4 +1,6 @@
+@aware(['name'])
+
 <!-- form-label blade component -->
-<label {{ $attributes->merge(['class' => 'control-label col-md-3']) }}>
+<label {{ $attributes->merge(['class' => 'control-label col-md-3']) }} for="{{ $name }}">
     {{ $slot }}
 </label>
\ No newline at end of file
diff --git a/resources/views/blade/form-row.blade.php b/resources/views/blade/form-row.blade.php
index f547e71453..764e5b634e 100644
--- a/resources/views/blade/form-row.blade.php
+++ b/resources/views/blade/form-row.blade.php
@@ -1,4 +1,9 @@
+@props([
+    'name' => null,
+])
+
 <!-- form-row blade component -->
-<div class="form-group">
+<div {{ $attributes->merge(['name' => $name]) }} class="form-group @error($name) has-error @enderror">
     {{ $slot }}
-</div>
\ No newline at end of file
+</div>
+
diff --git a/resources/views/blade/input/datepicker.blade.php b/resources/views/blade/input/datepicker.blade.php
index 351936ea3c..83e8ea7555 100644
--- a/resources/views/blade/input/datepicker.blade.php
+++ b/resources/views/blade/input/datepicker.blade.php
@@ -1,7 +1,10 @@
+@aware(['name'])
+
 @props([
     'value' => null,
     'required' => false,
     'end_date' => null,
+    'name' => null,
 ])
 
 <!-- Datepicker -->
diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 9ddbbd6d7c..e9b14571fd 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -1,3 +1,5 @@
+@aware(['name'])
+
 @props([
     // <options> can either be provided as key => value pairs
     // or passed in via the default $slot
@@ -8,6 +10,7 @@
 ])
 
 <select
+     name="{{ $name }}"
     {{ $attributes->class(['select2', 'livewire-select2' => $forLivewire]) }}
     @if($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
 >
diff --git a/resources/views/blade/input/select2-ajax.blade.php b/resources/views/blade/input/select2-ajax.blade.php
index a16956dd67..1251663433 100644
--- a/resources/views/blade/input/select2-ajax.blade.php
+++ b/resources/views/blade/input/select2-ajax.blade.php
@@ -1,14 +1,22 @@
+@aware(['name'])
+
 @props([
     'selected' => null,
     'forLivewire' => false,
     'data_endpoint' => false,
     'data_placeholder' => false,
     'multiple' => false,
-    'item' => null,
     'item_model' => null,
     'name' => null,
 ])
 
+@if (!$selected)
+    @php
+        $selected = old($name);
+    @endphp
+@endif
+
+
 <select
         {{ ($multiple == 'true')? ' multiple' : '' }}
         {{ $attributes->class(['js-data-ajax select2', 'livewire-select2' => $forLivewire])->style(['width:100%']) }}
@@ -17,13 +25,7 @@
         data-placeholder="{{ $data_placeholder }}"
         name="{{ $name }}"
 >
-    @if ($item && $selected)
-
-        @if (old($name))
-        <option value="{{ old($name) }}" selected="selected" role="option" aria-selected="true">
-            {{ $item_model::find(old($name)) ? $item_model::find(old($name))->display_name : '' }}
-        </option>
-       @endif
+    @if ($selected)
 
         @if (is_integer($selected))
             <option value="{{ $selected }}" selected="selected" role="option" aria-selected="true">
diff --git a/resources/views/blade/input/text.blade.php b/resources/views/blade/input/text.blade.php
index 9b39234c1c..07f29f549b 100644
--- a/resources/views/blade/input/text.blade.php
+++ b/resources/views/blade/input/text.blade.php
@@ -1,9 +1,11 @@
+@aware(['name'])
+
 @props([
+'name' => null,
 'input_group_addon' => false,
 'input_icon' => false,
 'input_group_text' => false,
 'required' => false,
-'item' => null,
 ])
 <!-- input-text blade component -->
 @if ($input_group_addon)
@@ -12,18 +14,17 @@
 
     <input
         {{ $attributes->merge(['class' => 'form-control']) }}
+        name="{{ $name }}"
         @required($required)
     />
 
 @if ($input_group_addon)
     <span class="input-group-addon">
-
         @if ($input_icon)
             <x-icon :type="$input_icon" />
         @elseif ($input_group_text)
             {{ $input_group_text }}
         @endif
-
     </span>
 </div>
 @endif
diff --git a/resources/views/blade/input/textarea.blade.php b/resources/views/blade/input/textarea.blade.php
index 784bf50313..a8f368085f 100644
--- a/resources/views/blade/input/textarea.blade.php
+++ b/resources/views/blade/input/textarea.blade.php
@@ -1,9 +1,11 @@
+@aware(['name'])
 @props([
-    'value' => '',
+    'value' => null,
     'rows' => 5,
 ])
 
 <textarea
     {{ $attributes->merge(['class' => 'form-control']) }}
     rows="{{ $rows }}"
+    name="{{ $name }}"
 >{{ $value }}</textarea>