diff --git a/resources/assets/stylesheets/scss/courseware/blockadder.scss b/resources/assets/stylesheets/scss/courseware/blockadder.scss
index ad8424b9071e55836c2fb8d81352abfe64793e29..3006ae7f57f74012db101e429c76325351ff16bf 100644
--- a/resources/assets/stylesheets/scss/courseware/blockadder.scss
+++ b/resources/assets/stylesheets/scss/courseware/blockadder.scss
@@ -193,6 +193,7 @@
 
 .cw-containeradder-item-wrapper {
     border: solid thin var(--content-color-40);
+    margin-bottom: 5px;
     .cw-sortable-handle {
         opacity: 0;
     }
@@ -206,7 +207,7 @@
     }
 
     .cw-containeradder-item {
-        margin-bottom: 4px;
+        min-height: 5em;
         padding: 1em 1em 1em 6em;
         @include background-icon(unit-test, clickable, 48);
         background-position: 16px center;
diff --git a/resources/assets/stylesheets/scss/courseware/containers/tabs.scss b/resources/assets/stylesheets/scss/courseware/containers/tabs.scss
index bb3760580e60c6c2c2aff2bf8ac2d9e44c246ea7..0485266d88cfadbdb5df3b41ce5e1694550506d5 100644
--- a/resources/assets/stylesheets/scss/courseware/containers/tabs.scss
+++ b/resources/assets/stylesheets/scss/courseware/containers/tabs.scss
@@ -14,10 +14,15 @@
         .cw-container-tabs-block-list:empty {
             height: 4em;
             border: dashed 2px var(--content-color-40);
+            margin: 5px;
         }
 
         .cw-tabs-content {
             padding: 8px 0 0 0;
+
+            .cw-companion-box {
+                border: none;
+            }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss b/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
index 16e4195763a4fbbe9b481f7489c923cf50febc6d..1e71346fb83c4256a398ed56548ade8fd30ca503 100644
--- a/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
+++ b/resources/assets/stylesheets/scss/courseware/layouts/collapsible.scss
@@ -28,8 +28,12 @@
         }
     }
 
-    .cw-collapsible-content .cw-collapsible-content-open {
+    .cw-collapsible-content.cw-collapsible-content-open {
         padding: 10px;
+
+        .cw-companion-box {
+            border: none;
+        }
     }
 }