diff --git a/modules/anagrafiche/edit.php b/modules/anagrafiche/edit.php
index 7b7363e6a..dd5dd6cd4 100644
--- a/modules/anagrafiche/edit.php
+++ b/modules/anagrafiche/edit.php
@@ -94,37 +94,41 @@ if (!$cliente) {
             </div>
 
             <div class="row">
-                <div class="col-md-4">
+				
+                <div class="col-md-<?php echo (empty($record['indirizzo2'])) ? '6' : '4'; ?>">
                     {[ "type": "text", "label": "<?php echo tr('Indirizzo'); ?>", "name": "indirizzo", "value": "$indirizzo$" ]}
                 </div>
-
-                <div class="col-md-4">
+				
+                <div class="col-md-2<?php echo (empty($record['indirizzo2'])) ? ' hide' : ''; ?>">
                     {[ "type": "text", "label": "<?php echo tr('Indirizzo2'); ?>", "name": "indirizzo2", "value": "$indirizzo2$" ]}
                 </div>
-
+				
+				<div class="col-md-2">
+                    {[ "type": "text", "label": "<?php echo tr('C.A.P.'); ?>", "name": "cap", "maxlength": 5, "class": "text-center", "value": "$cap$" ]}
+                </div>
+				
                 <div class="col-md-4">
                     {[ "type": "text", "label": "<?php echo tr('Città'); ?>", "name": "citta", "class": "text-center", "value": "$citta$" ]}
                 </div>
             </div>
 
             <div class="row">
-                <div class="col-md-2">
+               
+              
+
+                <div class="col-md-3">
+                    {[ "type": "text", "label": "<?php echo tr('Provincia'); ?>", "name": "provincia", "maxlength": 2, "class": "text-center", "value": "$provincia$" ]}
+                </div>
+				
+				 <div class="col-md-3">
                     {[ "type": "select", "label": "<?php echo tr('Nazione'); ?>", "name": "id_nazione", "values": "query=SELECT id AS id, nome AS descrizione FROM an_nazioni ORDER BY nome ASC", "value": "$id_nazione$" ]}
                 </div>
 
-                <div class="col-md-4">
+                <div class="col-md-3">
                     {[ "type": "select", "label": "<?php echo tr('Zona'); ?>", "name": "idzona", "values": "query=SELECT id, CONCAT_WS( ' - ', nome, descrizione) AS descrizione FROM an_zone ORDER BY descrizione ASC", "value": "$idzona$", "placeholder": "<?php echo tr('Nessuna zona'); ?>", "icon-after": "add|<?php echo Modules::get('Zone')['id']; ?>" ]}
                 </div>
 
-                <div class="col-md-2">
-                    {[ "type": "text", "label": "<?php echo tr('C.A.P.'); ?>", "name": "cap", "maxlength": 5, "class": "text-center", "value": "$cap$" ]}
-                </div>
-
-                <div class="col-md-2">
-                    {[ "type": "text", "label": "<?php echo tr('Provincia'); ?>", "name": "provincia", "maxlength": 2, "class": "text-center", "value": "$provincia$" ]}
-                </div>
-
-                <div class="col-md-2">
+                <div class="col-md-3">
                     {[ "type": "number", "label": "<?php echo tr('Distanza'); ?>", "name": "km", "decimals":"1", "class": "text-center", "value": "$km$", "icon-after": "Km" ]}
                 </div>
             </div>
diff --git a/modules/segmenti/edit.php b/modules/segmenti/edit.php
index cb0234b56..373c8e44f 100644
--- a/modules/segmenti/edit.php
+++ b/modules/segmenti/edit.php
@@ -21,7 +21,7 @@ include_once __DIR__.'/../../core.php';
 				</div>
 
 				<div class="col-md-4">
-					{[ "type": "select", "label": "<?php echo tr('Modulo'); ?>", "name": "module", "required": 1, "values": "query=SELECT id, name AS descrizione FROM zz_modules WHERE ( enabled = 1 AND options != 'custom' ) OR id = <?php echo $record['id_module']; ?> ORDER BY name ASC", "value": "$id_module$", "extra": "<?php echo ($record['predefined']) ? 'readonly' : ''; ?>" ]}
+					{[ "type": "select", "label": "<?php echo tr('Modulo'); ?>", "name": "module", "required": 1, "values": "query=SELECT id, name AS descrizione FROM zz_modules WHERE ( enabled = 1 AND options != 'custom' ) OR id = <?php echo $record['id_module']; ?> ORDER BY name ASC", "value": "<?php echo $record['id_module']; ?>", "extra": "<?php echo ($record['predefined']) ? 'readonly' : ''; ?>" ]}
 				</div>
 
 				<div class="col-md-4">
diff --git a/templates/interventi/body.php b/templates/interventi/body.php
index 293e65a8b..1690d0f30 100644
--- a/templates/interventi/body.php
+++ b/templates/interventi/body.php
@@ -32,37 +32,41 @@ echo '
     // Codice fiscale o P.Iva
 
     if (!empty($c_piva)) {
-        echo '
-    			<td colspan=2>
-    				'.tr('P.Iva').': <b>'.strtoupper($c_piva).'</b>
-    			</td>
-    		</tr>';
+		echo '
+				<td colspan=2>
+					'.tr('P.Iva').': <b>'.strtoupper($c_piva).'</b>
+				</td>';
     } else {
         echo '
     			<td colspan=2>
     				'.tr('C.F.').': <b>'.strtoupper($c_codicefiscale).'</b>
-    			</td>
-    		</tr>';
+    			</td>';
     }
+	
+	echo '</tr>';
+	
+	//Indirizzo
+	if (!empty($c_indirizzo) or !empty($c_cap) or !empty($c_citta) or !empty($c_provincia)) {
+		
+		echo '
+			<tr>
+				<td colspan="4">
+					'.((!empty($c_indirizzo)) ? tr('Via').': <b>'.$c_indirizzo.'</b>' : '').'
+					'.((!empty($c_cap)) ? tr('CAP').': <b>'.$c_cap.'</b>' : '').'
+					'.((!empty($c_citta)) ? tr('Città').': <b>'.$c_citta.'</b>' : '').'
+					'.((!empty($c_provincia)) ? tr('Provincia').': <b>'.strtoupper($c_provincia).'</b>' : '').'
+				</td>
+			</tr>';
 
-// riga 2
-echo '
-    <tr>
-        <td colspan="4">
-            '.((!empty($c_indirizzo)) ? tr('Via').': <b>'.$c_indirizzo.'</b>' : '').'
-			'.((!empty($c_cap)) ? tr('CAP').': <b>'.$c_cap.'</b>' : '').'
-			'.((!empty($c_citta)) ? tr('Città').': <b>'.$c_citta.'</b>' : '').'
-			'.((!empty($c_provincia)) ? tr('Provincia').': <b>'.strtoupper($c_provincia).'</b>' : '').'
-        </td>
-    </tr>';
+	}
 
 echo '
     <tr>
         <td colspan="4">
             '.tr('Telefono').': <b>'.$c_telefono.'</b>';
-if (!empty($c_cellulare)) {
-    echo' - '.tr('Cellulare').': <b>'.$c_cellulare.'</b>';
-}
+	if (!empty($c_cellulare)) {
+		echo' - '.tr('Cellulare').': <b>'.$c_cellulare.'</b>';
+	}
 echo '
         </td>
     </tr>';