diff --git a/headless-services/sprotty-si-view/client/css/eclipse-page.css b/headless-services/sprotty-si-view/client/css/eclipse-page.css
index e57c4103a..b780cef3a 100644
--- a/headless-services/sprotty-si-view/client/css/eclipse-page.css
+++ b/headless-services/sprotty-si-view/client/css/eclipse-page.css
@@ -1,4 +1,13 @@
 svg {
     width: 100%;
-    height: 100vh;
+    height: 100%;
+}
+
+body {
+    height: 100vh;
+    overflow: hidden;
+}
+
+.sprotty {
+    height: 100%;
 }
diff --git a/headless-services/sprotty-si-view/client/eclipse.html b/headless-services/sprotty-si-view/client/eclipse.html
index 6a3391d90..a1fae1223 100644
--- a/headless-services/sprotty-si-view/client/eclipse.html
+++ b/headless-services/sprotty-si-view/client/eclipse.html
@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>Spring Integration Graph</title>
-    <link rel="stylesheet" href="css/page.css">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/dom4/3.0.0/dom4.js">
     <link rel="stylesheet" href="css/eclipse-page.css">
 </head>
diff --git a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java
index 6fbadcb2c..7e1bfb3df 100644
--- a/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java
+++ b/headless-services/sprotty-si-view/src/main/java/org/springframework/ide/si/view/SprottySiViewApplication.java
@@ -2,6 +2,7 @@ package org.springframework.ide.si.view;
 
 import org.eclipse.elk.alg.layered.options.FixedAlignment;
 import org.eclipse.elk.alg.layered.options.LayeredOptions;
+import org.eclipse.elk.core.options.EdgeRouting;
 import org.eclipse.elk.core.options.PortConstraints;
 import org.eclipse.elk.core.options.PortSide;
 import org.eclipse.elk.graph.properties.IPropertyHolder;
@@ -27,6 +28,7 @@ public class SprottySiViewApplication {
 		holder.setProperty(LayeredOptions.SPACING_COMPONENT_COMPONENT, 60.0);
 		holder.setProperty(LayeredOptions.SPACING_NODE_NODE_BETWEEN_LAYERS, 60.0);
 		holder.setProperty(LayeredOptions.NODE_PLACEMENT_BK_FIXED_ALIGNMENT, FixedAlignment.BALANCED);
+		holder.setProperty(LayeredOptions.EDGE_ROUTING, EdgeRouting.POLYLINE);
 
 		holder = configurator.configureByType("output-port");
 		holder.setProperty(LayeredOptions.PORT_SIDE, PortSide.EAST);