diff --git a/src/modules/ar1/pages/Ar1AdminConfig.js b/src/modules/ar1/pages/Ar1AdminConfig.js
index 8449148..484d219 100644
--- a/src/modules/ar1/pages/Ar1AdminConfig.js
+++ b/src/modules/ar1/pages/Ar1AdminConfig.js
@@ -863,28 +863,13 @@ const Ar1AdminConfig = () => {
                             )}
                         </div>
 
-                        {/* Tab switch: Layout vs Struttura */}
-                        <div style={{ display: 'flex', gap: 0, borderBottom: '2px solid #e0e0e0', marginBottom: 16 }}>
-                            <Button
-                                label="Layout grafico"
-                                icon="pi pi-palette"
-                                text={editSection !== 'layout'}
-                                onClick={() => setEditSection('layout')}
-                                style={{ borderRadius: 0, borderBottom: editSection === 'layout' ? '3px solid var(--primary-color)' : 'none' }}
-                            />
-                            <Button
-                                label={'Struttura quadri' + (questionsStructureChanged() ? ' •' : '')}
-                                icon="pi pi-list"
-                                text={editSection !== 'struttura'}
-                                severity={questionsStructureChanged() ? 'warning' : undefined}
-                                onClick={() => setEditSection('struttura')}
-                                style={{ borderRadius: 0, borderBottom: editSection === 'struttura' ? '3px solid var(--primary-color)' : 'none' }}
-                            />
-                        </div>
+                        {/* TabView interno: Layout vs Struttura */}
+                        <TabView
+                            activeIndex={editSection === 'layout' ? 0 : 1}
+                            onTabChange={(e) => setEditSection(e.index === 0 ? 'layout' : 'struttura')}
+                        >
+                            <TabPanel header={<span><i className="pi pi-palette" style={{ marginRight: '0.5rem' }} />Layout grafico</span>}>
 
-                        {/* SEZIONE LAYOUT */}
-                        {editSection === 'layout' && (
-                            <div>
                                 <Message severity="info" style={{ marginBottom: 10 }}
                                     text="Modifiche al layout grafico (brand, colori, testi introduttivi) si applicano in place alla versione corrente, senza creare una nuova versione." />
 
@@ -954,16 +939,17 @@ const Ar1AdminConfig = () => {
                                         <InputTextarea value={layoutAdvancedJson} onChange={(e) => setLayoutAdvancedJson(e.target.value)} rows={20} style={{ width: '100%', fontFamily: 'monospace', fontSize: 12 }} />
                                     </div>
                                 )}
-                            </div>
-                        )}
+                            </TabPanel>
 
-                        {/* SEZIONE STRUTTURA QUADRI */}
-                        {editSection === 'struttura' && questionsSnapshot && (
-                            <QuadriStructureEditor
-                                value={questionsSnapshot}
-                                onChange={setQuestionsSnapshot}
-                            />
-                        )}
+                            <TabPanel header={<span><i className="pi pi-list" style={{ marginRight: '0.5rem' }} />Struttura quadri{questionsStructureChanged() ? ' •' : ''}</span>}>
+                                {questionsSnapshot && (
+                                    <QuadriStructureEditor
+                                        value={questionsSnapshot}
+                                        onChange={setQuestionsSnapshot}
+                                    />
+                                )}
+                            </TabPanel>
+                        </TabView>
 
                         {/* Footer azioni */}
                         <div style={{ position: 'sticky', bottom: 0, background: 'white', paddingTop: 14, borderTop: '1px solid #eee', marginTop: 20, display: 'flex', justifyContent: 'space-between', alignItems: 'center' }}>