diff --git a/src/components/floor-plan/modal/basic/BasicSetting.jsx b/src/components/floor-plan/modal/basic/BasicSetting.jsx
index cbabd3e3..3087fe54 100644
--- a/src/components/floor-plan/modal/basic/BasicSetting.jsx
+++ b/src/components/floor-plan/modal/basic/BasicSetting.jsx
@@ -322,22 +322,19 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
 
         <div className="grid-btn-wrap">
           {/* {tabNum === 1 && <button className="btn-frame modal mr5">{getMessage('modal.common.save')}</button>} */}
-
-          {tabNum !== 1 && (
-            <button className="btn-frame modal mr5" onClick={() => setTabNum(tabNum - 1)}>
-              {getMessage('modal.module.basic.setting.prev')}
-            </button>
-          )}
-          {/*{tabNum !== 3 && <button className="btn-frame modal act mr5">{getMessage('modal.common.save')}</button>}*/}
-          {tabNum !== 3 && (
-            <button className="btn-frame modal" onClick={handleBtnNextStep}>
-              Next
-            </button>
-          )}
-
-          {tabNum === 3 && (
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && (
             <>
-              {basicSetting.roofSizeSet && basicSetting.roofSizeSet != '3' && (
+              {tabNum !== 1 && (
+                <button className="btn-frame modal mr5" onClick={() => setTabNum(tabNum - 1)}>
+                  {getMessage('modal.module.basic.setting.prev')}
+                </button>
+              )}
+              {tabNum !== 3 && (
+                <button className="btn-frame modal" onClick={handleBtnNextStep}>
+                  Next
+                </button>
+              )}
+              {tabNum === 3 && (
                 <>
                   <button className={`btn-frame modal mr5 ${isManualModuleLayoutSetup ? 'act' : ''}`} onClick={handleManualModuleLayoutSetup}>
                     {getMessage('modal.module.basic.setting.row.batch')}
@@ -350,13 +347,24 @@ export default function BasicSetting({ id, pos = { x: 50, y: 230 } }) {
                   </button>
                 </>
               )}
-              {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && (
+            </>
+          )}
+          {basicSetting.roofSizeSet && basicSetting.roofSizeSet == '3' && (
+            <>
+              {tabNum === 1 && (
+                <button className="btn-frame modal" onClick={handleBtnNextStep}>
+                  Next
+                </button>
+              )}
+              {tabNum === 2 && (
                 <>
-                  <button className="btn-frame modal mr5">{getMessage('modal.module.basic.setting.row.batch')}</button>
+                  <button className="btn-frame modal mr5" onClick={() => setTabNum(tabNum - 1)}>
+                    {getMessage('modal.module.basic.setting.prev')}
+                  </button>
                   <button className={`btn-frame modal mr5 ${isManualModuleSetup ? 'act' : ''}`} onClick={handleManualModuleSetup}>
                     {getMessage('modal.module.basic.setting.passivity.placement')}
                   </button>
-                  <button className="btn-frame modal act" onClick={() => autoFlatroofModuleSetup(placementFlatRef)}>
+                  <button className="btn-frame modal act" onClick={() => autoModuleSetup()}>
                     {getMessage('modal.module.basic.setting.auto.placement')}
                   </button>
                 </>