diff --git a/src/components/JalaliDatePicker.vue b/src/components/JalaliDatePicker.vue
index 4f21169..0314157 100644
--- a/src/components/JalaliDatePicker.vue
+++ b/src/components/JalaliDatePicker.vue
@@ -24,7 +24,7 @@ const props = withDefaults(
     valueType: 'iso',
     placeholder: 'انتخاب تاریخ',
     disabled: false,
-    clearable: true,
+    clearable: false,
     size: 'large',
   },
 )
@@ -99,33 +99,59 @@ function setToday() {
   gap: 8px;
   align-items: stretch;
   width: 100%;
+  max-width: 100%;
+  min-width: 0;
+  box-sizing: border-box;
 }
 
-.jalali-date-field :deep(.vpd-input-group),
+.jalali-date-field :deep(.vpd-main),
 .jalali-date-field :deep(.jalali-picker) {
-  flex: 1;
+  display: flex;
+  flex: 1 1 0;
+  min-width: 0;
+  max-width: 100%;
+}
+
+.jalali-date-field :deep(.vpd-input-group) {
+  display: flex;
+  flex: 1 1 0;
+  min-width: 0;
   width: 100%;
+  direction: rtl;
+}
+
+.jalali-date-field :deep(.vpd-icon-btn) {
+  flex: 0 0 40px;
+  width: 40px;
+  border-radius: 0 10px 10px 0;
+}
+
+.size-large :deep(.vpd-icon-btn) {
+  flex-basis: 48px;
+  width: 48px;
 }
 
 .jalali-date-field :deep(.jalali-date-input),
 .jalali-date-field :deep(input) {
-  width: 100%;
+  flex: 1 1 0;
+  min-width: 0;
+  width: auto;
   height: 40px;
   border: 1px solid #d9d9d9;
-  border-radius: 8px;
-  padding: 4px 11px;
+  border-left: 1px solid #d9d9d9;
+  border-radius: 10px 0 0 10px;
+  padding: 4px 10px;
   font-family: inherit;
   font-size: 14px;
   direction: ltr;
-  text-align: left;
+  text-align: right;
   background: #fff;
 }
 
 .size-large :deep(.jalali-date-input),
 .size-large :deep(input) {
   height: 48px;
-  font-size: 16px;
-  border-radius: 10px;
+  font-size: 15px;
 }
 
 .jalali-date-field :deep(input:focus) {
@@ -134,12 +160,17 @@ function setToday() {
   box-shadow: 0 0 0 2px rgba(32, 201, 151, 0.15);
 }
 
+.jalali-date-field :deep(.vpd-clear-btn) {
+  display: none;
+}
+
 .today-btn {
   appearance: none;
+  flex: 0 0 auto;
   border: 1px solid #d9d9d9;
   background: #f8fafc;
   border-radius: 10px;
-  padding: 0 12px;
+  padding: 0 10px;
   cursor: pointer;
   font-family: inherit;
   font-weight: 700;
@@ -154,7 +185,6 @@ function setToday() {
 </style>
 
 <style>
-/* Picker is appended to body so it can sit above Ant modal */
 .vpd-wrapper {
   z-index: 11000 !important;
 }
diff --git a/src/pages/PluginTenantPage.vue b/src/pages/PluginTenantPage.vue
index f552d8d..fac7a33 100644
--- a/src/pages/PluginTenantPage.vue
+++ b/src/pages/PluginTenantPage.vue
@@ -942,6 +942,8 @@ onMounted(loadDetail)
 
 .detail {
   min-width: 0;
+  max-width: 100%;
+  overflow-x: hidden;
 }
 
 .detail-tabs {
@@ -998,10 +1000,30 @@ onMounted(loadDetail)
   width: 100%;
 }
 
+.detail-pane {
+  min-width: 0;
+  max-width: 100%;
+}
+
+.detail-pane :deep(.ant-row) {
+  max-width: 100%;
+}
+
+.detail-pane :deep(.ant-col) {
+  min-width: 0;
+  max-width: 100%;
+}
+
+.detail-pane :deep(.ant-form-item) {
+  min-width: 0;
+}
+
 .detail-pane :deep(.ant-input-number),
 .detail-pane :deep(.ant-select),
 .detail-pane :deep(.jalali-date-field) {
   width: 100%;
+  max-width: 100%;
+  min-width: 0;
 }
 
 .history-head {
diff --git a/src/styles.css b/src/styles.css
index 1107faa..7477359 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -195,7 +195,8 @@ button, input, textarea, select,
 
 .plugin-detail-modal .ant-modal-body {
   max-height: min(78vh, 760px);
-  overflow: auto;
+  overflow-x: hidden;
+  overflow-y: auto;
 }
 
 .dash-modules {