diff --git a/07/src/de/dis2017/MainAnalysis.java b/07/src/de/dis2017/MainAnalysis.java
index 9c24c5a..c4bcbd1 100644
--- a/07/src/de/dis2017/MainAnalysis.java
+++ b/07/src/de/dis2017/MainAnalysis.java
@@ -2,10 +2,7 @@ package de.dis2017;
 
 import de.dis2017.data.db.ORM;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class MainAnalysis {
     private static ORM _orm;
@@ -16,57 +13,97 @@ public class MainAnalysis {
     public static void main(String[] args) {
         _orm = new ORM();
         Map<String,Map<String, Map<String, Integer>>> sales = _orm.getSalesCrossTable(2017);
-        List<String>                                  articleNames = new ArrayList<>(sales.get("total").get("total").keySet());
+        printTable(sales);
+    }
+    
+    private static void printTable(Map<String, Map<String, Map<String, Integer>>> crossTable) {
+        List<String> articleNames = new ArrayList<>(crossTable.get("total").get("total").keySet());
         Collections.sort(articleNames);
-        System.out.print("City | Time | ");
-        int chars = 19;
+        StringBuilder columnHeaderEdge = new StringBuilder("+-----------------+-----------------+");
+        StringBuilder columnHeader     = new StringBuilder("| Location        | Time            |");
+        StringBuilder        leftAlignFormat  = new StringBuilder("| %-15s | %-15s |");
+        
         for (String article : articleNames) {
             if (article.equals("total")) continue;
-            System.out.print(article + " | ");
-            chars += article.length() + 3;
+            int colSize = article.length();
+            columnHeaderEdge.append(new String(new char[colSize + 2]).replace('\0', '-')).append("+");
+            leftAlignFormat.append(" %").append(colSize).append("d |");
+            columnHeader.append(" ").append(article).append(" |");
         }
-        System.out.println("total");
-        System.out.println(new String(new char[chars]).replace('\0', '-'));
+        columnHeaderEdge.append("---------+%n");
+        leftAlignFormat.append(" %7d |%n");
+        columnHeader.append(" total   |%n");
         
+        System.out.format(columnHeaderEdge.toString());
+        System.out.format(columnHeader.toString());
+        System.out.format(columnHeaderEdge.toString());
+    
         // cities
-        List<String> cityNames = new ArrayList<>(sales.keySet());
+        List<String> cityNames = new ArrayList<>(crossTable.keySet());
         Collections.sort(cityNames);
+        boolean firstRun = true;
         for (String city : cityNames) {
+            if (firstRun) {
+                firstRun = false;
+            }
+            else {
+                System.out.format(columnHeaderEdge.toString());
+            }
             if (city.equals("total")) continue;
-            Map<String, Map<String, Integer>> timeMap = sales.get(city);
-            List<String> times = new ArrayList<>(timeMap.keySet());
+            Map<String, Map<String, Integer>> timeMap = crossTable.get(city);
+            List<String>                      times   = new ArrayList<>(timeMap.keySet());
             Collections.sort(times);
-            
+        
             for (String time : times) {
                 if (time.equals("total")) continue;
                 Map<String, Integer> productMap = timeMap.get(time);
-                System.out.print(city + " | quarter " + time + ", 2017 | " );
+                List<Object> values = new ArrayList<>();
+                values.add(city);
+                values.add("quarter " + time + ", 2017");
                 for (String article : articleNames) {
                     if (article.equals("total")) continue;
-                    System.out.print(productMap.get(article) + " | ");
+                    values.add(productMap.get(article));
                 }
-                System.out.println(productMap.get("total"));
-                System.out.println(new String(new char[chars]).replace('\0', '-'));
+                values.add(productMap.get("total"));
+                System.out.format(leftAlignFormat.toString(), unpack(values.toArray()));
             }
             Map<String, Integer> productMap = timeMap.get("total");
-            System.out.print(city + " | total | " );
+            List<Object> totalValues = new ArrayList<>();
+            totalValues.add(city);
+            totalValues.add("total");
             for (String article : articleNames) {
                 if (article.equals("total")) continue;
-                System.out.print(productMap.get(article) + " | ");
+                totalValues.add(productMap.get(article));
             }
-            System.out.println(productMap.get("total"));
-            System.out.println(new String(new char[chars]).replace('\0', '-'));
+            totalValues.add(productMap.get("total"));
+            System.out.format(leftAlignFormat.toString(), unpack(totalValues.toArray()));
         }
-    
-        System.out.println(new String(new char[chars]).replace('\0', '-'));
-    
-        Map<String, Map<String, Integer>> timeMap = sales.get("total");
+        Map<String, Map<String, Integer>> timeMap = crossTable.get("total");
         Map<String, Integer> productMap = timeMap.get("total");
-        System.out.print("total | total | ");
+        List<Object> globalTotalValues = new ArrayList<>();
+        globalTotalValues.add("total");
+        globalTotalValues.add("total");
         for (String article : articleNames) {
             if (article.equals("total")) continue;
-            System.out.print(productMap.get(article) + " | ");
+            globalTotalValues.add(productMap.get(article));
         }
-        System.out.println(productMap.get("total"));
+        globalTotalValues.add(productMap.get("total"));
+        System.out.format(leftAlignFormat.toString(), unpack(globalTotalValues.toArray()));
+        System.out.format(columnHeaderEdge.toString());
+    }
+    
+    @SafeVarargs
+    private static <E> Object[] unpack(E... objects) {
+        List<Object> list = new ArrayList<Object>();
+        for (Object object : objects) {
+            if (object instanceof Object[]) {
+                list.addAll(Arrays.asList((Object[]) object));
+            }
+            else{
+                list.add(object);
+            }
+        }
+        
+        return list.toArray(new Object[list.size()]);
     }
 }