Topo2: Fix layout issues

Change-Id: Ief3772b9755216e44d0fe005c625e0090d8fb2b7
diff --git a/web/gui/src/main/webapp/app/view/topo/topoLink.js b/web/gui/src/main/webapp/app/view/topo/topoLink.js
index bfe0df5..ca2982c 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoLink.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoLink.js
@@ -195,9 +195,9 @@
         var offset = 32,
             pos = link.position,
             nearX = src ? pos.x1 : pos.x2,
-            nearY = src ? pos.y1 : pos.y2,
+            nearY = src ? pos.y2 : pos.y1,
             farX = src ? pos.x2 : pos.x1,
-            farY = src ? pos.y2 : pos.y1;
+            farY = src ? pos.y1 : pos.y2;
 
         function dist(x, y) { return Math.sqrt(x*x + y*y); }
 
diff --git a/web/gui/src/main/webapp/app/view/topo/topoModel.js b/web/gui/src/main/webapp/app/view/topo/topoModel.js
index 7679fe1..0b4fd2c 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoModel.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoModel.js
@@ -248,6 +248,7 @@
             //logicError('Node(s) not on map for link:\n' + sMiss + dMiss);
             return null;
         }
+
         return {
             source: srcNode,
             target: dstNode