--- a/flys-client/src/main/webapp/WEB-INF/config.yaml	Thu Apr 18 10:42:40 2013 +0200
+++ b/flys-client/src/main/webapp/WEB-INF/config.yaml	Thu Apr 18 10:43:23 2013 +0200
@@ -139,84 +139,101 @@
           width: 587
           height: 555
           spacingAfter: 0
-        #Flys and BFG Logo
+        # The scale text
         - !columns
-          absoluteX: 750
-          absoluteY: 110
+          absoluteX: 620
+          absoluteY: 30
           width: 60
           items:
-            - !image
-              maxWidth: 60
-              maxHeight: 60
-              url: '${configDir}/../images/FLYS_Logo.png'
+            - !text
+              fontSize: 8
+              text: '1:${scale}'
+              fontEncoding: Identity-H
+              font: FreeSans
+              backgroundColor: #FFFFFF
+        # The north arrow
         - !columns
-          absoluteX: 630
-          absoluteY: 110
-          width: 90
+          absoluteX: 627
+          absoluteY: 65
+          width: 32
           items:
             - !image
-              maxWidth: 90
-              maxHeight: 60
-              url: '${configDir}/../images/bfg_logo.gif'
-        # Legend header, a bit hackish with the border
-        # but I don't know how to put two rows in a column and I don't want to
-        # use tables
-#        - !columns
-#          absoluteX: 612
-#          absoluteY: 575
-#          width: 200
-#          items:
-#            - !text
-#              text: "Legende:"
-#              align: center
-#          config:
-#            borderWidthLeft: 1
-#            borderWidthRight: 1
-#            borderWidthTop: 1
-#            borderWidthBottom: 0
+              maxWidth: 20
+              maxHeight: 40
+              url: '${configDir}/../images/north.png'
+        #Flys and BFG Logo
+        - !columns
+          absoluteX: 760
+          absoluteY: 70
+          width: 50
+          items:
+            - !image
+              maxWidth: 50
+              maxHeight: 50
+              url: '${configDir}/../images/FLYS_Logo.png'
+        - !columns
+          absoluteX: 665
+          absoluteY: 70
+          width: 75
+          items:
+            - !image
+              maxWidth: 75
+              maxHeight: 50
+              url: '${configDir}/../${logo}'
         # Scalebar
         - !columns
-          absoluteX: 620
-          absoluteY: 35
-          width: 200
+          absoluteX: 460
+          absoluteY: 40
+          width: 150
           items:
             - !scalebar
               type: bar
-              maxSize: 200
+              maxSize: 150
               barSize: 5
               barBgColor: white
               fontSize: 8
-
+              backgroundColor: #FFFFFF
         # The legend
         - !columns
           absoluteX: 612
-          absoluteY: 575
+          absoluteY: 390
           width: 200
           items:
             - !legends
               maxHeight: 325
               maxWidth: 0
               maxIconHeight: 0
-              inline: false
+              inline: true
               classIndentation: 10
-              layerSpace: 5
-              classSpace: 2
+              layerSpace: 0
+              classSpace: 5
               layerFontSize: 0
               classFontSize: 10
               fontEncoding: Identity-H
               classFont: FreeSans
               layerFont: FreeSans
-              columnMargin: 2
               defaultScale: 0.5
           config:
             borderWidthLeft: 1
             borderWidthRight: 1
             borderWidthTop: 1
             borderWidthBottom: 1
+        # Title of the map
+        - !columns
+          absoluteX: 612
+          absoluteY: 575
+          width: 200
+          condition: mapTitle
+          items:
+            - !text
+              text: '${mapTitle}'
+#              align: center
+#            cells:
+#              padding: 5
         # The Stamp
         - !columns
           absoluteX: 612
-          absoluteY: 270
+          absoluteY: 555
           width: 200
         #  config:
         #    borderWidthLeft: 5
@@ -266,17 +283,3 @@
                         font: FreeSans
                         fontSize: 10
                     backgroundColor: #FFFFFF
-        # The scale text
-        - !columns
-          absoluteX: 617
-          absoluteY: 55
-          width: 200
-          items:
-            - !text
-              fontSize: 10
-              text: 'Maßstab: 1:${scale}'
-              fontEncoding: Identity-H
-              font: FreeSans
-          config:
-            cells:
-              - padding: 5