diff --git a/Layout/default/Pipework/Index.php b/Layout/default/Pipework/Index.php
index d01f18675..8762ac94c 100644
--- a/Layout/default/Pipework/Index.php
+++ b/Layout/default/Pipework/Index.php
@@ -30,7 +30,7 @@
               <?php foreach($networks as $networkname => $buildings): ?>
               <?php if(!count($buildings)) continue; ?>
               <h4><?=$networkname?></h4>
-              <table class="table table-hover">
+              <table class="table workflow-table">
                 <?php $bcount = 0; foreach($buildings as $building): ?>
                 <?php
                 $rowspan = 1;
@@ -42,23 +42,30 @@
                 ?>
                 <tr id="building-<?=$building->id?>" class="table-bg-<?=($bcount % 2 == 0) ? "even" : "odd"?>">
                   <td>
-                    <strong><?=$building->street?></strong><br />
-                    <?=$building->code?><br />
+                    <strong style="white-space: nowrap;"><?=$building->street?></strong><br />
+                    <span class="text-success"><?=$building->code?></span><br />
                     <br />
-                    Kontakt: <?=$building->contact?><br />
-                    Telefon: <strong><?=$building->phone?></strong><br />
-                    Email: <?=$building->email?>
+                    Kontakt:<br />
+                    <?=$building->contact?><br />
+                    <strong><?=$building->phone?></strong><br />
+                    <?=$building->email?>
                   </td>
                   <td>
-                    <table>
-                      <tr>
+                    <table class="table workflow-table">
+                      
                         <?php $i = 0; foreach($building->workflowitems as $item): ?>
-                          <?php if($item->type == "delimiter"): ?>
-                            <?=($i) ? "</tr></table>" : "" ?>
-                            <?=($item->label) ? "<h5>".$item->label."</h5>" : ""?>
-                          <table><tr>
+                          <?php if($i==0): ?>
+                            <?php if($item->type == "delimiter"): ?>
+                              <tr class="workflow-header"><th colspan='<?=$building_wf_colspan?>'><?=$item->label?></th></tr><tr>
+                            <?php else: ?>
+                              <tr>
+                            <?php endif; ?>
                           <?php else: ?>
-                            <?php include(realpath(dirname(__FILE__)."/../")."/Workflow/form.php"); ?>
+                            <?php if($item->type == "delimiter"): ?>
+                              </tr><tr class="workflow-header"><th colspan='<?=$building_wf_colspan?>'><?=$item->label?></th></tr><tr>
+                            <?php else: ?>
+                              <?php include(realpath(dirname(__FILE__)."/../")."/Workflow/form.php"); ?>
+                            <?php endif; ?>
                           <?php endif; ?>
                         <?php $i++; endforeach; ?>
                       </tr>
diff --git a/Layout/default/Workflow/form.php b/Layout/default/Workflow/form.php
index 9b6f40b73..7eb8905cf 100644
--- a/Layout/default/Workflow/form.php
+++ b/Layout/default/Workflow/form.php
@@ -1,7 +1,7 @@
-<td>
+<td class="workflow-item">
   <?php if($item->type != "gps"): ?>
-    <label class="form-label" for="wfitem_<?=$item->name?>">
-      <?=$item->label?>
+    <label class="form-label" for="wfitem_<?=$item->name?>_<?=$building->id?>">
+      <?=($item->label) ? $item->label : "&nbsp;"?>
       <?=($item->required == 1) ? "*" : ""?>
     </label>
   <?php endif; ?>
@@ -39,6 +39,9 @@
       case "date":
         include(realpath(dirname(__FILE__)."/items/")."/date.php");
         break;
+      case "empty":
+        include(realpath(dirname(__FILE__)."/items/")."/empty.php");
+        break;
       default:
         include(realpath(dirname(__FILE__)."/items/")."/string.php");
     }
