diff --git a/Layout/default/Linework/Index.php b/Layout/default/Linework/Index.php
index 2211ee75b..df2982bd7 100644
--- a/Layout/default/Linework/Index.php
+++ b/Layout/default/Linework/Index.php
@@ -149,8 +149,8 @@
                   <tr id="termination-<?=$term->id?>" class="table-bg-<?=($bcount % 2 == 0) ? "even" : "odd"?>">
                     <td>
                       <div>
-                        <strong style="white-space: nowrap;"><?=$term->building->street?></strong><br />
-                        <span class="text-success"><?=$term->code?></span><br />
+                        <strong style="white-space: nowrap;"><a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $term->building->code]])?>" target="_blank"><?=$term->building->street?></a></strong><br />
+                        <a href="<?=self::getUrl("Pipework", "Index", ["filter" => ["code" => $term->building->code]])?>" target="_blank"><span class="text-success"><?=$term->code?></span></a><br />
                       </div>
                       <div class="mt-3">
                         <?=$term->contact?><br />
@@ -170,7 +170,7 @@
                       </div>
                     </td>
                     <td>
-                      <table class="table workflow-table table-bordered table-bg-<?=($bcount % 2 == 0) ? "odd" : "even"?>">
+                      <table class="table workflow-table table-bordered table-sm table-bg-<?=($bcount % 2 == 0) ? "odd" : "even"?>">
                         <tr>
                           <th>AP-Typ</th>
                           <th>AP-Name</th>
@@ -189,7 +189,11 @@
                             <span
                               style="
                                 background-color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hex"]?>;
-                                color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hexfg"]?>
+                                <?php if(TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["mark"]): ?>
+                                color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hexfg"]?>;
+                                <?php else: ?>
+                                color: #<?=TT_CABLE_COLORS[$term->building->workflowitems['rohrfarbe']->value->value_string]["hex"]?>;
+                                <?php endif; ?>
                                 border-radius: 3px;
                               ">-------</span> <?=$term->building->workflowitems['rohrfarbe']->value->value_string?>
                           </td>