diff --git a/templates/Individuals/index.php b/templates/Individuals/index.php
index 02908d3..91520e1 100644
--- a/templates/Individuals/index.php
+++ b/templates/Individuals/index.php
@@ -10,7 +10,6 @@ echo $this->element('genericElements/IndexTable/index_table', [
                         'data' => [
                             'type' => 'simple',
                             'text' => __('Add individual'),
-                            'class' => 'btn btn-primary',
                             'popover_url' => '/individuals/add'
                         ]
                     ]
diff --git a/templates/element/genericElements/ListTopBar/element_simple.php b/templates/element/genericElements/ListTopBar/element_simple.php
index 4e2f401..d0bd940 100644
--- a/templates/element/genericElements/ListTopBar/element_simple.php
+++ b/templates/element/genericElements/ListTopBar/element_simple.php
@@ -47,7 +47,7 @@
         }
         $dataFields = implode(' ', $dataFields);
         echo sprintf(
-            '<button class="btn btn-sm %s %s" %s href="%s" %s %s %s %s %s>%s%s%s</button>',
+            '<button class="btn %s %s" %s href="%s" %s %s %s %s %s>%s%s%s</button>',
             empty($data['class']) ? '' : h($data['class']),
             empty($data['isFilter']) ? 'btn-primary' : (empty($data['active']) ? 'btn-light' : 'btn-secondary'),   // Change the default class for highlighted/active toggles here
             empty($data['id']) ? '' : 'id="' . h($data['id']) . '"',
diff --git a/templates/element/genericElements/ListTopBar/group_context_filters.php b/templates/element/genericElements/ListTopBar/group_context_filters.php
index e2b12c8..3966c57 100644
--- a/templates/element/genericElements/ListTopBar/group_context_filters.php
+++ b/templates/element/genericElements/ListTopBar/group_context_filters.php
@@ -37,7 +37,9 @@
     if (isset($data['requirement'])) {
         $dataGroup['requirement'] = $data['requirement'];
     }
+    echo '<div class="d-flex align-items-end topbar-contextual-filter">';
     echo $this->element('/genericElements/ListTopBar/group_simple', [
         'data' => $dataGroup,
         'tableRandomValue' => $tableRandomValue
-    ]);
\ No newline at end of file
+    ]);
+    echo '</div>';
\ No newline at end of file
diff --git a/templates/element/genericElements/ListTopBar/group_simple.php b/templates/element/genericElements/ListTopBar/group_simple.php
index 0f286ab..2c79909 100644
--- a/templates/element/genericElements/ListTopBar/group_simple.php
+++ b/templates/element/genericElements/ListTopBar/group_simple.php
@@ -5,7 +5,7 @@
             $elements .= $this->element('/genericElements/ListTopBar/element_' . (empty($element['type']) ? 'simple' : h($element['type'])), array('data' => $element, 'tableRandomValue' => $tableRandomValue));
         }
         echo sprintf(
-            '<div %s class="btn-group mr-2" role="group" aria-label="button-group">%s</div>',
+            '<div %s class="btn-group btn-group-sm mr-2" role="group" aria-label="button-group">%s</div>',
             (!empty($data['id'])) ? 'id="' . h($data['id']) . '"' : '',
             $elements
         );
diff --git a/webroot/css/main.css b/webroot/css/main.css
index 2edfe70..cec88ae 100644
--- a/webroot/css/main.css
+++ b/webroot/css/main.css
@@ -117,7 +117,6 @@
 
 .btn-group > .btn:last-of-type:not(.dropdown-toggle), .btn-group > .btn-group:not(:last-of-type) > .btn {
     border-top-right-radius: 0.2rem;
-    border-bottom-right-radius: 0.2rem;
 }
 
 input[type="checkbox"].change-cursor {
@@ -126,4 +125,9 @@ input[type="checkbox"].change-cursor {
 
 input[type="checkbox"]:disabled.change-cursor {
     cursor: not-allowed;
+}
+
+.topbar-contextual-filter button.btn {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
 }
\ No newline at end of file