diff --git a/Layout/default/Workflow/items/bool.php b/Layout/default/Workflow/items/bool.php
index 31ea01882..e847b21a5 100644
--- a/Layout/default/Workflow/items/bool.php
+++ b/Layout/default/Workflow/items/bool.php
@@ -1 +1 @@
-<input type="checkbox" class="form-control" name="wfitem_<?=$item->name?>_<?=$item->object_id?>" id="wfitem_<?=$item->name?>_<?=$item->object_id?>" value="<?=$item->value->value_string?>">
\ No newline at end of file
+<input type="checkbox" class="form-control" name="wfitem_<?=$item->name?>_<?=$building->id?>" id="wfitem_<?=$item->name?>_<?=$building->id?>" value="<?=$item->value->value_string?>">
\ No newline at end of file
diff --git a/Layout/default/Workflow/items/date.php b/Layout/default/Workflow/items/date.php
index 5472ab0c9..286b7bfee 100644
--- a/Layout/default/Workflow/items/date.php
+++ b/Layout/default/Workflow/items/date.php
@@ -1,4 +1,4 @@
-<input type="text" class="form-control" name="wfitem_<?=$item->name?>" id="wfitem_<?=$item->name?>_<?=$building->id?>" value="<?=$item->value->value_string?>" placeholder="<?=$item->placeholder?>" />
+<input type="text" class="form-control" name="wfitem_<?=$item->name?>_<?=$building->id?>" id="wfitem_<?=$item->name?>_<?=$building->id?>" value="<?=$item->value->value_string?>" placeholder="<?=$item->placeholder?>" />
 
 <script type="text/javascript">
   $('#wfitem_<?=$item->name?>_<?=$building->id?>').datepicker({
diff --git a/Layout/default/Workflow/items/empty.php b/Layout/default/Workflow/items/empty.php
index 29ffd6cb1..8083c7838 100644
--- a/Layout/default/Workflow/items/empty.php
+++ b/Layout/default/Workflow/items/empty.php
@@ -1 +1 @@
-<input type="text" class="form-control" name="wfitem_<?=$item->name?>" id="wfitem_<?=$item->name?>" value="<?=$item->value->value_string?>" placeholder="<?=$item->placeholder?>">
\ No newline at end of file
+&nbsp;
\ No newline at end of file
diff --git a/Layout/default/Workflow/items/gps.php b/Layout/default/Workflow/items/gps.php
index 6dcec8997..fc8ea0582 100644
--- a/Layout/default/Workflow/items/gps.php
+++ b/Layout/default/Workflow/items/gps.php
@@ -8,13 +8,13 @@
   }
 ?>
 <div class="row">
-  <div class="col-md-6">
+  <div class="col-md-6 padding-right-2">
     <label class="form-label" for="wfitem_<?=$item->name?>_lat_<?=$building->id?>">GPS Breite <?=($item->required == 1) ? "*" : ""?></label>
-    <input type="text" class="form-control" name="wfitem_<?=$item->name?>_lat" id="wfitem_<?=$item->name?>_lat_<?=$building->id?>" value="<?=$lat?>" placeholder="<?=str_replace(",", ".", TT_PLACEHOLDER_GPS_LAT)?>">
+    <input type="text" class="form-control" name="wfitem_<?=$item->name?>_lat_<?=$building->id?>" id="wfitem_<?=$item->name?>_lat_<?=$building->id?>" value="<?=$lat?>" placeholder="<?=str_replace(",", ".", TT_PLACEHOLDER_GPS_LAT)?>">
   </div>
-  <div class="col-md-6">
+  <div class="col-md-6 padding-left-2">
     <label class="form-label" for="wfitem_<?=$item->name?>_long_<?=$building->id?>">GPS Länge <?=($item->required == 1) ? "*" : ""?></label>
-    <input type="text" class="form-control" name="wfitem_<?=$item->name?>_long" id="wfitem_<?=$item->name?>_long_<?=$building->id?>" value="<?=$long?>" placeholder="<?=str_replace(",", ".", TT_PLACEHOLDER_GPS_LONG)?>">
+    <input type="text" class="form-control" name="wfitem_<?=$item->name?>_long_<?=$building->id?>" id="wfitem_<?=$item->name?>_long_<?=$building->id?>" value="<?=$long?>" placeholder="<?=str_replace(",", ".", TT_PLACEHOLDER_GPS_LONG)?>">
   </div>
 </div>
 
diff --git a/application/Pipework/PipeworkController.php b/application/Pipework/PipeworkController.php
index 1018ed72e..dc979f95a 100644
--- a/application/Pipework/PipeworkController.php
+++ b/application/Pipework/PipeworkController.php
@@ -35,6 +35,23 @@ class PipeworkController extends mfBaseController {
       }
     }
     
+    $building = reset(reset($networks));
+    $item_colspan = 0;
+    $i = 0;
+    
+    //var_dump($building->workflowitems);exit;
+    foreach($building->workflowitems as $wfitem) {
+      if($i == 0 && $wfitem->type == "delimiter") continue;
+      
+      if($wfitem->type == "delimiter") {
+        $item_colspan = $i;
+        break;
+      }
+      
+      $i++;
+    }
+    //var_dump($item_colspan);exit;
+    $this->layout()->set("building_wf_colspan", $item_colspan);
     $this->layout()->set("networks", $networks);
     //var_dump(reset(reset($networks))->workflowitems);exit;
     // get delimiter count, to adjust rowspan
diff --git a/public/assets/css/thetool.css b/public/assets/css/thetool.css
index fb96d0391..b51a360a4 100644
--- a/public/assets/css/thetool.css
+++ b/public/assets/css/thetool.css
@@ -41,6 +41,45 @@
   
 }
 
+.workflow-table {
+  margin-bottom:4px;
+}
+
+.workflow-table label {
+  white-space: nowrap;
+}
+
+.workflow-table .workflow-item {
+  padding-left: 2px;
+  padding-right: 2px;
+  padding-top: 4px;
+  padding-bottom: 4px;
+  border-top: none;
+}
+
+.workflow-header {
+  
+}
+
+.workflow-header th {
+  padding-top: 4px;
+  padding-bottom: 4px;
+  
+}
+
+.workflow-table .workflow-item input[type=text],
+.workflow-table .workflow-item select {
+  /*max-width: 180px;*/
+}
+
+.padding-left-2 {
+  padding-left: 2px;
+}
+
+.padding-right-2 {
+  padding-right: 2px;
+}
+
 td.controls {
   cursor: default;
   text-align: left; letter-spacing: 4px; font-size: 1.1em;