diff --git a/transporte/templates/address_edit.html b/transporte/templates/address_edit.html
index 42136aa6b707bd30539615379c0e80347f322d13..f5978f2c818a38ebdc862b5087c5d6bbe2347d9a 100644
--- a/transporte/templates/address_edit.html
+++ b/transporte/templates/address_edit.html
@@ -44,6 +44,7 @@
             </div>
         {% endif %}
 
+            {{ addressform.public.label(class='form-check-label') }}
             <small id="needsOrganizationHelpBlock" class="form-text text-muted">
                 Check this box if the address can be used by anyone. Else it is only visible for helpdesk and admins.
             </small>
diff --git a/transporte/templates/address_list.html b/transporte/templates/address_list.html
index 4b9ec226c7187fd6788792bfde5c5c8721f2044f..b4bafb9c43fa36b767e6140225560602f94cf8b0 100644
--- a/transporte/templates/address_list.html
+++ b/transporte/templates/address_list.html
@@ -10,6 +10,7 @@
             <th scope="col">Address</th>
             <th scope="col">public?</th>
             <th scope="col">User</th>
+            <th scope="col"></th>
         </tr>
     </thead>
     <tbody>
diff --git a/transporte/templates/layout.html b/transporte/templates/layout.html
index 4dc4d68d63dde648e688dbfc6a2be0b495dc3fea..514fda39c56f57b0c5fd0d128c62ffdaf9c0de66 100644
--- a/transporte/templates/layout.html
+++ b/transporte/templates/layout.html
@@ -40,16 +40,8 @@
 
     <div class="collapse navbar-collapse" id="navbarSupportedContent">
         <ul class="navbar-nav mr-auto">
-            <!--
-            <li class="nav-item active">
-                <a class="nav-link" href=" {{ url_for('edit_transport') }}">Add Transport <span class="sr-only">(current)</span></a>
-            </li>
-            -->
-            <li class="nav-item">
-                <a class="nav-link" href=" {{ url_for('edit_transport') }}">Add Transport</a>
-            </li>
             <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('list_transports') }}">List Transports</a>
+                <a class="nav-link" href="{{ url_for('list_transports') }}">Transports</a>
             </li>
             {% if current_user.role in ['helpdesk', 'admin'] %}
             <li class="nav-item">
@@ -58,7 +50,7 @@
             {% endif %}
             {% if current_user.role in ['admin'] %}
             <li class="nav-item">
-                <a class="nav-link" href="{{ url_for('list_users') }}">List Users</a>
+                <a class="nav-link" href="{{ url_for('list_users') }}">Users</a>
             </li>
             {% endif %}
         </ul>