diff --git a/resources/components/button/cancel.blade.php b/resources/components/button/cancel.blade.php
index 2460f48..fc086df 100644
--- a/resources/components/button/cancel.blade.php
+++ b/resources/components/button/cancel.blade.php
@@ -1,4 +1,4 @@
-<button type="cancel" id="cancel" style="margin-top: 2.0rem !important;" {{ $attributes->class(['btn','btn-sm','btn-danger']) }}>Cancel</button>
+<button type="cancel" id="cancel" {{ $attributes->class(['mt-4','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 3749a56..25c1b0c 100644
--- a/resources/components/button/reset.blade.php
+++ b/resources/components/button/reset.blade.php
@@ -1 +1 @@
-<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
+<button type="reset" id="reset" {{ $attributes->class(['mt-4','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 bbf8fe2..7e4458b 100644
--- a/resources/components/button/submit.blade.php
+++ b/resources/components/button/submit.blade.php
@@ -1 +1 @@
-<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
+<button type="submit" id="submit" {{ $attributes->class(['mt-4','btn','btn-sm','btn-success']) }} @disabled(isset($disabled))>{{ $slot }}</button>
\ No newline at end of file
diff --git a/resources/themes/adminlte/views/widget/errors.blade.php b/resources/components/errors.blade.php
similarity index 95%
rename from resources/themes/adminlte/views/widget/errors.blade.php
rename to resources/components/errors.blade.php
index c30463f..c79cf82 100644
--- a/resources/themes/adminlte/views/widget/errors.blade.php
+++ b/resources/components/errors.blade.php
@@ -1,4 +1,3 @@
-<!-- Errors -->
 @if ($errors->any())
 	<div class="alert alert-danger alert-dismissible">
 		<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
diff --git a/resources/components/form/select.blade.php b/resources/components/form/select.blade.php
index a570f6b..c879228 100644
--- a/resources/components/form/select.blade.php
+++ b/resources/components/form/select.blade.php
@@ -1,8 +1,11 @@
 <x-leenooks::form.base {{ $attributes }}>
 	<input type="hidden" id="{{ $name }}_disabled" name="{{ $name }}" value="" disabled>
 	<select class="form-control @error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" @required(isset($required)) @disabled(isset($disabled))>
-		@if(isset($addvalues) && $addvalues)
-			<option id="new"></option>
+		@if(! empty($value) || isset($addnew) || isset($choose))
+			<option value=""></option>
+			@isset($addnew)
+			<option value="new">{{ $addnew ?: 'Add New' }}</option>
+			@endisset
 		@endif
 
 		@empty($groupby)
@@ -10,6 +13,7 @@
 				@continue(! Arr::get($option,'value'))
 				<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == old($old ?? $name,$value ?? ''))>{{ Arr::get($option,'value') }}</option>
 			@endforeach
+
 		@else
 			@foreach($options->groupBy($groupby) as $group)
 				<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
@@ -23,10 +27,9 @@
 	</select>
 </x-leenooks::form.base>
 
-@section('page-scripts')
-	@css(select2)
-	@js(select2,autofocus)
+@pa(select2)
 
+@section('page-scripts')
 	<script type="text/javascript">
 		// Select doesnt support read only so we'll use disable and a new field
 		function {{$id ?? $name}}_readonly(on) {
diff --git a/resources/components/form/text.blade.php b/resources/components/form/text.blade.php
index be22343..842621d 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 {{ $class ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
+	<input type="text" class="form-control {{ $class ?? ''}}@error($old ?? $name) is-invalid @enderror" id="{{ $id ?? $name }}" name="{{ $name }}" placeholder="{{ $placeholder ?? '' }}" value="{{ old($old ?? $name,$value ?? '') }}" @readonly(isset($readonly)) @required(isset($required)) @disabled(isset($disabled))>
 </x-leenooks::form.base>
\ No newline at end of file