diff --git a/resources/views/domains/create.blade.php b/resources/views/domains/create.blade.php
index 4ff325e..9e9a0d1 100644
--- a/resources/views/domains/create.blade.php
+++ b/resources/views/domains/create.blade.php
@@ -80,7 +80,7 @@
                     </div>
                     <div class="col-md-3 mb-3">
                         <x-currency-select>
-                            <x-slot name="current">USD</x-slot>
+                            <x-slot name="current">{{Session::get('default_currency')}}</x-slot>
                         </x-currency-select>
                     </div>
                 </div>
diff --git a/resources/views/misc/create.blade.php b/resources/views/misc/create.blade.php
index 3ef50ff..260cedc 100644
--- a/resources/views/misc/create.blade.php
+++ b/resources/views/misc/create.blade.php
@@ -40,7 +40,7 @@
                     </div>
                     <div class="col-md-3 mb-3">
                         <x-currency-select>
-                            <x-slot name="current">USD</x-slot>
+                            <x-slot name="current">{{Session::get('default_currency')}}</x-slot>
                         </x-currency-select>
                     </div>
                 </div>
diff --git a/resources/views/reseller/create.blade.php b/resources/views/reseller/create.blade.php
index e94001e..2359db2 100644
--- a/resources/views/reseller/create.blade.php
+++ b/resources/views/reseller/create.blade.php
@@ -72,7 +72,7 @@
                         </div>
                         <div class="col-md-3 mb-3">
                             <x-currency-select>
-                                <x-slot name="current">USD</x-slot>
+                                <x-slot name="current">{{Session::get('default_currency')}}</x-slot>
                             </x-currency-select>
                         </div>
                     </div>
diff --git a/resources/views/servers/create.blade.php b/resources/views/servers/create.blade.php
index 6572676..2da5e58 100644
--- a/resources/views/servers/create.blade.php
+++ b/resources/views/servers/create.blade.php
@@ -45,16 +45,11 @@
                         </div>
                     </div>
                     <div class="col-12 col-lg-3 mb-4">
-                        <div class="input-group">
-                            <div class="input-group-prepend"><span class="input-group-text">OS</span></div>
-                            <select class="form-control" name="os_id">
-                                @foreach ($Os as $oss)
-                                    <option value="{{ $oss['id'] }}">
-                                        {{ $oss['name'] }}
-                                    </option>
-                                @endforeach
-                            </select>
-                        </div>
+                        <x-os-select>
+                            <x-slot name="title">OS</x-slot>
+                            <x-slot name="name">os_id</x-slot>
+                            <x-slot name="current">{{Session::get('default_server_os')}}</x-slot>
+                        </x-os-select>
                     </div>
                 </div>
                 <div class="row">
@@ -147,7 +142,7 @@
                     </div>
                     <div class="col-md-3 mb-3">
                         <x-currency-select>
-                            <x-slot name="current">USD</x-slot>
+                            <x-slot name="current">{{Session::get('default_currency')}}</x-slot>
                         </x-currency-select>
                     </div>
                 </div>
@@ -244,7 +239,7 @@
                            value="1">
                     <label class="form-check-label">
                         Allow this data to be public, restrict values
-                            in settings
+                        in settings
                     </label>
                 </div>
                 <div class="row">
diff --git a/resources/views/servers/edit.blade.php b/resources/views/servers/edit.blade.php
index 6871ee4..57e1474 100644
--- a/resources/views/servers/edit.blade.php
+++ b/resources/views/servers/edit.blade.php
@@ -177,11 +177,11 @@
                         </x-number-input>
                     </div>
                     <div class="col-md-3 mb-3">
-                        <x-ram-type-select>
+                        <x-disk-type-select>
                             <x-slot name="title">Disk type</x-slot>
                             <x-slot name="name">disk_type</x-slot>
                             <x-slot name="value">{{$server[0]->disk_type}}</x-slot>
-                        </x-ram-type-select>
+                        </x-disk-type-select>
                     </div>
                 </div>
                 <div class="row">
diff --git a/resources/views/shared/create.blade.php b/resources/views/shared/create.blade.php
index e67f10c..0db3df4 100644
--- a/resources/views/shared/create.blade.php
+++ b/resources/views/shared/create.blade.php
@@ -72,7 +72,7 @@
                         </div>
                         <div class="col-md-3 mb-3">
                             <x-currency-select>
-                                <x-slot name="current">USD</x-slot>
+                                <x-slot name="current">{{Session::get('default_currency')}}</x-slot>
                             </x-currency-select>
                         </div>
                     </div>