diff --git a/src/app/core/login/login.scss b/src/app/core/login/login.scss
index 8fe8a57..bef1977 100644
--- a/src/app/core/login/login.scss
+++ b/src/app/core/login/login.scss
@@ -3,7 +3,7 @@
     background-repeat: no-repeat;
     background-size: cover;
     background-position: center;
-    min-height: 100%;
+    min-height: 100vh;
   }
 
   .container-center {
diff --git a/src/app/service-graph/components/fine-grained/fine-grained.component.scss b/src/app/service-graph/components/fine-grained/fine-grained.component.scss
index 425b1bf..56abd53 100644
--- a/src/app/service-graph/components/fine-grained/fine-grained.component.scss
+++ b/src/app/service-graph/components/fine-grained/fine-grained.component.scss
@@ -3,10 +3,11 @@
 
 xos-fine-grained-tenancy-graph {
   display: block;
+  height: 100%;
   // background: $color-accent;
 
   svg {
-    height: 800px;
+    height: 100%;
     width: 100%;
     background-color: $panel-filled-bg;
     border-radius: 3px;
diff --git a/src/app/service-graph/services/graph.store.ts b/src/app/service-graph/services/graph.store.ts
index 0ed0960..1bb5d4c 100644
--- a/src/app/service-graph/services/graph.store.ts
+++ b/src/app/service-graph/services/graph.store.ts
@@ -253,6 +253,11 @@
       const sourceId = this.getSourceId(tenant);
       const targetId = this.getTargetId(tenant);
 
+      if (!angular.isDefined(targetId)) {
+        // if the tenant is not pointing to anything, don't draw links
+        return links;
+      }
+
       const tenantToProvider = {
         id: `${sourceId}_${tenant.d3Id}`,
         source: this.getNodeIndexById(sourceId, nodes),
diff --git a/src/index.scss b/src/index.scss
index 6a1f8e3..bacb45e 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -12,11 +12,13 @@
 
 body {
   min-height: 90%;
+  height: 90%;
 }
 
-ui-view, xos, .wrapper, .content {
+ui-view, xos, .wrapper, .content, .content > .container-fluid, [ui-view] {
   display: block;
   min-height: 100%;
+  height:100%;
 }
 
 .content > div {