--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Fri Feb 15 12:47:15 2013 +0100
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Mon Feb 18 16:29:37 2013 +0100
@@ -25,7 +25,7 @@
   - 2000000
   - 4000000
 
-outputFilename: 'flys-${date}.pdf'
+outputFilename: "flys-${date}.pdf"
 
 #===========================================================================
 # the list of allowed hosts
@@ -54,65 +54,12 @@
     port: 80
 
 layouts:
-  #===========================================================================
-  A4 portrait:
-  #===========================================================================
-    metaData:
-      title: '${title}'
-      author: 'Flys'
-      subject: 'Kartendruck A4 Portrait'
-      keywords: 'map,print'
-      creator: 'd4e-river'
-
-    #-------------------------------------------------------------------------
-    mainPage:
-      pageSize: A4
-      landscape: false
-      header:
-        height: 50
-        items:
-          - !image
-            align: left
-            maxWidth: 60
-            maxHeight: 60
-            url: '${configDir}/../images/FLYS_Logo.png'
-      items:
-        - !text
-            font: Helvetica
-            fontSize: 30
-            align: right
-            text: '${mapTitle}'
-            spacingAfter: 30
-        - !map
-          spacingAfter: 30
-          width: 440
-          height: 483
-        - !scalebar
-          type: bar
-          maxSize: 100
-          barBgColor: white
-          fontSize: 8
-          align: right
-        - !text
-          text: '${comment}'
-          spacingAfter: 30
-        - !text
-          font: Helvetica
-          fontSize: 9
-          align: right
-          text: '1:${scale} ${now MM.dd.yyyy}'
-        - !legends
-          align: left
-          maxIconWidth: 32
-          maxIconHeight: 32
-      footer: *commonFooter
-      
 
   #===========================================================================
   A4 landscape:
   #===========================================================================
     metaData:
-      title: '${title}'
+      title: "${title}"
       author: 'Flys'
       subject: 'Kartendruck A4 Quer'
       keywords: 'map,print'
@@ -125,96 +72,27 @@
       header:
         height: 50
         items:
-          - !image
-            align: left
-            maxWidth: 60
-            maxHeight: 60
-            url: '${configDir}/../images/FLYS_Logo.png'
+          - !columns
+            config:
+              cells:
+                - paddingBottom: 5
+            items:
+            - !image
+              align: left
+              maxWidth: 50
+              maxHeight: 50
+              url: "${configDir}/../images/FLYS_Logo.png"
+            - !text
+              font: Helvetica
+              fontSize: 30
+              align: right
+              text: "${mapTitle}"
+              
       items:
-        - !text
-            font: Helvetica
-            fontSize: 30
-            align: right
-            text: '${mapTitle}'
-            spacingAfter: 30
-        - !map
-          absoluteX: 45
-          absoluteY: 510
-          #spacingAfter: 30
-          width: 540
-          height: 480
-          align: left
-        - !scalebar
-          type: bar
-          maxSize: 100
-          barBgColor: white
-          fontSize: 8
-          align: right
-        - !text
-          text: '${comment}'
-          spacingAfter: 30
-        - !text
-          font: Helvetica
-          fontSize: 9
-          align: right
-          text: '1:${scale} ${now MM.dd.yyyy}'
-        - !legends
-          align: right
-          maxIconWidth: 32
-          maxIconHeight: 32
-#         - !columns
-#           widths: [500, 200]
-#           items:
-#             - !map
-#               width: 500
-#               height: 500
-#             - !legends
-      footer: *commonFooter
-
-
-  #===========================================================================
-  A0 portrait:
-  #===========================================================================
-    metaData:
-      title: '${title}'
-      author: 'MapFish print module'
-      subject: 'Simple layout'
-      keywords: 'map,print'
-      creator: 'MapFish'
-
-    #-------------------------------------------------------------------------
-    mainPage:
-      pageSize: A0
-      rotation: true
-      header:
-        height: 50
-        items:
-          - !text
-            font: Helvetica
-            fontSize: 30
-            align: right
-            text: '${mapTitle}'
-      items:
-        - !map
-          spacingAfter: 30
-          width: 1760
-          height: 1932
-        - !scalebar
-          type: bar
-          maxSize: 100
-          barBgColor: white
-          fontSize: 8
-          align: right
-        - !text
-          text: '${comment}'
-          spacingAfter: 30
-        - !text
-          font: Helvetica
-          fontSize: 9
-          align: right
-          text: '1:${scale} ${now MM.dd.yyyy}'
-        - !legends
-          align: left
-          maxIconWidth: 32
-          maxIconHeight: 32
-      footer: *commonFooter
+      - !map
+        absoluteX: 45
+        absoluteY: 510
+        spacingAfter: 200
+        width: 540
+        height: 480
+        align: left