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 3096)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 3097)
@@ -32,6 +32,6 @@
     private static final long serialVersionUID = 4539838472057529042L;
     private LiveGpsData gpsData;
-    private int rows = 3;
-    private int columns = 3;
+    private int rows = 0;
+    private int columns = 0;
     private int width = 0;
     private int height = 0;
@@ -65,4 +65,5 @@
      */
     public void setColumns(String columnsString) {
+        System.out.println("setting columns to " +columnsString);
         columns = Integer.parseInt(columnsString);
         buttonPanel.setLayout(new GridLayout(rows, columns));
@@ -96,4 +97,7 @@
 
     public void addButton(ButtonDescription description) {
+        if(rows == 0 && columns == 0) {
+            setColumns("4");
+        }
         description.setGpsDataSource(this);
         buttonPanel.add(description.createComponent());
Index: /applications/editors/josm/plugins/surveyor/src/surveyor.xml
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/surveyor.xml	(revision 3096)
+++ /applications/editors/josm/plugins/surveyor/src/surveyor.xml	(revision 3097)
@@ -1,4 +1,4 @@
 <?xml version="1.0"?>
-<surveyor rows="3" columns="3" width="0" height="0">
+<surveyor columns="4" width="0" height="0">
   <!-- icons can either be absolute paths or relative paths to the .josm directory -->
   <!-- action class: either fully qualified classnames or if not found,