diff --git a/public/css/app.css b/public/css/app.css
index 1d42dfafa..d36f3c1d2 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -57807,6 +57807,10 @@ body{
 
 @media (min-width: 1280px){
 
+  .xl\:absolute{
+    position: absolute;
+  }
+
   .xl\:top-28{
     top: 7rem;
   }
@@ -57882,6 +57886,10 @@ body{
     left: 0px;
   }
 
+  [dir="ltr"] .xl\:ltr\:right-0{
+    right: 0px;
+  }
+
   [dir="ltr"] .xl\:ltr\:ml-64{
     margin-left: 16rem;
   }
@@ -57894,6 +57902,10 @@ body{
     right: 0px;
   }
 
+  [dir="rtl"] .xl\:rtl\:left-0{
+    left: 0px;
+  }
+
   [dir="rtl"] .xl\:rtl\:mr-64{
     margin-right: 16rem;
   }
diff --git a/resources/assets/js/components/AkauntingSwitch.vue b/resources/assets/js/components/AkauntingSwitch.vue
index f8e9245d4..c81d47de1 100644
--- a/resources/assets/js/components/AkauntingSwitch.vue
+++ b/resources/assets/js/components/AkauntingSwitch.vue
@@ -1,10 +1,14 @@
 <template>
-    <div class="relative lg:absolute w-12 flex items-center lg:ltr:right-0 lg:rtl:left-0 xl:-top-12 cursor-pointer">
-        <input type="radio" :name="name" v-show="selected == '0'" @click="enabled = 1" value="1" id="enabled-1" v-model="selected" class="w-full h-full absolute right-0 z-20 opacity-0 cursor-pointer">
-        <input type="radio" :name="name" v-show="selected == '1'" @click="enabled = 0" value="0" id="enabled-0" v-model="selected" class="w-full h-full absolute left-0 z-20 opacity-0 cursor-pointer">
+    <div class="xl:absolute w-12 xl:ltr:right-0 xl:rtl:left-0 xl:-top-12">
+        <label class="text-black text-sm font-medium mb-1 xl:hidden">{{ label }}</label>
 
-        <div class="absolute left-1 top-1 bg-white w-5 h-5 rounded-full transition transform" :class="selected == '1' ? 'translate-x-full' : 'translate-x-0'"></div>
-        <div class="block w-full h-7 rounded-full transition transition-color" :class="selected == '1' ? 'bg-green' : 'bg-green-200'"></div>
+        <div class="relative full flex items-center cursor-pointer">
+            <input type="radio" :name="name" v-show="selected == '0'" @click="enabled = 1" value="1" id="enabled-1" v-model="selected" class="w-full h-full absolute right-0 z-20 opacity-0 cursor-pointer">
+            <input type="radio" :name="name" v-show="selected == '1'" @click="enabled = 0" value="0" id="enabled-0" v-model="selected" class="w-full h-full absolute left-0 z-20 opacity-0 cursor-pointer">
+
+            <div class="absolute left-1 top-1 bg-white w-5 h-5 rounded-full transition transform" :class="selected == '1' ? 'translate-x-full' : 'translate-x-0'"></div>
+            <div class="block w-full h-7 rounded-full transition transition-color" :class="selected == '1' ? 'bg-green' : 'bg-green-200'"></div>
+        </div>
     </div>
 </template>
 
@@ -21,6 +25,11 @@ export default {
             description: "Selectbox selected value"
         },
 
+        label: {
+            type: String,
+            description: "Selectbox selected label"
+        },
+
         model: {
             type: [String, Number, Array, Object, Boolean],
             default: '',
diff --git a/resources/views/components/form/group/switch.blade.php b/resources/views/components/form/group/switch.blade.php
index d7fd517fa..38d9bf60b 100644
--- a/resources/views/components/form/group/switch.blade.php
+++ b/resources/views/components/form/group/switch.blade.php
@@ -3,6 +3,7 @@
   <akaunting-switch
     name="{{ $name }}"
     value="{{ (int) $value }}"
+    label="{{ trans('general.enabled') }}"
 
     @if (! empty($attributes['model']))
     :model="{{ $attributes['model'] }}"
diff --git a/resources/views/modules/item/show.blade.php b/resources/views/modules/item/show.blade.php
index f5d679cd4..832263754 100644
--- a/resources/views/modules/item/show.blade.php
+++ b/resources/views/modules/item/show.blade.php
@@ -121,7 +121,11 @@
             </div>
 
             <div class="tabs w-full">
-                <x-tabs class="flex items-center overflow-x-scroll lg:overflow-visible" active="{{ ! empty($module->call_to_actions) ? 'features' : 'description' }}">
+                <x-tabs
+                    class="w-full lg:w-auto"
+                    active="{{ ! empty($module->call_to_actions) ? 'features' : 'description' }}"
+                    data-disable-slider
+                >
                     <x-slot name="navs">
                         @stack('features_nav_start')