diff --git a/fhem/FHEM/00_ZWDongle.pm b/fhem/FHEM/00_ZWDongle.pm
index 88cb00552..d50c981a9 100755
--- a/fhem/FHEM/00_ZWDongle.pm
+++ b/fhem/FHEM/00_ZWDongle.pm
@@ -151,13 +151,12 @@ ZWDongle_fhemwebFn($$$$)
   my $np = AttrVal($d,'neighborListPos','360,430');
 
   return
-  "<div id='ZWDongleNr'><a href='#'>Show neighbor map</a></div>".
+  "<div id='ZWDongleNr'><a id='zw_snm' href='#'>Show neighbor map</a></div>".
   "<div id='ZWDongleNrSVG'></div>".
   "<script type='text/javascript' src='$js'></script>".
   '<script type="text/javascript">'.<<"JSEND"
     \$(document).ready(function() {
-      \$("div#ZWDongleNr")
-        .css({cursor:"pointer"})
+      \$("div#ZWDongleNr a#zw_snm")
         .click(function(e){
           e.preventDefault();
           zw_nl('ZWDongle_nlData("$d")');
@@ -175,7 +174,9 @@ ZWDongle_nlData($)
   my (@dn, %nb, @ret);
 
   for my $e (@a) {
-    my $nl = ReadingsVal($e, "neighborList", ""); $nl =~ s/,/ /g;
+    next if($defs{$e}{ZWaveSubDevice} ne "no");
+    my $nl = ReadingsVal($e, "neighborList", ""); 
+    $nl =~ s/,/ /g; $nl =~ s/\bempty\b//g;
     my $pos = AttrVal($e, "neighborListPos", "");
     push @dn, $e if($nl =~ m/\b$d\b/);
     $nl = '"'.join('","',split(" ", $nl)).'"' if($nl);
@@ -188,6 +189,7 @@ ZWDongle_nlData($)
   push @ret, "\"$d\":{\"txt\":\"$d\", \"pos\":[$pos],".
                      "\"class\":\"zwDongle\",\"neighbors\":[$nl] }";
   return "{ \"saveFn\":\"attr {1} neighborListPos {2}\",".
+           "\"firstObj\":\"$d\",".
            "\"el\":{".join(",",@ret)."} }";
 }
 
diff --git a/fhem/www/pgm2/zwave_neighborlist.js b/fhem/www/pgm2/zwave_neighborlist.js
index 38c57b483..b371d5385 100644
--- a/fhem/www/pgm2/zwave_neighborlist.js
+++ b/fhem/www/pgm2/zwave_neighborlist.js
@@ -1,6 +1,8 @@
 var zw_visible;
 var svgns = 'xmlns="http://www.w3.org/2000/svg"';
 
+log("HELLO");
+
 function
 zw_nl(fhemFn)
 {
@@ -9,15 +11,20 @@ zw_nl(fhemFn)
   var txt = (zw_visible ? 'Hide' : 'Show');
 
   var width=960,height=480;
-  $('#ZWDongleNr').html('<a href="#">'+txt+' neighbor map</a>');
+  $('#ZWDongleNr a#zw_snm').html(txt+' neighbor map');
 
   if(!zw_visible) {
+    $('#ZWDongleNr span').remove();
     $("#ZWDongleNrSVG")
         .css({width:0, height:0})
         .html('');
     return;
   }
 
+  $('#ZWDongleNr').append('<span>'+
+    '&nbsp;&nbsp;<a id="zw_al" href="#">Start auto layout</a>'+
+    '&nbsp;&nbsp;<a id="zw_save" href="#">Send layout to FHEM</a></span>');
+
   FW_cmd(FW_root+"?cmd={"+fhemFn+"}&XHR=1", function(r){
     var xpos=20, ypos=20, fnRet = JSON.parse(r);
 
@@ -25,6 +32,8 @@ zw_nl(fhemFn)
     for(var elName in fnRet.el) {
       var el = fnRet.el[elName];
       el.lines = [];
+      el.name = elName;
+      el.elHash = fnRet.el;
       el.width = el.height = 30;
       if(!el.pos.length) {
         el.pos = [xpos, ypos];
@@ -32,12 +41,29 @@ zw_nl(fhemFn)
         if(xpos+150 >= width)
           xpos = 20, ypos += 50;
       }
+      el.x = el.pos[0]; el.y = el.pos[1]; 
       cnt++;
     }
     if(height < cnt*35)
       height = cnt*35;
     zw_draw(fnRet, width, height);
+    $('#ZWDongleNr a#zw_al').click(function(){ zw_al(fnRet, width, height); });
+
+    $('#ZWDongleNr a#zw_save').click(function(){
+      if(!fnRet.saveFn)
+        return;
+      for(var eName in fnRet.el) {
+        var el = fnRet.el[eName];
+        if(el.pos[0] != el.x || el.pos[1] != el.y) {
+          log("SavePos:"+eName);
+          el.pos[0] = el.x; el.pos[1] = el.y;
+          var cmd = sprintf(fnRet.saveFn, eName, el.x+","+el.y);
+          FW_cmd(FW_root+"?cmd="+cmd+"&XHR=1");
+        }
+      }
+    });
   });
+
 }
 
 function
@@ -78,32 +104,29 @@ zw_draw(fnRet, width, height)
 
   $("svg g").each(function(){
     var name = $(this).attr("data-name");
-    var w = $(this).find("text")[0].getBBox().width;
+    var text = $(this).find("text");
+    var rect = $(this).find("rect");
+    var w = $(text)[0].getBBox().width;
+    $(rect).attr("width",w+10);
     $(this).find("rect").attr("width",w+10);
     $(this).css({cursor:"pointer", position:"absolute"}); // firefox is relative
     h[name].width = w+10;
+    h[name].rect  = rect;
+    h[name].text  = text;
     zw_adjustLines(h, name);
   })
   .draggable()
-  .bind('mouseup', function(e) {
-    var name = $(e.target).parent().attr("data-name");
-    if(fnRet.saveFn)
-      FW_cmd(FW_root+"?cmd="+sprintf(fnRet.saveFn, name, 
-                                h[name].pos[0]+","+h[name].pos[1])+"&XHR=1");
-  })
   .bind('mousedown', function(e) {
     o = h[$(e.target).parent().attr("data-name")];
-    ox = o.pos[0]; oy = o.pos[1];
+    ox = o.x; oy = o.y;
   })
   .bind('drag', function(e, ui) {
-    var rect = $(e.target).find("rect"),
-        text = $(e.target).find("text"),
-        p = ui.position; op = ui.originalPosition;
-    o.pos[0] = ox + (p.left-op.left);
-    o.pos[1] = oy + (p.top -op.top);
-    $(rect).attr("x", o.pos[0]); $(rect).attr("y", o.pos[1]);
-    $(text).attr("x", o.pos[0]+5); $(text).attr("y", o.pos[1]+20);
-    zw_adjustLines(h, o.txt);
+    var p = ui.position; op = ui.originalPosition;
+    o.x = ox + (p.left-op.left);
+    o.y = oy + (p.top -op.top);
+    $(o.rect).attr("x", o.x);   $(o.rect).attr("y", o.y);
+    $(o.text).attr("x", o.x+5); $(o.text).attr("y", o.y+20);
+    zw_adjustLines(h, o.name);
   });
 }
 
@@ -111,16 +134,16 @@ function
 zw_drawbox(o)
 {
   var s = '<g data-name="'+o.txt+'">'+
-            '<rect x="'+o.pos[0]+'" y="'+o.pos[1]+'" rx="5" ry="5" '+
+            '<rect x="'+o.x+'" y="'+o.y+'" rx="5" ry="5" '+
               'width="'+o.width+'" height="'+o.height+'" class="'+o.class+'"/>';
-  s += '<text x="'+(o.pos[0]+5)+'" y="'+(o.pos[1]+20)+'">'+o.txt+'</text></g>';
+  s += '<text x="'+(o.x+5)+'" y="'+(o.y+20)+'">'+o.txt+'</text></g>';
   return s;
 }
 
 function
 zw_calcPos(o, n)
 {
-  return { x: o.pos[0]+o.width/2, y: o.pos[1]+o.height/2 };
+  return { x: o.x+o.width/2, y: o.y+o.height/2 };
 }
 
 function
@@ -156,7 +179,7 @@ function
 zw_adjustLines(h, name)
 {
   var la = h[name].lines;
-  for(var i1=0; i1< la.length; i1++) {
+  for(var i1=0; i1<la.length; i1++) {
     var se = la[i1].split('-');
     if(la[i1].indexOf(name) == 0) {     // we are the from line
       var p = zw_calcPos(h[se[0]], h[se[1]]);
@@ -188,6 +211,58 @@ sprintf() {
   return formatted;
 };
 
+var gm;
+function
+zw_al(fnRet, width, height)
+{
+  function
+  stop()
+  {
+    $("a#zw_al").html("Start auto layout");
+    clearTimeout(gm.gm_timeout);
+    gm = undefined;
+  }
+
+  if(gm) {
+    stop();
+    return;
+  }
+
+  $("a#zw_al").html("Stop auto layout");
+
+  var lu = [ fnRet.el[fnRet.firstObj] ], idx=0;
+  fnRet.el[fnRet.firstObj].idx = idx++;
+  for(var el in fnRet.el)
+    if(el != fnRet.firstObj) {
+      fnRet.el[el].idx = idx++;
+      lu.push(fnRet.el[el]);
+    }
+
+  var nEl=lu.length, dist=new Array(nEl);
+  for(var i1=0; i1<nEl; i1++) {
+    dist[i1] = new Array(nEl);
+    var dp = dist[i1];
+    for(var i2=0; i2<nEl; i2++)
+      dp[i2] = 1;
+    dp[i1] = -1;
+  }
+
+  for(var i1=0; i1<nEl; i1++) {
+    var nl = lu[i1].neighbors;
+    for(var i2=0; i2<nl.length; i2++) {
+      var i3 = fnRet.el[nl[i2]].idx;
+      dist[i1][i3] = dist[i3][i1] = 0.1
+    }
+  }
+
+  gm = new GM();
+  gm.aid = dist;
+  gm.lu= lu;
+  gm.minX = 0; gm.maxX = width;
+  gm.minY = 0; gm.maxY = height;
+  gm.init();
+  gm.finishFn = stop;
+}
 
 /*!
  * jQuery UI Touch Punch 0.2.3
@@ -369,3 +444,279 @@ sprintf() {
   };
 
 })(jQuery);
+
+function
+GM()
+{
+  this.aid=null;
+
+  this.scaleFactor      =1.4;   // scaling in respect to calculated window space
+  this.scaleByCenterDist=-1;    // scaling in respect to mean target center distance (mean aid[i][0])
+
+  this.frameDelayInitial=250;   // initial value of increasing delay at each timestep
+  this.slowdownCycle    =30;    // number of timesteps after that delay is increased
+  this.inertia          =0.7;   // part of velocity kept in one timestep 
+  this.damperInitial    =4;     // initial value of increasing damper that cool down motion with time
+  this.damperFactor     =1.052; // factor the damper is increased by in one timestep
+  this.damperMax        =60;    // max. value of damper
+  this.springForce0     =2.500; // force between each item and the central item s0 trying to keep them at aid[][]-distance
+  this.springForce      =0.015; // force between each item pair except the central item s0
+  this.centeringForce   =0.1;   // force that pulls the center of gravity towards the central item 
+
+  // overlap avoiding
+  this.repelInitial     = 0.1
+  this.repelDelay       = 0;   // nr. of timesteps without repulsion
+  this.repelIncrease    =0.02; // amount the repelling force that keeps items non overlapping increases each timestep
+  this.repelMax         =0.9;  // max amount of repelling force. 
+  this.paddingFactor    =2.00; // factor by which an item is enlarged while avoiding overlap
+
+  var nrItems;
+  var maxX, maxY, minX, minY; // bounds of drawing area
+  var scaleX,scaleY;
+  var cogX, cogY;
+  var cycle=0;
+  var damper;
+  var repel = this.repelInitial;
+
+  this.getMeanItemSize=function()
+  {
+    var meanW=0, meanH=0;
+   
+    for (i=1;i<nrItems;i++) {
+      meanW+=items[i].width;
+      meanH+=items[i].height;
+    } 
+    meanW/=nrItems;
+    meanH/=nrItems;
+    
+    return {width: meanW, height: meanH};
+  }
+
+
+  this.updateScale=function()
+  {
+    var scale = this.scaleFactor*
+                  (1+this.scaleByCenterDist*this.meanTargetCenterDistance());
+    var meanSize =this.getMeanItemSize();
+   
+    scaleX=(maxX-minX-meanSize.width )*scale;
+    scaleY=(maxY-minY-meanSize.height)*scale;
+  }
+
+  this.resetItemPositions=function()
+  {
+    items=this.lu;
+    for(var i1=0; i1<nrItems; i1++) {
+      var el = this.lu[i1];
+      el.speedX = el.speedY = 0;
+      el.width =el.width;
+      el.height=el.height;
+      el.inertia=0.7;
+      var maxDist = Math.sqrt(Math.pow(gm.maxX-gm.maxX/2,2) + 
+                              Math.pow(gm.maxY-gm.maxY/2,2));
+      el.update=function(damper)
+      {
+        $(this.rect).attr("x", this.x);   $(this.rect).attr("y", this.y);
+        $(this.text).attr("x", this.x+5); $(this.text).attr("y", this.y+20);
+        zw_adjustLines(this.elHash, this.name);
+       
+        this.x+=this.speedX/damper;
+        this.y+=this.speedY/damper;  
+       
+        this.speedX*=this.inertia;
+        this.speedY*=this.inertia;
+      }
+    }
+   
+    this.updateScale();
+   
+    cogX=items[0].x;
+    cogY=items[0].y;
+    cycle=0;
+    this.gm_frameDelay=this.frameDelayInitial;
+    damper=this.damperInitial;
+    repel=this.repelInitial;
+  }
+
+  this.recenterItems=function()
+  {
+    var forceX=(items[0].x-cogX)*this.centeringForce;
+    var forceY=(items[0].y-cogY)*this.centeringForce;
+    for (var i=1; i<nrItems; i++)
+    {
+     items[i].x+=forceX;
+     items[i].y+=forceY;
+    }
+  }
+
+  this.updateItems=function()
+  {
+    cogX=0; cogY=0;
+    for (var i=0; i<nrItems; i++) {
+      var w=items[i].width /2;
+      var h=items[i].height/2;
+      if (items[i].x+w>maxX) items[i].x=maxX-w;
+      if (items[i].x-w<minX) items[i].x=minX+w;
+      if (items[i].y+h>maxY) items[i].y=maxY-h;
+      if (items[i].y-h<minY) items[i].y=minY+h;
+     
+      cogX+=items[i].x;
+      cogY+=items[i].y;
+     
+      items[i].update(damper);
+    }
+    cogX/=nrItems; 
+    cogY/=nrItems;
+  }
+
+  function
+  positiveMin(values)
+  {
+    var r=Number.MAX_VALUE;
+    for (var i=0; i<values.length; i++)
+     if (values[i]>=0 && values[i]<r) r=values[i];
+   
+    return r;
+  }
+
+  this.layoutItems=function()
+  {
+    for(i1=0; i1<nrItems; i1++) {
+      for(i2=i1+1; i2<nrItems; i2++) {
+        this.adjustItemDistance(items[i1], items[i2]);
+        this.repelItems        (items[i1], items[i2]);
+       }
+    }
+  }
+
+  this.adjustItemDistance=function(item1, item2)
+  {
+    var targetDistance=this.aid[item1.idx][item2.idx];
+    if(targetDistance<=0) return;
+   
+    var dx=item1.x-item2.x;
+    var dy=item1.y-item2.y;
+   
+    var forceFactor = (item1.idx==0) ? this.springForce0 : this.springForce;
+   
+    var wdx=dx/scaleX;
+    var wdy=dy/scaleY;
+    var distanceInWindowSpace=Math.sqrt(wdx*wdx+wdy*wdy);
+    var force=(targetDistance-distanceInWindowSpace)*forceFactor;
+   
+    if(item1.idx != 0) {
+      item1.speedX+=dx/distanceInWindowSpace*force;
+      item1.speedY+=dy/distanceInWindowSpace*force;
+    }
+   
+    item2.speedX-=dx/distanceInWindowSpace*force;
+    item2.speedY-=dy/distanceInWindowSpace*force;
+
+  }
+
+  this.repelItems=function(item1, item2)
+  {
+    var dx=item1.x-item2.x;
+    var dy=item1.y-item2.y;
+   
+    var pf = (item1.idx == 0 ? this.paddingFactor : this.paddingFactor/2);
+   
+    var extentsSumX=(item1.width +item2.width)*pf;
+    var extentsSumY=(item1.height+item2.height)*pf;
+   
+    var oLeft  =-dx+extentsSumX;
+    var oRight = dx+extentsSumX;
+    var oTop   =-dy+extentsSumY;
+    var oBottom= dy+extentsSumY;
+   
+    var no_overlap = oLeft<0 || oRight<0 || oTop<0 || oBottom<0;
+    if (repel>0 && !no_overlap) {
+      var oMin=positiveMin(Array(oLeft, oRight, oTop, oBottom));
+      var distance=Math.sqrt(dx*dx+dy*dy);
+      var repelScaler=repel*oMin/distance;
+      if(item1.idx != 0) {
+        item1.x+=dx*repelScaler;
+        item1.y+=dy*repelScaler;
+      }
+      item2.x-=dx*repelScaler;
+      item2.y-=dy*repelScaler;
+    }
+  }
+
+  this.layoutStep = function ()
+  {
+    log("LS:"+cycle);
+    var thisMap=this;
+    this.layoutItems();
+    this.recenterItems();
+    this.updateItems();
+   
+    if (damper<this.damperMax)    damper=damper*this.damperFactor;
+    if (cycle>this.repelDelay && repel<this.repelMax) repel+=this.repelIncrease;
+    if (cycle>this.slowdownCycle) this.gm_frameDelay++;
+    
+    if(cycle++ == 100) {
+      this.finishFn();
+      return;
+    }
+    
+    this.gm_timeout =
+            setTimeout(function(){thisMap.layoutStep()}, this.gm_frameDelay); 
+  }
+
+  this.meanTargetCenterDistance = function()
+  {
+    var r=0;
+   
+    for(i1=1; i1<nrItems; i1++) r+=this.aid[i1][0];
+    r/=(nrItems-1);
+    
+    return r;
+  }
+
+  function
+  search(needle, haystack)
+  {
+    var low=0;
+    var high=haystack.length-1;
+   
+    while (low<=high)
+    {
+     var mid   = parseInt((low+high)/2);
+     var value = haystack[mid];
+   
+     if      (value>needle) high=mid-1;
+     else if (value<needle) low =mid+1;
+     else    return mid;
+    }
+   
+    return -1;
+  }
+
+  this.equalizeAid=function()
+  {
+    var values=new Array();
+   
+    for (var i=0; i<nrItems; i++)
+     for (var j=0; j<nrItems; j++)
+      if (this.aid[i][j]>0) values.push(this.aid[i][j]);
+   
+    values.sort();
+   
+    for (var i=0; i<nrItems; i++)
+     for (var j=0; j<nrItems; j++)
+      if (this.aid[i][j]>0)
+         this.aid[i][j]= 1-(search(this.aid[i][j], values)/values.length);
+  }
+
+  this.init=function ()
+  {
+    nrItems=this.aid[0].length;
+    maxX=this.maxX; maxY=this.maxY;
+    minX=this.minX; minY=this.minY;
+   
+    this.equalizeAid();
+    this.resetItemPositions();
+    this.gm_timeout = setTimeout(function(){gm.layoutStep()},10);
+  }
+}