diff --git a/CHANGES.md b/CHANGES.md
index 2bbdd3f504bcee6aa229bc3d629523add956e0e4..d4eca93ba5794d2764a5a64d429da384e393c6d0 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Changes
 
 ### Unreleased
 
+* 2018-07-02 - Fix some visual flaws and changes which came with BS 4 stable.
 * 2018-05-29 - Check compatibility for Moodle 3.5, no functionality change.
 
 ### v3.4-r2
diff --git a/block_course_overview_campus.php b/block_course_overview_campus.php
index 0ce49a1fd9e8b43b10ea56a85b26893b6b687c54..78c82a0b3b6ab84b9e2cb27a5ab8dfb94dfe8556 100644
--- a/block_course_overview_campus.php
+++ b/block_course_overview_campus.php
@@ -859,7 +859,7 @@ class block_course_overview_campus extends block_base {
 
                 // Show term filter.
                 if ($coc_config->termcoursefilter == true) {
-                    echo '<div class="coc-filter '.$filterwidth.' m-b-1">';
+                    echo '<div class="coc-filter '.$filterwidth.' mb-3">';
 
                     // Show filter description.
                     if ($coc_config->termcoursefilterdisplayname != '') {
@@ -930,7 +930,7 @@ class block_course_overview_campus extends block_base {
 
                 // Show top level category filter.
                 if ($coc_config->toplevelcategorycoursefilter == true) {
-                    echo '<div class="coc-filter '.$filterwidth.' m-b-1">';
+                    echo '<div class="coc-filter '.$filterwidth.' mb-3">';
 
                     // Show filter description.
                     if ($coc_config->toplevelcategorycoursefilterdisplayname != '') {
@@ -994,7 +994,7 @@ class block_course_overview_campus extends block_base {
 
                 // Show parent category filter.
                 if ($coc_config->categorycoursefilter == true) {
-                    echo '<div class="coc-filter '.$filterwidth.' m-b-1">';
+                    echo '<div class="coc-filter '.$filterwidth.' mb-3">';
 
                     // Show filter description.
                     if ($coc_config->categorycoursefilterdisplayname != '') {
@@ -1045,7 +1045,7 @@ class block_course_overview_campus extends block_base {
 
                 // Show teacher filter.
                 if ($coc_config->teachercoursefilter == true) {
-                    echo '<div class="coc-filter '.$filterwidth.' m-b-1">';
+                    echo '<div class="coc-filter '.$filterwidth.' mb-3">';
 
                     // Show filter description.
                     if ($coc_config->teachercoursefilterdisplayname != '') {
@@ -1096,7 +1096,7 @@ class block_course_overview_campus extends block_base {
                 echo '</div></div>';
 
                 // Show submit button for Non-JavaScript interaction.
-                echo '<div id="coc-filtersubmit" class="container-fluid m-b-1"><div class="row"><input type="submit" value="'.get_string('submitfilter', 'block_course_overview_campus').'" class="btn btn-primary" /></div></div>';
+                echo '<div id="coc-filtersubmit" class="container-fluid mb-3"><div class="row"><input type="submit" value="'.get_string('submitfilter', 'block_course_overview_campus').'" class="btn btn-primary" /></div></div>';
 
                 // End form.
                 echo '</form>';
@@ -1123,7 +1123,7 @@ class block_course_overview_campus extends block_base {
             /********************************************************************************/
 
             // Start section.
-            echo '<div id="coc-courselist" class="container-fluid m-b-1">';
+            echo '<div id="coc-courselist" class="container-fluid mb-3">';
 
             // Show courses.
             foreach ($courses as $c) {
diff --git a/styles_boost.css b/styles_boost.css
index 0485af099dac74a5577a825f6b79dfb37600d116..cfdb208f4fda4c515cba0b7da2e7c2cb8e125975 100644
--- a/styles_boost.css
+++ b/styles_boost.css
@@ -2,12 +2,19 @@
 
 /* Boost makes h3 headings quite big, this is not desired for this block. */
 .block_course_overview_campus.block .coursebox h3 {
-    font-size: 1.143rem;
+    font-size: 1.0rem;
 }
 
 
 /* Below are styles which are needed because Boost (BS 4) makes things different from Bootstrapbase (BS 2) */
 
+#coc-courselist .row,
+#coc-hiddencoursesmanagement-top .row,
+#coc-hiddencoursesmanagement-bottom .row {
+    display: block; /* Revert the flex model from BS 4 stable for the course list items and controls to circumvent redesign
+                       of this block. This isn't nice but ok for the time being. */
+}
+
 .path-my .block_course_overview_campus .coursebox {
     margin: 0;
 }