diff --git a/html/force.css b/html/force.css
index 0a82b3b..88ce4d5 100644
--- a/html/force.css
+++ b/html/force.css
@@ -12,5 +12,7 @@ line.link {
   stroke-opacity: 1;
 }
 
-#chart {
+#chart, #chart svg {
+  display: block;
+  vertical-align: middle;
 }
diff --git a/html/force.js b/html/force.js
index dca2406..de8fb72 100644
--- a/html/force.js
+++ b/html/force.js
@@ -12,7 +12,7 @@ function getOffset( el ) {
 var offset = getOffset(document.getElementById('chart'));
 
 var w = window.innerWidth - offset.left,
-    h = window.innerHeight - offset.top - 24,
+    h = window.innerHeight - offset.top,
     fill = d3.scale.category20();
 
 var vis = d3.select("#chart").append("svg")
diff --git a/html/geomap.html b/html/geomap.html
index 7b54570..7ea2977 100644
--- a/html/geomap.html
+++ b/html/geomap.html
@@ -1,6 +1,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
   <link rel="stylesheet" href="theme/default/style.css" type="text/css" />
+  <link href='style.css' rel='stylesheet' type='text/css' />
 
   <style type="text/css">
     #map {
@@ -109,12 +110,13 @@
 </head>
 
 <body onload="init()">
-  <h1>luebeck.freifunk.net</h1>
-  <ul>
-    <li><a href="nodes.html">Knotengraph</a></li>
-    <li><a href="geomap.html">Knotenkarte</a></li>
-  </ul>
-  <h2>Knotenkarte</h2>
+  <header>
+    <h1>luebeck.freifunk.net</h1>
+    <ul>
+      <li><a href="nodes.html">Knotengraph</a></li>
+      <li><a href="geomap.html">Knotenkarte</a></li>
+    </ul>
+  </header>
 	<div id="map"></div>
 </body>
 </html>
diff --git a/html/nodes.html b/html/nodes.html
index 618dbd3..14f843e 100644
--- a/html/nodes.html
+++ b/html/nodes.html
@@ -3,19 +3,21 @@
   <head>
     <meta http-equiv="content-type" content="text/html;charset=utf-8">
     <title>Freifunk Lübeck - Knotengraph</title>
-  </head>
-  <body>
-    <h1>luebeck.freifunk.net</h1>
-    <ul>
-      <li><a href="nodes.html">Knotengraph</a></li>
-      <li><a href="geomap.html">Knotenkarte</a></li>
-    </ul>
-    <h2>Knotenkarte</h2>
-    <div id="chart"></div>
+    <link href='style.css' rel='stylesheet' type='text/css' />
     <link href='force.css' rel='stylesheet' type='text/css' />
     <script type="text/javascript" src="d3.js"></script>
     <script src='d3.layout.js' type='text/javascript'> </script>
     <script src='d3.geom.js' type='text/javascript'> </script>
-    <script src='force.js' type='text/javascript'> </script>
+  </head>
+  <body>
+    <header>
+      <h1>luebeck.freifunk.net</h1>
+      <ul>
+        <li><a href="nodes.html">Knotengraph</a></li>
+        <li><a href="geomap.html">Knotenkarte</a></li>
+      </ul>
+    </header>
+    <div id="chart"></div>
+    <script src='force.js' type='text/javascript'></script>
   </body>
 </html>
diff --git a/html/style.css b/html/style.css
new file mode 100644
index 0000000..0e91e4d
--- /dev/null
+++ b/html/style.css
@@ -0,0 +1,38 @@
+body {
+  margin: 0;
+  padding: 0;
+  font-family: sans serif;
+}
+
+header h1, ul {
+  margin: 0;
+  padding: 0;
+}
+
+header h1, ul, ul li {
+  display: inline-block;
+  font-size: 10pt;
+}
+
+header h1, ul li a {
+  padding: 0.5em;
+}
+
+header ul {
+  list-style: none;
+  padding: 0;
+}
+
+header {
+  background: #333;
+  color: #fefefe;
+}
+
+header a {
+  text-decoration: none;
+  color: #FFCC01;
+}
+
+header a:hover {
+  background: #C83771;
+}
diff --git a/nodedb.py b/nodedb.py
index 5a55bc1..113b480 100644
--- a/nodedb.py
+++ b/nodedb.py
@@ -194,11 +194,10 @@ class NodeDB:
           linklist.remove(i)
           j = linklist[0]
 
-          for mac in self._nodes[i].macs:
+          for mac in node.macs:
             self._nodes[j].add_mac(mac)
 
-          self._nodes[j].gps = self._nodes[i].gps
+          self._nodes[j].gps = node.gps
 
-          self._nodes[i].gps = None
+          node.gps = None
 
-          self._links.remove(link)
