Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 3077)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 3078)
@@ -4,4 +4,5 @@
 package at.dallermassl.josm.plugin.surveyor;
 
+import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -15,7 +16,10 @@
 import javax.swing.JComponent;
 import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
 
 import livegps.LiveGpsData;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.XmlObjectParser;
 import org.xml.sax.SAXException;
@@ -32,7 +36,17 @@
     private int width = 0;
     private int height = 0;
+    private JLabel streetLabel;
+    private JPanel buttonPanel;
 
     public SurveyorComponent() {
         super();
+        setLayout(new BorderLayout());
+        streetLabel = new JLabel("Way: ");
+        float fontSize = Float.parseFloat(Main.pref.get(SurveyorPlugin.PREF_KEY_STREET_NAME_FONT_SIZE, "35"));
+        Main.pref.put(SurveyorPlugin.PREF_KEY_STREET_NAME_FONT_SIZE, String.valueOf(fontSize));
+        streetLabel.setFont(streetLabel.getFont().deriveFont(35f));
+        add(streetLabel, BorderLayout.NORTH);
+        buttonPanel = new JPanel();
+        add(buttonPanel, BorderLayout.CENTER);
     }
     
@@ -43,5 +57,5 @@
     public void setRows(String rowsString) {
         rows = Integer.parseInt(rowsString);
-        setLayout(new GridLayout(rows, columns));
+        buttonPanel.setLayout(new GridLayout(rows, columns));
     }
     
@@ -52,5 +66,5 @@
     public void setColumns(String columnsString) {
         columns = Integer.parseInt(columnsString);
-        setLayout(new GridLayout(rows, columns));
+        buttonPanel.setLayout(new GridLayout(rows, columns));
     }
     
@@ -83,5 +97,5 @@
     public void addButton(ButtonDescription description) {
         description.setGpsDataSource(this);
-        add(description.createComponent());
+        buttonPanel.add(description.createComponent());
     }
     
@@ -147,4 +161,5 @@
         if("gpsdata".equals(evt.getPropertyName())) {
             gpsData = (LiveGpsData) evt.getNewValue();
+            streetLabel.setText("Way: " + gpsData.getWay());
         }