diff --git a/src/plugins/condition/components/conditionals.scss b/src/plugins/condition/components/conditionals.scss
index bd1195ff97..767ec582fb 100644
--- a/src/plugins/condition/components/conditionals.scss
+++ b/src/plugins/condition/components/conditionals.scss
@@ -50,6 +50,7 @@
 .c-cs {
     display: flex;
     flex-direction: column;
+    flex: 1 1 auto;
     height: 100%;
     overflow: hidden;
 
diff --git a/src/plugins/folderView/components/grid-view.scss b/src/plugins/folderView/components/grid-view.scss
index 00c97ecdc4..96f1d70225 100644
--- a/src/plugins/folderView/components/grid-view.scss
+++ b/src/plugins/folderView/components/grid-view.scss
@@ -11,6 +11,8 @@
 
     body.desktop & {
         flex-flow: row wrap;
+        align-content: flex-start;
+
         &__item {
             height: $gridItemDesk;
             width: $gridItemDesk;
diff --git a/src/plugins/imagery/components/imagery-view-layout.scss b/src/plugins/imagery/components/imagery-view-layout.scss
index 9db2350f56..2482dfb22f 100644
--- a/src/plugins/imagery/components/imagery-view-layout.scss
+++ b/src/plugins/imagery/components/imagery-view-layout.scss
@@ -1,8 +1,8 @@
 .c-imagery {
     display: flex;
     flex-direction: column;
+    flex: 1 1 auto;
     overflow: hidden;
-    height: 100%;
 
     &:focus {
         outline: none;
@@ -19,14 +19,10 @@
     }
 
     &__main-image {
-        &__bg,
-        &__image {
-            height: 100%;
-        }
-
         &__bg {
             background-color: $colorPlotBg;
             border: 1px solid transparent;
+            flex: 1 1 auto;
 
             &.unnsynced{
                 @include sUnsynced();
@@ -34,6 +30,7 @@
         }
 
         &__image {
+            @include abs(); // Safari fix
             background-position: center;
             background-repeat: no-repeat;
             background-size: contain;
diff --git a/src/styles/notebook.scss b/src/styles/notebook.scss
index f72f622ef7..996b7403a8 100644
--- a/src/styles/notebook.scss
+++ b/src/styles/notebook.scss
@@ -25,6 +25,7 @@
     $headerFontSize: 1.3em;
     display: flex;
     flex-direction: column;
+    flex: 1 1 auto;
     overflow: hidden;
     height: 100%;
 
diff --git a/src/ui/components/object-frame.scss b/src/ui/components/object-frame.scss
index 46af29f8c6..13a7c42ce4 100644
--- a/src/ui/components/object-frame.scss
+++ b/src/ui/components/object-frame.scss
@@ -71,8 +71,8 @@
     }
 
     &__object-view {
+        display: flex;
         flex: 1 1 auto;
-        height: 0; // Chrome 73 overflow bug fix
         overflow: auto;
 
         .u-fills-container {
@@ -84,6 +84,6 @@
 
 .l-angular-ov-wrapper {
     // This element is the recipient for object styling; cannot be display: contents
-    height: 100%;
+    flex: 1 1 auto;
     overflow: hidden;
 }
diff --git a/src/ui/layout/layout.scss b/src/ui/layout/layout.scss
index 7a324f6e8b..5ab9a4321a 100644
--- a/src/ui/layout/layout.scss
+++ b/src/ui/layout/layout.scss
@@ -228,8 +228,9 @@
     /******************************* MAIN AREA */
     &__main-container {
         // Wrapper for main views
+        display: flex;
         flex: 1 1 auto !important;
-        height: 0; // Chrome 73 overflow bug fix
+        height: 100%; // Chrome 73 overflow bug fix
         overflow: auto;
     }
 
@@ -338,7 +339,6 @@
 
     &__start {
         flex: 1 1 auto;
-        //margin-right: $interiorMargin;
         min-width: 0; // Forces interior to compress when pushed on
 
         [class*='button'] {
@@ -357,11 +357,6 @@
 
     &__nav-to-parent-button {
         // This is an icon-button
-        //$p: $interiorMargin;
-        //margin-right: $interiorMargin;
-        //padding-left: $p;
-        //padding-right: $p;
-
         .is-editing & {
             display: none;
         }