Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java	(revision 19381)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java	(revision 19382)
@@ -49,5 +49,5 @@
         )) + "</html>"), GBC.eol().fill());
 
-        add(rawUrl, GBC.eop().fill());
+        add(rawUrl, GBC.eol().fill(GBC.HORIZONTAL));
         rawUrl.setLineWrap(true);
         rawUrl.addKeyListener(keyAdapter);
@@ -55,12 +55,14 @@
         add(new JLabel(tr("{0} Enter maximum zoom (optional)", "3.")), GBC.eol());
         tmsZoom.addKeyListener(keyAdapter);
-        add(tmsZoom, GBC.eop().fill());
+        add(tmsZoom, GBC.eol().fill(GBC.HORIZONTAL));
 
         add(new JLabel(tr("{0} Edit generated {1} URL (optional)", "4.", "TMS")), GBC.eol());
-        add(tmsUrl, GBC.eop().fill());
+        add(tmsUrl, GBC.eol().fill(GBC.HORIZONTAL));
         tmsUrl.setLineWrap(true);
 
+        addCommonSettings();
+
         add(new JLabel(tr("{0} Enter name for this layer", "5.")), GBC.eol());
-        add(name, GBC.eop().fill());
+        add(name, GBC.eop().fill(GBC.HORIZONTAL));
 
         registerValidableComponent(tmsUrl);
@@ -81,4 +83,6 @@
         ImageryInfo ret = new ImageryInfo(getImageryName(), getTmsUrl());
         ret.setImageryType(ImageryType.TMS);
+        ret.setCustomHttpHeaders(getCommonHeaders());
+        ret.setGeoreferenceValid(getCommonIsValidGeoreference());
         return ret;