diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index dadc9a193..b215df10c 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -11,7 +11,6 @@ $this->load->view(
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=>true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index ce2466906..64ad76c0f 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -11,7 +11,6 @@ $this->load->view(
         'sbadmintemplate3' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis'=> true,
         'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index e9bb71038..71b1ead33 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -11,7 +11,6 @@ $this->load->view(
         'ajaxlib' => true,
         'tabulator5' => true,
         'tabulator5JQuery' => true,
-        'cis' => true,
         'tablewidget' => true,
         'navigationwidget' => true,
         'sbadmintemplate3' => true,
diff --git a/application/views/widgets/table/table.php b/application/views/widgets/table/table.php
index 33a13b1da..713bcd7dc 100644
--- a/application/views/widgets/table/table.php
+++ b/application/views/widgets/table/table.php
@@ -12,9 +12,7 @@
 		<div id="tableDatasetActionsTop"></div>
 
 		<!-- TableWidget table -->
-		<div class="border border-1 mb-4">
-			<?php TableWidget::loadViewDataset(); ?>
-		</div>
+		<?php TableWidget::loadViewDataset(); ?>
 
 		<!-- Table info bottom -->
 		<div id="tableDatasetActionsBottom"></div>
diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js
index 4f107adce..4d9d66574 100644
--- a/public/js/TableWidget.js
+++ b/public/js/TableWidget.js
@@ -799,8 +799,8 @@ function _renderTabulatorHeaderHTML(tableWidgetDiv) {
   var tableUniqueId = tableWidgetDiv.attr("tableUniqueId");
 
   var tabulatorHeaderHTML = "";
-  tabulatorHeaderHTML += `<div class="btn-toolbar ${
-    _bootstrapVersion == 3 ? "pull-right" : "d-flex justify-content-end mb-2"
+  tabulatorHeaderHTML += `<div  ${
+    _bootstrapVersion == 3 ? 'class="btn-toolbar pull-right" style="margin-bottom:0.5rem;"' : 'class="btn-toolbar d-flex justify-content-end mb-2"'
   }" role="toolbar">
 		<div class="btn-group" role="group">
 			<!-- CSV Download button -->
@@ -938,7 +938,7 @@ function _renderTabulatorFooterHTML(tableWidgetFooterOptions) {
     typeof tableWidgetFooterOptions.selectButtons != "undefined" &&
     tableWidgetFooterOptions.selectButtons == true
   ) {
-    tabulatorFooterHTML += `<div class="btn-toolbar" role="toolbar">
+    tabulatorFooterHTML += `<div ${_bootstrapVersion==3?'style="margin-top:1.5rem;" class="btn-toolbar"': 'class="btn-toolbar mt-4"'}  role="toolbar">
 			<div class="btn-group" role="group">
 				<button id="select-all" class="btn ${
           _bootstrapVersion == 3