diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 42157b8da..3405d689b 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -128,6 +128,8 @@
                         <option value="salespartner" <?=(array_key_exists("salespartner", $address->types)) ? "selected='selected'" : "salespartner"?>><?=__("salespartner")?></option>
                         <option value="pipeworker" <?=(array_key_exists("pipeworker", $address->types)) ? "selected='selected'" : "pipeworker"?>><?=__("pipeworker")?></option>
                         <option value="lineworker" <?=(array_key_exists("lineworker", $address->types)) ? "selected='selected'" : "lineworker"?>><?=__("lineworker")?></option>
+                        <option value="pipeplanner" <?=(array_key_exists("pipeplanner", $address->types)) ? "selected='selected'" : "pipeplanner"?>><?=__("pipeplanner")?></option>
+                        <option value="lineplanner" <?=(array_key_exists("lineplanner", $address->types)) ? "selected='selected'" : "lineplanner"?>><?=__("lineplanner")?></option>
                         <option value="netoperator" <?=(array_key_exists("netoperator", $address->types)) ? "selected='selected'" : "netoperator"?>><?=__("netoperator")?></option>
                         <option value="planner" <?=(array_key_exists("planner", $address->types)) ? "selected='selected'" : "planner"?>><?=__("planner")?></option>
                         <option value="support" <?=(array_key_exists("support", $address->types)) ? "selected='selected'" : "support"?>><?=__("support")?></option>
diff --git a/Layout/default/Network/Index.php b/Layout/default/Network/Index.php
index 41fc90e54..70ce75732 100644
--- a/Layout/default/Network/Index.php
+++ b/Layout/default/Network/Index.php
@@ -70,55 +70,86 @@
                   <div class="tab-content">
                     <div id="net-detail-<?=$network->id?>-detail" class="tab-pane show active">
                       <h4>Details zu <strong><?=$network->name?></strong></h4>
-                      <table class="table table-bordered">
-                        <tr class="bg-white">
-                          <th>Name</th>
-                          <td><?=$network->name?></td>
-                        </tr>
-                        <tr class="bg-white">
-                          <th>Besitzer</th>
-                          <td><?=$network->owner->getCompanyOrName()?></td>
-                        </tr>
-                        <tr class="bg-white">
-                          <th>Interne Notiz</th>
-                          <td><?=nl2br($network->note)?></td>
-                        </tr>
-                      </table>
+                      <div class="card">
+                        <div class="card-body">
+                          <table class="table table-bordered">
+                            <tr class="bg-white">
+                              <th>Name</th>
+                              <td><?=$network->name?></td>
+                            </tr>
+                            <tr class="bg-white">
+                              <th>Besitzer</th>
+                              <td><?=$network->owner->getCompanyOrName()?></td>
+                            </tr>
+                            <tr class="bg-white">
+                              <th>Interne Notiz</th>
+                              <td><?=nl2br($network->note)?></td>
+                            </tr>
+                          </table>
+                        </div>
+                      </div>
                     </div>
                     <div id="net-detail-<?=$network->id?>-pops" class="tab-pane">
                       <h4>POPs in <strong><?=$network->name?></strong></h4>
                       <div class="card">
                         <div class="card-body">
-                      <?php if(is_array($network->pops) && count($network->pops)): ?>
-                        <table class="table" >
-                          <tr>
-                            <th>Name</th>
-                            <th>GPS (Breite, Länge)</th>
-                            <th>Standortinfo</th>
-                            <th></th>
-                          </tr>
-                        <?php foreach($network->pops as $pop): ?>
-                          <tr>
-                            <td><?=$pop->name?></td>
-                            <td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td>
-                            <td><?=nl2br($pop->location)?></td>
-                            <td class="controls" style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
-                              <a href="<?=self::getUrl("Pop", "edit", ["id" => $pop->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
-                              <a href="<?=self::getUrl("Pop", "delete", ["id" => $pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
-                            </td>
-                          </tr>
-                        <?php endforeach; ?>
-                        </table>
-                      <?php else: ?>
-                      <p><i>Keine POPs vorhanden</i></p>
-                      <?php endif; ?>
-                      </div>
+                          <?php if(is_array($network->pops) && count($network->pops)): ?>
+                            <table class="table" >
+                              <tr>
+                                <th>Name</th>
+                                <th>GPS (Breite, Länge)</th>
+                                <th>Standortinfo</th>
+                                <th></th>
+                              </tr>
+                            <?php foreach($network->pops as $pop): ?>
+                              <tr>
+                                <td><?=$pop->name?></td>
+                                <td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td>
+                                <td><?=nl2br($pop->location)?></td>
+                                <td class="controls" style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                                  <a href="<?=self::getUrl("Pop", "edit", ["id" => $pop->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
+                                  <a href="<?=self::getUrl("Pop", "delete", ["id" => $pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+                                </td>
+                              </tr>
+                            <?php endforeach; ?>
+                            </table>
+                          <?php else: ?>
+                          <p><i>Keine POPs vorhanden.</i></p>
+                          <?php endif; ?>
+                        </div>
                       </div>
                       
                       <a class="btn btn-primary" href="<?=self::getUrl("Pop", "add", ['network_id' => $network->id])?>"><i class="fas fa-plus"></i> Neuen POP anlegen</a>
                     </div>
                     <div id="net-detail-<?=$network->id?>-third" class="tab-pane">
                       <h4>Berechtigungen</h4>
