diff --git a/cms/static/sass/course-unit-mfe-iframe-bundle.scss b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
index 7a75cc53da..4100310f40 100644
--- a/cms/static/sass/course-unit-mfe-iframe-bundle.scss
+++ b/cms/static/sass/course-unit-mfe-iframe-bundle.scss
@@ -8,7 +8,7 @@
 
 html {
   body {
-    min-width: 800px;
+    min-width: 560px;
     background: transparent;
     &.openassessment_full_height.view-container {
         overflow-y: hidden;
@@ -39,11 +39,19 @@ body,
       padding: ($baseline * 1.2) ($baseline * 1.2) ($baseline / 1.67);
       border-bottom: none;
 
-      .header-details .xblock-display-name {
-        font-size: 22px;
-        line-height: 28px;
-        font-weight: 700;
-        color: $black;
+      .header-details {
+        .xblock-display-title {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
+        .xblock-display-name {
+          font-size: 22px;
+          line-height: 28px;
+          font-weight: 700;
+          color: $black;
+        }
       }
     }
 
@@ -345,7 +353,6 @@ body,
     }
 
     .tip.setting-help {
-      color: $border-color;
       font-size: 14px;
       line-height: $base-font-size;
     }
@@ -452,6 +459,11 @@ body,
 
   .modal-lg.modal-window.confirm.openassessment_modal_window {
     height: 635px;
+    max-height: 100vh;
+
+    .edit-xblock-modal .modal-content {
+      max-height: 100%;
+    }
   }
 
   // Additions for the xblock editor on the Library Authoring
@@ -672,11 +684,21 @@ body [class*="view-"] .openassessment_editor_buttons.xblock-actions {
     max-width: 1200px;
   }
 
-  .modal-lg.modal-editor .modal-header .editor-modes .action-item {
-    .editor-button,
-    .settings-button {
-      @extend %light-button;
-    }
+  .modal-lg.modal-editor {
+      .modal-header .editor-modes .action-item {
+        .editor-button,
+        .settings-button {
+          @extend %light-button;
+        }
+      }
+
+      .edit-xblock-modal .modal-content {
+        max-height: calc(100vh - 144px);
+
+        .editor-with-buttons.wrapper-comp-settings .list-input.settings-list {
+          max-height: calc(100vh - 205px);
+        }
+      }
   }
 
   .wrapper.wrapper-modal-window .modal-window .modal-actions .action-primary {