diff --git a/web/app/components/datasets/create/step-two/index.module.css b/web/app/components/datasets/create/step-two/index.module.css
index 961969a20c..00b6a54bad 100644
--- a/web/app/components/datasets/create/step-two/index.module.css
+++ b/web/app/components/datasets/create/step-two/index.module.css
@@ -18,7 +18,7 @@
 }
 
 .form .label {
-  @apply pt-6 pb-2 flex items-center;
+  @apply pb-2 flex items-center;
   font-weight: 500;
   font-size: 16px;
   line-height: 24px;
diff --git a/web/app/components/datasets/create/step-two/index.tsx b/web/app/components/datasets/create/step-two/index.tsx
index 0f929888c8..48443ccf21 100644
--- a/web/app/components/datasets/create/step-two/index.tsx
+++ b/web/app/components/datasets/create/step-two/index.tsx
@@ -59,6 +59,7 @@ import RadioCard from '@/app/components/base/radio-card'
 import { MessageChatSquare } from '@/app/components/base/icons/src/public/common'
 import { IS_CE_EDITION } from '@/config'
 import Switch from '@/app/components/base/switch'
+import Divider from '@/app/components/base/divider'
 
 const TextLabel: FC<PropsWithChildren> = (props) => {
   return <label className='text-text-secondary text-xs font-semibold leading-none'>{props.children}</label>
@@ -827,6 +828,7 @@ const StepTwo = ({
               </OptionCard>
             </div>
           </div>
+          <Divider className='my-5' />
           <div className={s.label}>{t('datasetCreation.stepTwo.indexMode')}</div>
           <div className='max-w-[640px]'>
             <div className='flex items-center gap-3 flex-wrap sm:flex-nowrap'>
@@ -894,7 +896,7 @@ const StepTwo = ({
               </div>
             )}
             {IS_CE_EDITION && indexType === IndexingType.QUALIFIED && (
-              <div className='mt-3 rounded-xl bg-gray-50 border border-gray-100'>
+              <div className='mt-2 rounded-xl bg-gray-50 border border-gray-100'>
                 <div className='flex justify-between items-center px-5 py-4'>
                   <div className='flex justify-center items-center w-8 h-8 rounded-lg bg-indigo-50'>
                     <MessageChatSquare className='w-4 h-4' />
@@ -922,7 +924,7 @@ const StepTwo = ({
             )}
             {/* Embedding model */}
             {indexType === IndexingType.QUALIFIED && (
-              <div className='mb-2'>
+              <div className='mt-6 my-2'>
                 <div className={cn(s.label, datasetId && 'flex justify-between items-center')}>{t('datasetSettings.form.embeddingModel')}</div>
                 <ModelSelector
                   readonly={!!datasetId}
@@ -940,6 +942,7 @@ const StepTwo = ({
                 )}
               </div>
             )}
+            <Divider className='my-5' />
             {/* Retrieval Method Config */}
             <div>
               {!datasetId