diff --git a/extensions/ki_export/export_pdf.php b/extensions/ki_export/export_pdf.php
index bb95fda..f764406 100644
--- a/extensions/ki_export/export_pdf.php
+++ b/extensions/ki_export/export_pdf.php
@@ -67,6 +67,10 @@ class MYPDF extends BasePDF
     public function ColoredTable($header, $data)
     {
         $kga = Kimai_Registry::getConfig();
+
+        $this->WriteHtml('<h4>' . $data[0]['projectName'] . '</h4>');
+        $this->ln();
+
         $dateWidth = max($this->GetStringWidth($header[0]),
             $this->GetStringWidth($this->dateformat(mktime(0, 0, 0, 12, 31, 2000))));
         $dateWidth += 4;
@@ -135,20 +139,20 @@ class MYPDF extends BasePDF
                 $this->SetFont('');
             }
             $this->Cell($w[0], 6, $this->dateformat($row['time_in']), 'LR', 0, 'C', $fill);
-            foreach ($w as $col => $colwidth) {
-                if ($col > 0) {
-                    $this->Cell($colwidth, 6, '', 'LR', 0, 'C', $fill);
-                }
-            }
-            $this->Ln();
-            $this->Cell($w[0], 6, $this->dateformat($row['time_out']), 'LR', 0, 'C', $fill);
-            if (isset($this->columns['trackingNumber'])) {
+            if (isset($row['trackingNumber'])) {
                 $trackingnumber = " (#" . $row['trackingNumber'] . ") - ";
             } else {
                 $trackingnumber = "";
             }
-            $this->Cell($w[1], 6, $trackingnumber . $row['customerName'] . ' - ' . $row['activityName'], 'LR', 0, 'L',
-                $fill);
+            $this->Cell($w[1], 6, $trackingnumber . $row['activityName'], 'LR', 0, 'L', $fill);
+            $this->Cell($w[2], 6, ' ', 'LR', 0, 'C', $fill);
+            $this->Cell($w[3], 6, ' ', 'LR', 0, 'C', $fill);
+            $this->Cell($w[4], 6, ' ', 'LR', 0, 'C', $fill);
+            $this->Cell($w[5], 6, ' ', 'LR', 0, 'C', $fill);
+
+            $this->Ln();
+            $this->Cell($w[0], 6, $this->dateformat($row['time_out']), 'LR', 0, 'C', $fill);
+            $this->Cell($w[1], 6, 'Done By: ' . $row['username'], 'LR', 0, 'L', $fill);
 
             if ($_REQUEST['time_type'] == "dec_time") {
                 if (isset($this->columns['dec_time'])) {
@@ -334,50 +338,22 @@ if (isset($_REQUEST['print_summary'])) {
     $pdf->AddPage();
 }
 
-// Write to the PDF document which, if any, customer filters were applied.
-$customers = [];
-foreach ($filterCustomers as $customerID) {
-    $customer_info = $database->customer_get_data($customerID);
-    $customers[] = $customer_info['name'];
-}
-if (count($customers) > 0) {
-    $label = $kga['lang']['customer'] . ': ';
-    $labelWidth = $pdf->GetStringWidth($label);
-    $pdf->cell($labelWidth, 6, $label);
-    $pdf->cell($labelWidth, 6, implode(', ', $customers));
-    $pdf->ln();
-}
-
-// Write to the PDF document which, if any, project filters were applied.
-$projects = [];
-foreach ($filterProjects as $projectID) {
-    $project_info = $database->project_get_data($projectID);
-    $projects[] = $project_info['name'];
-}
-if (count($projects) > 0) {
-    $label = $kga['lang']['project'] . ': ';
-    $labelWidth = $pdf->GetStringWidth($label);
-    $pdf->cell($labelWidth, 6, $label);
-    $pdf->cell($labelWidth, 6, implode(', ', $projects));
-    $pdf->ln();
-}
-
 $firstRun = true;
 foreach ($orderedExportData as $customer) {
     // process each customer in first dimension
-
+#print_r($customer);
     if ($firstRun) {
         $firstRun = false;
     } elseif (isset($_REQUEST['customer_new_page'])) {
         $pdf->AddPage();
     }
 
+    $project_ids = array_keys($customer);
+
     $pdf->ln();
-    $pdf->WriteHtml('<h3>' . $kga['lang']['export_extension']['full_list'] . '</h3>');
+    $pdf->WriteHtml('<h4>' . $customer[$project_ids[0]][0]['customerName'] . '</h4>');
     $pdf->ln();
 
-    $project_ids = array_keys($customer);
-
     foreach ($project_ids as $project_id) {
         // process each project in second dimension
         $pdf->ColoredTable([