+                      <div class="card">
+                        <div class="card-body">
+                          <?php if(is_array($network->pops) && count($network->pops)): ?>
+                            <table class="table">
+                              <tr>
+                                <th>Name</th>
+                                <th>GPS (Breite, Länge)</th>
+                                <th>Standortinfo</th>
+                                <th></th>
+                              </tr>
+                            <?php foreach($network->pops as $pop): ?>
+                              <tr>
+                                <td><?=$pop->name?></td>
+                                <td><?=$pop->gps_lat?>, <?=$pop->gps_long?></td>
+                                <td><?=nl2br($pop->location)?></td>
+                                <td class="controls" style="text-align: left; letter-spacing: 4px; font-size: 1.1em;">
+                                  <a href="<?=self::getUrl("Pop", "edit", ["id" => $pop->id])?>"><i class="far fa-edit"  title="Bearbeiten"></i></a>
+                                  <a href="<?=self::getUrl("Pop", "delete", ["id" => $pop->id])?>" class="text-danger" title="Löschen"><i class="fas fa-trash"></i></a>
+                                </td>
+                              </tr>
+                            <?php endforeach; ?>
+                            </table>
+                          <?php else: ?>
+                          <p><i>Keine berechtigten Firmen/Personen vorhanden.</i></p>
+                          <?php endif; ?>
+                        </div>
+                      </div>
                     </div>
                   </div>
                   
diff --git a/Layout/default/Pop/Form.php b/Layout/default/Pop/Form.php
index c328e37ab..dfd5971e7 100644
--- a/Layout/default/Pop/Form.php
+++ b/Layout/default/Pop/Form.php
@@ -56,14 +56,14 @@
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="gps_lat">GPS Breite</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="gps_lat" id="name" value="<?=$pop->gps_lat?>">
+                      <input type="number" class="form-control" name="gps_lat" id="name" value="<?=$pop->gps_lat?>">
                     </div>
                   </div>
                   
                   <div class="form-group row">
                     <label class="col-lg-2 col-form-label" for="gps_long">GPS Länge</label>
                     <div class="col-lg-10">
-                      <input type="text" class="form-control" name="gps_long" id="name" value="<?=$pop->gps_long?>">
+                      <input type="number" class="form-control" name="gps_long" id="name" value="<?=$pop->gps_long?>">
                     </div>
                   </div>
                   
diff --git a/application/Address/AddressModel.php b/application/Address/AddressModel.php
index 4f3885848..0d49b44dc 100644
--- a/application/Address/AddressModel.php
+++ b/application/Address/AddressModel.php
@@ -109,6 +109,12 @@ class AddressModel {
       if(in_array("lineworker", $at)) {
         $in[] = "Addresstype.type = 'lineworker'";
       }
+      if(in_array("pipeplanner", $at)) {
+        $in[] = "Addresstype.type = 'pipeplanner'";
+      }
+      if(in_array("lineplanner", $at)) {
+        $in[] = "Addresstype.type = 'lineplanner'";
+      }
       if(in_array("netoperator", $at)) {
         $in[] = "Addresstype.type = 'netoperator'";
       }
diff --git a/contrib/migrations/20210629-01-addresstype-planner-vlan.sql b/contrib/migrations/20210629-01-addresstype-planner-vlan.sql
index 5c7f7b473..4b20895b1 100644
--- a/contrib/migrations/20210629-01-addresstype-planner-vlan.sql
+++ b/contrib/migrations/20210629-01-addresstype-planner-vlan.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `Addresstype` CHANGE `type` `type` ENUM('systemowner','netowner','salespartner','pipeworker','lineworker','netoperator','planner','support','billing','employee','customer','supplier','contact');
+ALTER TABLE `Addresstype` CHANGE `type` `type` ENUM('systemowner','netowner','salespartner','pipeworker','lineworker','pipeplanner','lineplanner','netoperator','support','billing','employee','customer','supplier','contact') CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_520_ci NOT NULL; 
 ALTER TABLE `Pop` ADD `vlan_public` INT(4) NULL DEFAULT NULL AFTER `location`;
 ALTER TABLE `Pop` ADD `vlan_nat` INT(4) NULL DEFAULT NULL AFTER `vlan_public`;
 ALTER TABLE `Pop` ADD `vlan_ipv6` INT(4) NULL DEFAULT NULL AFTER `vlan_nat`;
diff --git a/lang/de.php b/lang/de.php
index bba6348ea..b689f0cf1 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -6,6 +6,8 @@ $l['netowner'] = "Netzeigentümer";
 $l['salespartner'] = "Vertriebspartner";
 $l['pipeworker'] = "Tiefbau";
 $l['lineworker'] = "Leitungsbau";
+$l['pipeplanner'] = "Rohrplaner";
+$l['lineplanner'] = "Faserplaner";
 $l['netoperator'] = "Netzbetreiber";
 $l['planner'] = "Planer";
 $l['support'] = "Support";