diff --git a/templates/dispositivo/add.htm b/templates/dispositivo/add.htm
index f6f0f1e..c51b604 100644
--- a/templates/dispositivo/add.htm
+++ b/templates/dispositivo/add.htm
@@ -43,8 +43,10 @@
         <div class="form-group">
             <label class="col-xs-2" for="form-utente">Utenti</label>
             <div class="col-xs-10" id="users-column">
-                <div id="add-user" class="btn btn-success" onclick="adduser()"><span class="glyphicon glyphicon-plus"></span></div>
-                <div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()"><span class="glyphicon glyphicon-minus"></span></div>
+                <p>
+                   <div id="add-user" class="btn btn-success" onclick="adduser()"><span class="glyphicon glyphicon-plus"></span></div>
+                   <div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()"><span class="glyphicon glyphicon-minus"></span></div>
+                </p>
             </div>
         </div>
         <div class="form-group">
diff --git a/templates/dispositivo/details.htm b/templates/dispositivo/details.htm
index 81d275c..d13c082 100644
--- a/templates/dispositivo/details.htm
+++ b/templates/dispositivo/details.htm
@@ -13,65 +13,89 @@
                 {{ disp.tipo }}
             </div>
         </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Marca
-            </h4>
-            <div class="list-group-item-text">
-                {{ disp.marca }}
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Modello
-            </h4>
-            <div class="list-group-item-text">
-                {{ disp.modello }}
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Modello
-            </h4>
-            <div class="list-group-item-text">
-                {{ disp.fornitore }}
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Utenti
-            </h4>
-            <div class="list-group-item-text">
-                {% for accesso in accessi %}
-                    <a href="/imp_details/{{ accesso.iid }}">{{ accesso.impiegato.nomeimpiegato }}</a><br>
-                {% endfor %}
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Codice Inventario CED
-            </h4>
-            <div class="list-group-item-text">
-                <code>{{ disp.inv_ced }}</code>
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Codice Inventario Ente
-            </h4>
-            <div class="list-group-item-text">
-                <code>{{ disp.inv_ente }}</code>
-            </div>
-        </li>
-        <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Codice Seriale
-            </h4>
-            <div class="list-group-item-text">
-                <code>{{ disp.seriale }}</code>
-            </div>
-        </li>
+        {% if disp.marca %}
             <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Marca
+                </h4>
+                <div class="list-group-item-text">
+                    {{ disp.marca }}
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.modello %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Modello
+                </h4>
+                <div class="list-group-item-text">
+                    {{ disp.modello }}
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.fornitore %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Fornitore
+                </h4>
+                <div class="list-group-item-text">
+                    {{ disp.fornitore }}
+                </div>
+            </li>
+        {% endif %}
+        {% if accessi %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Utenti
+                </h4>
+                <div class="list-group-item-text">
+                    {% for accesso in accessi %}
+                        <a href="/imp_details/{{ accesso.iid }}">{{ accesso.impiegato.nomeimpiegato }}</a><br>
+                    {% endfor %}
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.inv_ced %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Codice Inventario CED
+                </h4>
+                <div class="list-group-item-text">
+                    <code>{{ disp.inv_ced }}</code>
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.inv_ente %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Codice Inventario Ente
+                </h4>
+                <div class="list-group-item-text">
+                    <code>{{ disp.inv_ente }}</code>
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.seriale %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Codice Seriale
+                </h4>
+                <div class="list-group-item-text">
+                    <code>{{ disp.seriale }}</code>
+                </div>
+            </li>
+        {% endif %}
+        {% if disp.ip %}
+            <li class="list-group-item">
+                <h4 class="list-group-item-heading">
+                    Indirizzo IP
+                </h4>
+                <div class="list-group-item-text">
+                    <code>{{ disp.ip }}</code>
+                </div>
+            </li>
+        {% endif %}
+        <li class="list-group-item">
             <h4 class="list-group-item-heading">
                 Network
             </h4>
@@ -79,14 +103,6 @@
                 <a href="/net_details/{{ disp.rete.nid }}"><code>{{ disp.rete.nome }} - {{ disp.rete.network_ip }}/{{ disp.rete.subnet }}</code></a>
             </div>
         </li>
-            <li class="list-group-item">
-            <h4 class="list-group-item-heading">
-                Indirizzo IP
-            </h4>
-            <div class="list-group-item-text">
-                <code>{{ disp.ip }}</code>
-            </div>
-        </li>
     </ul>
     <a href="/disp_show/{{ disp.did }}" class="btn btn-primary">
         <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Modifica
diff --git a/templates/dispositivo/show.htm b/templates/dispositivo/show.htm
index 963cb8d..315ddcc 100644
--- a/templates/dispositivo/show.htm
+++ b/templates/dispositivo/show.htm
@@ -52,8 +52,10 @@
         <div class="form-group">
             <label class="col-xs-2" for="form-utente">Utenti</label>
             <div class="col-xs-10" id="users-column">
-                <div id="add-user" class="btn btn-success" onclick="adduser()"><span class="glyphicon glyphicon-plus"></span></div>
-                <div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()"><span class="glyphicon glyphicon-minus"></span></div>
+                <p>
+                    <div id="add-user" class="btn btn-success" onclick="adduser()"><span class="glyphicon glyphicon-plus"></span></div>
+                    <div id="remove-user" class="btn btn-danger disabled" onclick="removeuser()"><span class="glyphicon glyphicon-minus"></span></div>
+                </p>
             </div>
         </div>
         <div class="form-group">