diff --git a/resources/components/button/cancel.blade.php b/resources/components/button/cancel.blade.php
index 65634c1..2460f48 100644
--- a/resources/components/button/cancel.blade.php
+++ b/resources/components/button/cancel.blade.php
@@ -1,4 +1,4 @@
-<button type="cancel" id="cancel" {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>Cancel</button>
+<button type="cancel" id="cancel" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>Cancel</button>
 
 @section('page-scripts')
 	<script type="text/javascript">
diff --git a/resources/components/button/reset.blade.php b/resources/components/button/reset.blade.php
index 39b3119..3749a56 100644
--- a/resources/components/button/reset.blade.php
+++ b/resources/components/button/reset.blade.php
@@ -1 +1 @@
-<button type="reset" id="reset" {{ $attributes->class(['btn','btn-sm','btn-secondary']) }}>Reset</button>
\ No newline at end of file
+<button type="reset" id="reset" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-secondary']) }}>Reset</button>
\ No newline at end of file
diff --git a/resources/components/button/submit.blade.php b/resources/components/button/submit.blade.php
index 821ef27..bbf8fe2 100644
--- a/resources/components/button/submit.blade.php
+++ b/resources/components/button/submit.blade.php
@@ -1 +1 @@
-<button type="submit" id="submit" {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>
\ No newline at end of file
+<button type="submit" id="submit" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-success']) }}>{{ $slot }}</button>
\ No newline at end of file
diff --git a/resources/components/form/base.blade.php b/resources/components/form/base.blade.php
index d5ee26a..8c6ef54 100644
--- a/resources/components/form/base.blade.php
+++ b/resources/components/form/base.blade.php
@@ -1,25 +1,23 @@
+@if(isset($label))
+	<label for="{{ $id ?? $name }}">{{ $label }}</label>
+@endisset
 <div class="form-group">
-	@if(isset($label))
-		<label for="{{ $id ?? $name }}">{{ $label }}</label>
-	@endisset
-	<div class="form-group">
-		<div class="input-group has-validation">
-			@if(isset($icon) || isset($prepend))
-				<div class="input-group-prepend">
-					<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
-				</div>
-			@endif()
-			{{ $slot }}
-			<span class="invalid-feedback" role="alert">
-				@error($name)
-					{{ $message }}
-				@elseif(isset($feedback))
-					{{ $feedback }}
-				@enderror
-			</span>
-		</div>
-		@isset($helper)
-			<span class="input-helper">{{ $helper }}</span>
-		@endif
+	<div class="input-group has-validation">
+		@if(isset($icon) || isset($prepend))
+			<div class="input-group-prepend">
+				<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
+			</div>
+		@endif()
+		{{ $slot }}
+		<span class="invalid-feedback" role="alert">
+			@error($name)
+				{{ $message }}
+			@elseif(isset($feedback))
+				{{ $feedback }}
+			@enderror
+		</span>
 	</div>
-</div>
\ No newline at end of file
+	@isset($helper)
+		<span class="input-helper">{{ $helper }}</span>
+	@endif
+</div>
diff --git a/resources/components/form/date.blade.php b/resources/components/form/date.blade.php
new file mode 100644
index 0000000..a49d23c
--- /dev/null
+++ b/resources/components/form/date.blade.php
@@ -0,0 +1,3 @@
+<x-leenooks::form.base {{ $attributes }}>
+	<input type="date" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
+</x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/email.blade.php b/resources/components/form/email.blade.php
index 5e0083a..694c9e1 100644
--- a/resources/components/form/email.blade.php
+++ b/resources/components/form/email.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="email" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}">
+	<input type="email" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? '') }}">
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/password.blade.php b/resources/components/form/password.blade.php
index 2fde082..aef4b80 100644
--- a/resources/components/form/password.blade.php
+++ b/resources/components/form/password.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="password" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}">
+	<input type="password" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? '') }}">
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/text.blade.php b/resources/components/form/text.blade.php
index f7e511d..d4a07f7 100644
--- a/resources/components/form/text.blade.php
+++ b/resources/components/form/text.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<input type="text" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? "") }}" @readonly(isset($readonly)) @required(isset($required))>
+	<input type="text" class="form-control {{ $classes ?? ''}}@error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required))>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/textarea.blade.php b/resources/components/form/textarea.blade.php
index 0b371b2..a3e1086 100644
--- a/resources/components/form/textarea.blade.php
+++ b/resources/components/form/textarea.blade.php
@@ -1,3 +1,3 @@
 <x-leenooks::form.base {{ $attributes }}>
-	<textarea class="form-control {{ $classes ?? ''}} @error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset>{{ old($name,$value ?? "") }}</textarea>
+	<textarea class="form-control {{ $classes ?? ''}} @error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset>{{ old($name,$value ?? '') }}</textarea>
 </x-leenooks::form.base>
\ No newline at end of file
diff --git a/resources/components/form/toggle.blade.php b/resources/components/form/toggle.blade.php
new file mode 100644
index 0000000..387acc0
--- /dev/null
+++ b/resources/components/form/toggle.blade.php
@@ -0,0 +1,17 @@
+<div class="form-group">
+	<div class="input-group has-validation">
+		<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
+			<input type="checkbox" class="custom-control-input @error($name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @checked(old($name,$value ?? ''))>
+			@if(isset($label))
+				<label class="custom-control-label" for="{{ $id ?? $name }}">{{ $label }}</label>
+			@endif
+		</div>
+		<span class="invalid-feedback" role="alert">
+			@error($name)
+				{{ $message }}
+			@elseif(isset($feedback))
+				{{ $feedback }}
+			@enderror
+		</span>
+	</div>
+</div>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/form_date.blade.php b/resources/themes/adminlte/views/widget/form_date.blade.php
deleted file mode 100644
index 35aeea2..0000000
--- a/resources/themes/adminlte/views/widget/form_date.blade.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<div class="form-group">
-	<label for="{{ $id }}">{{ $label }}</label>
-	<div class="input-group has-validation">
-		@empty($icon)
-		@else
-			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-fw {{ $icon }}"></i></span>
-			</div>
-		@endempty()
-		<input type="date" class="form-control @error($id) is-invalid @enderror" id="{{ $id }}" name="{{ $name ?? $id}}" value="{{ old($old,$value) }}">
-		<span class="invalid-feedback" role="alert">
-			@error($id)
-				{{ $message }}
-			@enderror
-		</span>
-	</div>
-</div>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/form_toggle.blade.php b/resources/themes/adminlte/views/widget/form_toggle.blade.php
deleted file mode 100644
index adaae21..0000000
--- a/resources/themes/adminlte/views/widget/form_toggle.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="form-group">
-	<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
-		<input type="checkbox" class="custom-control-input" id="{{ $id }}" name="{{ $name ?: $id }}" {{ old($old ?? $name,$value) ? 'checked' : '' }}>
-		<label class="custom-control-label" for="{{ $id }}">{{ $label }}</label>
-	</div>
-	<span class="invalid-feedback @error($id) d-block @enderror" role="alert">
-		@error($id)
-			{{ $message }}
-		@enderror
-	</span>
-</div>
\ No newline at end of file