diff --git a/admin_templates.php b/admin_templates.php
index cade687e..5d82ee96 100644
--- a/admin_templates.php
+++ b/admin_templates.php
@@ -27,7 +27,6 @@ const AREA = 'admin';
 require __DIR__ . '/lib/init.php';
 
 use Froxlor\Database\Database;
-use Froxlor\FileDir;
 use Froxlor\FroxlorLogger;
 use Froxlor\Language;
 use Froxlor\PhpHelper;
@@ -63,6 +62,8 @@ $file_templates = [
 	'index_html'
 ];
 
+$languages = Language::getLanguages();
+
 if ($action == '') {
 	// email templates
 	$log->logAction(FroxlorLogger::ADM_ACTION, LOG_NOTICE, "viewed admin_templates");
@@ -165,6 +166,13 @@ if ($action == '') {
 		'pagination' => []
 	];
 
+	if ($mail_actions_links === false) {
+		$mail_actions_links = [];
+	}
+	if ($file_actions_links === false) {
+		$file_actions_links = [];
+	}
+
 	UI::view('user/table-tpl.html.twig', [
 		'maillisting' => Listing::formatFromArray($collection_mail, $mailtpl_list_data['mailtpl_list']),
 		'filelisting' => Listing::formatFromArray($collection_file, $filetpl_list_data['filetpl_list']),
diff --git a/lib/Froxlor/UI/Listing.php b/lib/Froxlor/UI/Listing.php
index 8a125eeb..5f463560 100644
--- a/lib/Froxlor/UI/Listing.php
+++ b/lib/Froxlor/UI/Listing.php
@@ -55,6 +55,24 @@ class Listing
 		];
 	}
 
+	public static function formatFromArray(array $collection, array $tabellisting): array
+	{
+		return [
+			'title' => $tabellisting['title'],
+			'icon' => $tabellisting['icon'],
+			'description' => $tabellisting['description'] ?? null,
+			'icon' => $tabellisting['icon'] ?? null,
+			'table' => [
+				'th' => self::generateTableHeadings($tabellisting),
+				'tr' => self::generateTableRows($collection['data'], $tabellisting),
+			],
+			'pagination' => $collection['pagination'],
+			'empty_msg' => $tabellisting['empty_msg'] ?? null,
+			'self_overview' => $tabellisting['self_overview'] ?? [],
+			'available_columns' => self::getAvailableColumnsForListing($tabellisting)
+		];
+	}
+
 	private static function generateTableHeadings(array $tabellisting): array
 	{
 		$heading = [];
@@ -213,20 +231,6 @@ class Listing
 		return $result;
 	}
 
-	public static function formatFromArray(array $collection, array $tabellisting): array
-	{
-		return [
-			'title' => $tabellisting['title'],
-			'icon' => $tabellisting['icon'],
-			'table' => [
-				'th' => self::generateTableHeadings($tabellisting),
-				'tr' => self::generateTableRows($collection['data'], $tabellisting),
-			],
-			'pagination' => $collection['pagination'],
-			'empty_msg' => $tabellisting['empty_msg'] ?? null
-		];
-	}
-
 	/**
 	 * store column listing selection of user to database
 	 * the selection array should look like this:
diff --git a/lib/tablelisting/admin/tablelisting.integrity.php b/lib/tablelisting/admin/tablelisting.integrity.php
index f45f6207..cda1c4bc 100644
--- a/lib/tablelisting/admin/tablelisting.integrity.php
+++ b/lib/tablelisting/admin/tablelisting.integrity.php
@@ -33,7 +33,7 @@ return [
 		'icon' => 'fa-solid fa-circle-check',
 		'columns' => [
 			'displayid' => [
-				'label' => lng('admin.integrityid'),
+				'label' => 'ID',
 				'field' => 'displayid'
 			],
 			'checkdesc' => [
diff --git a/lng/de.lng.php b/lng/de.lng.php
index 46074813..60c3f736 100644
--- a/lng/de.lng.php
+++ b/lng/de.lng.php
@@ -380,7 +380,6 @@ return [
 		],
 		'cronsettings' => 'Cronjob-Einstellungen',
 		'integritycheck' => 'Datenbankprüfung',
-		'integrityid' => '#',
 		'integrityname' => 'Name',
 		'integrityresult' => 'Ergebnis',
 		'integrityfix' => 'Probleme automatisch beheben',
diff --git a/lng/en.lng.php b/lng/en.lng.php
index 25e79e30..3eaba955 100644
--- a/lng/en.lng.php
+++ b/lng/en.lng.php
@@ -384,7 +384,6 @@ return [
 		],
 		'cronsettings' => 'Cronjob settings',
 		'integritycheck' => 'Database validation',
-		'integrityid' => '#',
 		'integrityname' => 'Name',
 		'integrityresult' => 'Result',
 		'integrityfix' => 'Fix problems automatically',