diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss
index 597766c..0ab7baa 100644
--- a/src/assets/styles/bmc/custom/_buttons.scss
+++ b/src/assets/styles/bmc/custom/_buttons.scss
@@ -73,7 +73,7 @@
   position: absolute;
   right: 0;
   top: 0;
-  //z-index: $zindex-dropdown + 1;
+  z-index: $zindex-dropdown + 1;
 }
 
 // Contain input buttons within input
diff --git a/src/assets/styles/bmc/custom/_dropdown.scss b/src/assets/styles/bmc/custom/_dropdown.scss
index 56d2ace..82dda86 100644
--- a/src/assets/styles/bmc/custom/_dropdown.scss
+++ b/src/assets/styles/bmc/custom/_dropdown.scss
@@ -1,8 +1,6 @@
-@import 'bootstrap/dist/css/bootstrap.css';
-
 // Make calendar visible over the table
 .dropdown-menu {
-  //z-index: $zindex-dropdown + 1;
+  z-index: $zindex-dropdown + 1;
   padding: 0;
 }
 .dropdown-item {
@@ -30,4 +28,4 @@
       box-shadow: inset 0 0 0 2px theme-color("primary");
     }
   }
-}
\ No newline at end of file
+}
diff --git a/src/assets/styles/bmc/custom/_tables.scss b/src/assets/styles/bmc/custom/_tables.scss
index deeddc3..e8b5a83 100644
--- a/src/assets/styles/bmc/custom/_tables.scss
+++ b/src/assets/styles/bmc/custom/_tables.scss
@@ -1,8 +1,6 @@
-@import 'bootstrap/dist/css/bootstrap.css'
-
 .table {
   position: relative;
-  //z-index: $zindex-dropdown;
+  z-index: $zindex-dropdown;
 
   td {
     border-top: 1px solid gray("300");