diff --git a/css/duplicate-subjects.css b/css/duplicate-subjects.css
index 5839f3a..49801e1 100644
--- a/css/duplicate-subjects.css
+++ b/css/duplicate-subjects.css
@@ -13,16 +13,14 @@
     flex: 1 0 34%;
     margin: 15px 10px;
     border-bottom-left-radius: 0px;
-    border-top-left-radius: 0px;
-    margin-left: -5px;
+    margin-left: -3px;
     border-left: 3.5px solid #4A4A4A;
 }
 
 .buttons.grid .complex-button2Left {
     flex: 1 0 34%;
     margin: 15px 10px;
-    margin-right: -5px;
+    margin-right: -3px;
     border-bottom-right-radius: 0px;
-    border-top-right-radius: 0px;
     border-right: 3.5px solid #4A4A4A;
 }
diff --git a/js/build_page.js b/js/build_page.js
index 6a2ee0a..2c80793 100644
--- a/js/build_page.js
+++ b/js/build_page.js
@@ -125,10 +125,18 @@
         var classeDiv;
         
         // Check if the subject is repeated
-        if (i < classes.length - 1) duplicateSubjectBoolNext = classes[i+1].friendly_name == classe.friendly_name;
-        else duplicateSubjectBoolNext = false;
-        if (i > 0) duplicateSubjectBoolPrev = classes[i-1].friendly_name == classe.friendly_name;
-        else duplicateSubjectBoolPrev = false;
+        if (i < classes.length - 1) {
+            duplicateSubjectBoolNext = classes[i+1].friendly_name == classe.friendly_name;
+        }
+        else { 
+            duplicateSubjectBoolNext = false;
+        }
+        if (i > 0) {
+            duplicateSubjectBoolPrev = classes[i-1].friendly_name == classe.friendly_name;
+        }
+        else {
+            duplicateSubjectBoolPrev = false;
+        }
         
         // Change the previous classeDiv
         if(duplicateSubjectBoolNext && duplicateSubjectCounter%2 == 1) {