diff --git a/application/core/DB_Model.php b/application/core/DB_Model.php
index 4e555be6c..bdd5316e7 100644
--- a/application/core/DB_Model.php
+++ b/application/core/DB_Model.php
@@ -22,11 +22,16 @@ class DB_Model extends CI_Model
 	const PGSQL_BOOLEAN_FALSE = 'f';
 	const PGSQL_BOOLEAN_TYPE = 'bool';
 	const PGSQL_BOOLEAN_ARRAY_TYPE = '_bool';
+	const PGSQL_INT2_TYPE = 'int2';
+	const PGSQL_INT4_TYPE = 'int4';
+	const PGSQL_INT8_TYPE = 'int8';
+	const PGSQL_FLOAT4_TYPE = 'float4';
+	const PGSQL_FLOAT8_TYPE = 'float8';
 
 	protected $dbTable;  	// Name of the DB-Table for CI-Insert, -Update, ...
-	protected $pk;  		// Name of the PrimaryKey for DB-Update, Load, ...
+	protected $pk;  	// Name of the PrimaryKey for DB-Update, Load, ...
 	protected $hasSequence;	// False if this table has a composite primary key that is not using a sequence
-							// True if this table has a primary key that uses a sequence
+				// True if this table has a primary key that uses a sequence
 
 	private $executedQueryMetaData;
 	private $executedQueryListFields;
@@ -271,11 +276,6 @@ class DB_Model extends CI_Model
 	/**
 	 * Load data and convert a record into a list of data from the main table,
 	 * and linked to every element, the data from the side tables
-	 *
-	 * TODO:
-	 * - Adding support for composed primary key
-	 * - Adding support for cascading side tables (useful?)
-	 *
 	 * NOTE: sub queries are not supported in the from clause
 	 *
 	 * @return  array
@@ -598,6 +598,28 @@ class DB_Model extends CI_Model
 		return $val;
 	}
 
+	/**
+	 * Convert PG-Int* to PHP-Integer
+	 */
+	public function pgIntPhp($val)
+	{
+		// If it is null, let it be null
+		if ($val == null) return $val;
+
+		return intval($val);
+	}
+
+	/**
+	 * Convert PG-Float* to PHP-Float
+	 */
+	public function pgFloatPhp($val)
+	{
+		// If it is null, let it be null
+		if ($val == null) return $val;
+
+		return floatval($val);
+	}
+
 	/**
 	 * Converts from PostgreSQL array to php array
 	 * It also takes care about array of booleans
@@ -892,6 +914,11 @@ class DB_Model extends CI_Model
 				// If array type, boolean type OR a UDF
 				if (strpos($eqmd->type, DB_Model::PGSQL_ARRAY_TYPE) !== false
 					|| $eqmd->type == DB_Model::PGSQL_BOOLEAN_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_INT2_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_INT4_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_INT8_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_FLOAT4_TYPE
+					|| $eqmd->type == DB_Model::PGSQL_FLOAT8_TYPE
 					|| $this->udflib->isUDFColumn($eqmd->name, $eqmd->type))
 				{
 					// If UDFs are inside this result set
@@ -941,6 +968,19 @@ class DB_Model extends CI_Model
 						{
 							$resultElement->{$toBeConverted->name} = $this->pgBoolPhp($resultElement->{$toBeConverted->name});
 						}
+						// Integer type
+						elseif ($toBeConverted->type == DB_Model::PGSQL_INT2_TYPE
+							|| $toBeConverted->type == DB_Model::PGSQL_INT4_TYPE
+							|| $toBeConverted->type == DB_Model::PGSQL_INT8_TYPE)
+						{
+							$resultElement->{$toBeConverted->name} = $this->pgIntPhp($resultElement->{$toBeConverted->name});
+						}
+						// Float type
+						elseif ($toBeConverted->type == DB_Model::PGSQL_FLOAT4_TYPE
+							|| $toBeConverted->type == DB_Model::PGSQL_FLOAT8_TYPE)
+						{
+							$resultElement->{$toBeConverted->name} = $this->pgFloatPhp($resultElement->{$toBeConverted->name});
+						}
 					}
 				}
 			}
diff --git a/application/libraries/NavigationLib.php b/application/libraries/NavigationLib.php
index e2492cef4..f8730afad 100644
--- a/application/libraries/NavigationLib.php
+++ b/application/libraries/NavigationLib.php
@@ -37,7 +37,7 @@ class NavigationLib
 		// Loads library ExtensionsLib
 		$this->_ci->load->library('ExtensionsLib');
 
-		$this->_navigationPage = $this->_getNavigationtPage($params); // sets the id for the related navigation widget
+		$this->_navigationPage = $this->_getNavigationPage($params); // sets the id for the related navigation widget
 	}
 
 	//------------------------------------------------------------------------------------------------------------------
@@ -300,7 +300,7 @@ class NavigationLib
 	 * Return an unique string that identify this navigation widget
 	 * NOTE: The default value is the URI where the NavigationWidget is called
 	 */
-	private function _getNavigationtPage($params)
+	private function _getNavigationPage($params)
 	{
 		if ($params != null
 			&& is_array($params)
diff --git a/application/views/codex/oehbeitrag.php b/application/views/codex/oehbeitrag.php
index 8a697129e..feebeddef 100644
--- a/application/views/codex/oehbeitrag.php
+++ b/application/views/codex/oehbeitrag.php
@@ -3,12 +3,12 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'ÖH-Beitragsverwaltung',
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'sbadmintemplate' => true,
-		'tablesorter' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
+		'tablesorter2' => true,
 		'dialoglib' => true,
 		'ajaxlib' => true,
 		'navigationwidget' => true,
diff --git a/application/views/home.php b/application/views/home.php
index 79669dd88..eb7ef0406 100644
--- a/application/views/home.php
+++ b/application/views/home.php
@@ -1,42 +1,36 @@
 <?php
-$this->load->view('templates/FHC-Header',
-	array(
+	$includesArray = array(
 		'title' => 'FH-Complete',
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'sbadmintemplate' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
 		'ajaxlib' => true,
+		'bootstrapper' => true, // to be used only if you know what you are doing!
 		'addons' => true,
 		'navigationwidget' => true
-	)
-);
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<body>
-<div id="wrapper">
-
-	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
-
-	<div id="page-wrapper">
-		<div class="container-fluid">
-			<div class="row">
-				<div class="col-lg-12">
-					<h3 class="page-header">FH-Complete</h3>
+	<div id="wrapper">
+	
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+	
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">FH-Complete</h3>
+					</div>
 				</div>
+				<span>
+					<div id="dashboard"></div>
+			</span>
 			</div>
-			<span>
-				<div id="dashboard"></div>
-		</span>
 		</div>
 	</div>
-</div>
-<script>
-	//javascript hacks for bootstrap
-	$("select").addClass("form-control");
-	$("input[type=text]").addClass("form-control");
-	$("input[type=button]").addClass("btn btn-default");
-	$("#tableDataset").addClass('table-bordered');
-</script>
-</body>
-<?php $this->load->view('templates/FHC-Footer'); ?>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index cd38fd9ac..f522c323f 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -3,10 +3,10 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'phrases' => array(
diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
index 308f702a3..09c299565 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungUebersicht.php
@@ -3,11 +3,11 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'anrechnungenGenehmigen'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'tabulator' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'tabulator4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'tablewidget' => true,
diff --git a/application/views/lehre/anrechnung/createAnrechnung.php b/application/views/lehre/anrechnung/createAnrechnung.php
index 58b0757b9..56f4827cd 100644
--- a/application/views/lehre/anrechnung/createAnrechnung.php
+++ b/application/views/lehre/anrechnung/createAnrechnung.php
@@ -3,13 +3,13 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'neueAnrechnung'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
-		'tabulator' => true,
+		'tabulator4' => true,
 		'tablewidget' => true,
 		'phrases' => array(
 			'global' => array(
diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 978dd5606..59e6c6502 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -5,10 +5,10 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'antragStellen'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'phrases' => array(
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 18c70e5af..147ef9a95 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -3,10 +3,10 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'phrases' => array(
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
index 54d0b49d1..3337c4a83 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungUebersicht.php
@@ -3,11 +3,11 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => $this->p->t('anrechnung', 'anrechnungenPruefen'),
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'tabulator' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'tabulator4' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'tablewidget' => true,
diff --git a/application/views/lehre/lehrauftrag/Dashboard.php b/application/views/lehre/lehrauftrag/Dashboard.php
index a14cefa7a..d89636f04 100644
--- a/application/views/lehre/lehrauftrag/Dashboard.php
+++ b/application/views/lehre/lehrauftrag/Dashboard.php
@@ -3,11 +3,11 @@ $this->load->view(
     'templates/FHC-Header',
     array(
         'title' => 'Lehrauftrag bestellen',
-        'jquery' => true,
-        'jqueryui' => true,
-        'bootstrap' => true,
-        'fontawesome' => true,
-        'sbadmintemplate' => true,
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'bootstrap3' => true,
+        'fontawesome4' => true,
+        'sbadmintemplate3' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
         'navigationwidget' => true,
diff --git a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
index 1ad295392..d64381547 100644
--- a/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
+++ b/application/views/lehre/lehrauftrag/LehrendeUebersicht.php
@@ -3,10 +3,10 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'Lehrauftrag bestellen',
-		'jquery' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'sbadmintemplate' => true,
+		'jquery3' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
 		'ajaxlib' => true,
 		'navigationwidget' => true,
 	)
diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index 521883452..691e576f3 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -3,14 +3,14 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'Lehrauftrag annehmen',
-		'jquery' => true,
-		'jqueryui' => true,
-		'jquerycheckboxes' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'jquerycheckboxes1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'sbadmintemplate' => false,
-		'tabulator' => true,
-		'momentjs' => true,
+		'tabulator4' => true,
+		'momentjs2' => true,
 		'ajaxlib' => true,
 		'dialoglib' => true,
 		'tablewidget' => true,
diff --git a/application/views/lehre/lehrauftrag/approveLehrauftrag.php b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
index 7e0c062bf..fe7022ad6 100644
--- a/application/views/lehre/lehrauftrag/approveLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/approveLehrauftrag.php
@@ -3,14 +3,14 @@ $this->load->view(
     'templates/FHC-Header',
     array(
         'title' => 'Lehrauftrag erteilen',
-        'jquery' => true,
-        'jqueryui' => true,
-        'jquerycheckboxes' => true,
-        'bootstrap' => true,
-        'fontawesome' => true,
-        'sbadmintemplate' => true,
-        'tabulator' => true,
-        'momentjs' => true,
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'jquerycheckboxes1' => true,
+        'bootstrap3' => true,
+        'fontawesome4' => true,
+        'sbadmintemplate3' => true,
+        'tabulator4' => true,
+        'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
         'tablewidget' => true,
diff --git a/application/views/lehre/lehrauftrag/orderLehrauftrag.php b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
index 023df1ac7..3a5e955e2 100644
--- a/application/views/lehre/lehrauftrag/orderLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/orderLehrauftrag.php
@@ -3,14 +3,14 @@ $this->load->view(
     'templates/FHC-Header',
     array(
         'title' => 'Lehrauftrag bestellen',
-        'jquery' => true,
-        'jqueryui' => true,
-        'jquerycheckboxes' => true,
-        'bootstrap' => true,
-        'fontawesome' => true,
-        'sbadmintemplate' => true,
-        'tabulator' => true,
-        'momentjs' => true,
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'jquerycheckboxes1' => true,
+        'bootstrap3' => true,
+        'fontawesome4' => true,
+        'sbadmintemplate3' => true,
+        'tabulator4' => true,
+        'momentjs2' => true,
         'ajaxlib' => true,
         'dialoglib' => true,
         'tablewidget' => true,
diff --git a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
index 893a9c760..321cc7d60 100644
--- a/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
+++ b/application/views/lehre/lvplanung/adminZeitverfuegbarkeit.php
@@ -3,16 +3,16 @@ $this->load->view(
     'templates/FHC-Header',
     array(
         'title' => 'Zeitverfuegbarkeit verwalten',
-        'jquery' => true,
-        'jqueryui' => true,
-        'bootstrap' => true,
-        'fontawesome' => true,
-        'momentjs' => true,
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'bootstrap3' => true,
+        'fontawesome4' => true,
+        'momentjs2' => true,
         'ajaxlib' => true,
-        'tabulator' => true,
+        'tabulator4' => true,
         'tablewidget' => true,
         'navigationwidget' => true,
-        'sbadmintemplate' => true,
+        'sbadmintemplate3' => true,
         'phrases' => array(
             'global' => array(
                 'bis',
diff --git a/application/views/lehre/pruefungsprotokoll.php b/application/views/lehre/pruefungsprotokoll.php
index 6e0404e1e..c6f75bd1c 100644
--- a/application/views/lehre/pruefungsprotokoll.php
+++ b/application/views/lehre/pruefungsprotokoll.php
@@ -3,13 +3,13 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'Pruefungsprotokoll',
-		'jquery' => true,
-		'jqueryui' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
 		'dialoglib' => true,
 		'ajaxlib' => true,
-		'sbadmintemplate' => true,
+		'sbadmintemplate3' => true,
 		'phrases' => array(
 			'abschlusspruefung' => array(
 				'freigegebenAm',
diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
index c7de8fcd0..6c347b3d0 100644
--- a/application/views/lehre/pruefungsprotokollUebersicht.php
+++ b/application/views/lehre/pruefungsprotokollUebersicht.php
@@ -3,12 +3,12 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Prüfungsprotokoll',
-			'jquery' => true,
-			'jqueryui' => true,
-			'jquerycheckboxes' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'tablewidget' => true,
diff --git a/application/views/organisation/reihungstest/reihungstest.php b/application/views/organisation/reihungstest/reihungstest.php
index 2ffbfc38f..357c11c10 100644
--- a/application/views/organisation/reihungstest/reihungstest.php
+++ b/application/views/organisation/reihungstest/reihungstest.php
@@ -3,12 +3,12 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Reihungstest',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/organisation/studienjahrEdit.php b/application/views/organisation/studienjahrEdit.php
index df0397cdf..36f036d7f 100644
--- a/application/views/organisation/studienjahrEdit.php
+++ b/application/views/organisation/studienjahrEdit.php
@@ -1,6 +1,6 @@
 <?php
 $jahr = $studienjahr[0];
-$this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquery' => true));
+$this->load->view('templates/header', array('title' => 'StudienjahrEdit', 'jquery3' => true));
 ?>
 <body>
 <div class="row">
diff --git a/application/views/person/bpk/bpkDetails.php b/application/views/person/bpk/bpkDetails.php
index e771cb7f5..3fdca9f95 100644
--- a/application/views/person/bpk/bpkDetails.php
+++ b/application/views/person/bpk/bpkDetails.php
@@ -3,14 +3,14 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'bPK Details',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'jqueryui' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'jqueryui1' => true,
 			'ajaxlib' => true,
-			'tablesorter' => true,
-			'tinymce' => true,
-			'sbadmintemplate' => true,
+			'tablesorter2' => true,
+			'tinymce4' => true,
+			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
 			'customCSSs' => array(
diff --git a/application/views/person/bpk/bpkwartung.php b/application/views/person/bpk/bpkwartung.php
index 53450a9d8..f6283ee3b 100644
--- a/application/views/person/bpk/bpkwartung.php
+++ b/application/views/person/bpk/bpkwartung.php
@@ -3,12 +3,12 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'bPK Wartung',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/person/gradelist/gradelist.php b/application/views/person/gradelist/gradelist.php
index 9ae485c02..daf66708b 100644
--- a/application/views/person/gradelist/gradelist.php
+++ b/application/views/person/gradelist/gradelist.php
@@ -3,10 +3,10 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Gradelist',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
 			'ajaxlib' => true,
 			'customCSSs' => array(
 				'public/css/tools/gradelist.css',
diff --git a/application/views/system/fas_udf.php b/application/views/system/fas_udf.php
index e6fa396cf..bd314b4a8 100644
--- a/application/views/system/fas_udf.php
+++ b/application/views/system/fas_udf.php
@@ -3,15 +3,15 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'InfocenterDetails',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'jqueryui' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'jqueryui1' => true,
 			'dialoglib' => true,
 			'ajaxlib' => true,
 			'udfs' => true,
 			'widgets' => true,
-			'sbadmintemplate' => true,
+			'sbadmintemplate3' => true,
 			'customCSSs' => array(
 				'public/css/sbadmin2/admintemplate.css'
 			),
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 38e644846..47c154d81 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -1,31 +1,29 @@
 <?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'Info Center',
-			'jquery' => true,
-			'jqueryui' => true,
-			'jquerycheckboxes' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
-			'ajaxlib' => true,
-			'filterwidget' => true,
-			'navigationwidget' => true,
-			'dialoglib' => true,
-			'phrases' => array(
-				'person' => array('vorname', 'nachname'),
-				'global' => array('mailAnXversandt'),
-				'ui' => array('bitteEintragWaehlen')
-			),
-			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
-			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
-		)
+	$includesArray = array(
+		'title' => 'Info Center',
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'jquerycheckboxes1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
+		'tablesorter2' => true,
+		'ajaxlib' => true,
+		'bootstrapper' => true,
+		'filterwidget' => true,
+		'navigationwidget' => true,
+		'dialoglib' => true,
+		'phrases' => array(
+			'person' => array('vorname', 'nachname'),
+			'global' => array('mailAnXversandt'),
+			'ui' => array('bitteEintragWaehlen')
+		),
+		'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css')
 	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -46,6 +44,6 @@
 			</div>
 		</div>
 	</div>
-</body>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/system/infocenter/infocenterAbgewiesen.php b/application/views/system/infocenter/infocenterAbgewiesen.php
index 8e946e573..55987a3bd 100644
--- a/application/views/system/infocenter/infocenterAbgewiesen.php
+++ b/application/views/system/infocenter/infocenterAbgewiesen.php
@@ -3,13 +3,13 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Info Center',
-			'jquery' => true,
-			'jqueryui' => true,
-			'jquerycheckboxes' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 76a371c11..158feeb2c 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -1,232 +1,230 @@
 <?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'InfocenterDetails',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'jqueryui' => true,
-			'dialoglib' => true,
-			'ajaxlib' => true,
-			'tablesorter' => true,
-			'tinymce' => true,
-			'sbadmintemplate' => true,
-			'addons' => true,
-			'navigationwidget' => true,
-			'udfs' => true,
-			'widgets' => true,
-			'customCSSs' => array(
-				'public/css/sbadmin2/admintemplate.css',
-				'public/css/sbadmin2/tablesort_bootstrap.css',
-				'public/css/infocenter/infocenterDetails.css'
+	$includesArray = array(
+		'title' => 'InfocenterDetails',
+		'jquery3' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'jqueryui1' => true,
+		'dialoglib' => true,
+		'ajaxlib' => true,
+		'tablesorter2' => true,
+		'tinymce4' => true,
+		'sbadmintemplate3' => true,
+		'addons' => true,
+		'navigationwidget' => true,
+		'udfs' => true,
+		'widgets' => true,
+		'customCSSs' => array(
+			'public/css/sbadmin2/admintemplate.css',
+			'public/css/sbadmin2/tablesort_bootstrap.css',
+			'public/css/infocenter/infocenterDetails.css'
+		),
+		'customJSs' => array(
+			'public/js/bootstrapper.js',
+			'public/js/tablesort/tablesort.js',
+			'public/js/infocenter/messageList.js',
+			'public/js/infocenter/infocenterDetails.js',
+			'public/js/infocenter/zgvUeberpruefung.js',
+			'public/js/infocenter/docUeberpruefung.js'
+		),
+		'phrases' => array(
+			'infocenter' => array(
+				'notizHinzufuegen',
+				'notizAendern',
+				'bewerberParken',
+				'bewerberAusparken',
+				'nichtsZumAusparken',
+				'fehlerBeimAusparken',
+				'fehlerBeimParken',
+				'bewerberGeparktBis',
+				'bewerberOnHold',
+				'bewerberOnHoldEntfernen',
+				'bewerberOnHoldBis',
+				'nichtsZumEntfernen',
+				'fehlerBeimEntfernen',
+				'rueckstelldatumUeberschritten',
+				'parkenZurueckstellenInfo',
+				'zgvInPruefung',
+				'zgvErfuellt',
+				'zgvNichtErfuellt',
+				'zgvErfuelltPruefung',
+				'datumUngueltig',
+				'nachreichDatumNichtVergangenheit'
 			),
-			'customJSs' => array(
-				'public/js/bootstrapper.js',
-				'public/js/tablesort/tablesort.js',
-				'public/js/infocenter/messageList.js',
-				'public/js/infocenter/infocenterDetails.js',
-				'public/js/infocenter/zgvUeberpruefung.js',
-				'public/js/infocenter/docUeberpruefung.js'
+			'ui' => array(
+				'gespeichert',
+				'fehlerBeimSpeichern'
 			),
-			'phrases' => array(
-				'infocenter' => array(
-					'notizHinzufuegen',
-					'notizAendern',
-					'bewerberParken',
-					'bewerberAusparken',
-					'nichtsZumAusparken',
-					'fehlerBeimAusparken',
-					'fehlerBeimParken',
-					'bewerberGeparktBis',
-					'bewerberOnHold',
-					'bewerberOnHoldEntfernen',
-					'bewerberOnHoldBis',
-					'nichtsZumEntfernen',
-					'fehlerBeimEntfernen',
-					'rueckstelldatumUeberschritten',
-					'parkenZurueckstellenInfo',
-					'zgvInPruefung',
-					'zgvErfuellt',
-					'zgvNichtErfuellt',
-					'zgvErfuelltPruefung',
-					'datumUngueltig',
-					'nachreichDatumNichtVergangenheit'
-				),
-				'ui' => array(
-					'gespeichert',
-					'fehlerBeimSpeichern'
-				),
-				'global' => array(
-					'bis',
-					'zeilen'
-				)
+			'global' => array(
+				'bis',
+				'zeilen'
 			)
 		)
 	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
-<body>
-<div id="wrapper">
-
-	<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
-
-	<div id="page-wrapper">
-		<div class="container-fluid">
-			<input type="hidden" id="hiddenpersonid" value="<?php echo $stammdaten->person_id ?>">
-			<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
-				<div class="col-lg-8">
-					<h3 class="page-header">
-						Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
-					</h3>
-				</div>
-				<div class="col-lg-4">
-					<div class="headerright text-right">
-						<?php
-						if (isset($lockedby)):
-							echo $this->p->t('global', 'wirdBearbeitetVon').': ';
-							echo $lockedby;
-							if ($origin_page == 'index'):
-								$unlockpath = 'unlockPerson/'.$stammdaten->person_id;
-								$unlockpath .= '?fhc_controller_id='.$fhc_controller_id;
-								$unlockpath .= '&filter_id='.$prev_filter_id;
-						?>
-								&nbsp;&nbsp;
-								<a href="<?php echo $unlockpath; ?>">
-									<i class="fa fa-sign-out"></i>&nbsp;<?php echo ucfirst($this->p->t('ui', 'freigeben')) ?>
-								</a>
+	<div id="wrapper">
+	
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+	
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<input type="hidden" id="hiddenpersonid" value="<?php echo $stammdaten->person_id ?>">
+				<div class="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
+					<div class="col-lg-8">
+						<h3 class="page-header">
+							Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
+						</h3>
+					</div>
+					<div class="col-lg-4">
+						<div class="headerright text-right">
+							<?php
+							if (isset($lockedby)):
+								echo $this->p->t('global', 'wirdBearbeitetVon').': ';
+								echo $lockedby;
+								if ($origin_page == 'index'):
+									$unlockpath = 'unlockPerson/'.$stammdaten->person_id;
+									$unlockpath .= '?fhc_controller_id='.$fhc_controller_id;
+									$unlockpath .= '&filter_id='.$prev_filter_id;
+							?>
+									&nbsp;&nbsp;
+									<a href="<?php echo $unlockpath; ?>">
+										<i class="fa fa-sign-out"></i>&nbsp;<?php echo ucfirst($this->p->t('ui', 'freigeben')) ?>
+									</a>
+								<?php endif; ?>
+							<?php else: ?>
+								&nbsp;
 							<?php endif; ?>
-						<?php else: ?>
-							&nbsp;
-						<?php endif; ?>
+						</div>
 					</div>
 				</div>
-			</div>
-			<?php if (!is_null($duplicated)): ?>
-				<div class="row alert-warning">
-					<h3 class="header col-lg-12">
-						<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
-					</h3>
-					<div class="text-left col-lg-12">
-						<?php
-						foreach ($duplicated as $duplicate)
-						{
-							echo  'Person ID: ' . $duplicate->person_id . '<br />';
-						}
-						?>
+				<?php if (!is_null($duplicated)): ?>
+					<div class="row alert-warning">
+						<h3 class="header col-lg-12">
+							<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
+						</h3>
+						<div class="text-left col-lg-12">
+							<?php
+							foreach ($duplicated as $duplicate)
+							{
+								echo  'Person ID: ' . $duplicate->person_id . '<br />';
+							}
+							?>
+						</div>
+	
 					</div>
-
-				</div>
-			<?php endif; ?>
-			<br/>
-			<section>
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-primary">
-							<div class="panel-heading text-center">
-								<h4><?php echo ucfirst($this->p->t('global', 'stammdaten')) ?></h4>
-							</div>
-							<div class="panel-body">
-								<?php $this->load->view('system/infocenter/stammdaten.php'); ?>
-								<?php $this->load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?>
-							</div> <!-- ./panel-body -->
-						</div> <!-- ./panel -->
-					</div> <!-- ./main column -->
-				</div> <!-- ./main row -->
-			</section>
-			<section>
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-primary">
-							<a name="DokPruef"></a><!-- anchor for jumping to the section -->
-							<div class="panel-heading text-center">
-								<h4>
-									<?php echo  ucfirst($this->p->t('infocenter', 'dokumentenpruefung')) ?>
-								</h4>
-							</div>
-							<div class="panel-body">
-								<?php $this->load->view('system/infocenter/dokpruefung.php'); ?>
-								<div id="nachzureichendeDoks">
-									<?php $this->load->view('system/infocenter/dokNachzureichend.php'); ?>
+				<?php endif; ?>
+				<br/>
+				<section>
+					<div class="row">
+						<div class="col-lg-12">
+							<div class="panel panel-primary">
+								<div class="panel-heading text-center">
+									<h4><?php echo ucfirst($this->p->t('global', 'stammdaten')) ?></h4>
 								</div>
-							</div> <!-- ./panel-body -->
-						</div> <!-- ./panel -->
-					</div> <!-- ./column -->
-				</div> <!-- ./row -->
-			</section>
-			<section>
-				<div class="row">
-					<div class="col-md-12">
-						<div class="panel panel-primary">
-							<div class="panel-heading text-center">
-								<a name="ZgvPruef"></a>
-								<h4>
-									<?php echo $this->p->t('infocenter', 'zgv').' - '.ucfirst($this->p->t('lehre', 'pruefung'))?>
-								</h4>
-							</div>
-							<div class="panel-body" id="zgvpruefungen">
-								<?php $this->load->view('system/infocenter/zgvpruefungen.php'); ?><!-- /.panel-group -->
-							</div><!-- /.main panel body -->
-						</div> <!-- /.main panel-->
-					</div> <!-- /.column freigabe-->
-				</div> <!-- /.row freigabe-->
-			</section>
-			<section>
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-primary">
-							<div class="panel-heading text-center">
-								<a name="Nachrichten"></a>
-								<h4 class="text-center">
-									<?php echo ucfirst($this->p->t('global', 'nachrichten')) ?>
-								</h4>
-							</div>
-							<div class="panel-body">
-								<div class="row" id="messagelist">
-									<?php
-									$this->load->view('system/infocenter/messageList.php', $messages);
-									?>
+								<div class="panel-body">
+									<?php $this->load->view('system/infocenter/stammdaten.php'); ?>
+									<?php $this->load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?>
+								</div> <!-- ./panel-body -->
+							</div> <!-- ./panel -->
+						</div> <!-- ./main column -->
+					</div> <!-- ./main row -->
+				</section>
+				<section>
+					<div class="row">
+						<div class="col-lg-12">
+							<div class="panel panel-primary">
+								<a name="DokPruef"></a><!-- anchor for jumping to the section -->
+								<div class="panel-heading text-center">
+									<h4>
+										<?php echo  ucfirst($this->p->t('infocenter', 'dokumentenpruefung')) ?>
+									</h4>
+								</div>
+								<div class="panel-body">
+									<?php $this->load->view('system/infocenter/dokpruefung.php'); ?>
+									<div id="nachzureichendeDoks">
+										<?php $this->load->view('system/infocenter/dokNachzureichend.php'); ?>
+									</div>
+								</div> <!-- ./panel-body -->
+							</div> <!-- ./panel -->
+						</div> <!-- ./column -->
+					</div> <!-- ./row -->
+				</section>
+				<section>
+					<div class="row">
+						<div class="col-md-12">
+							<div class="panel panel-primary">
+								<div class="panel-heading text-center">
+									<a name="ZgvPruef"></a>
+									<h4>
+										<?php echo $this->p->t('infocenter', 'zgv').' - '.ucfirst($this->p->t('lehre', 'pruefung'))?>
+									</h4>
+								</div>
+								<div class="panel-body" id="zgvpruefungen">
+									<?php $this->load->view('system/infocenter/zgvpruefungen.php'); ?><!-- /.panel-group -->
+								</div><!-- /.main panel body -->
+							</div> <!-- /.main panel-->
+						</div> <!-- /.column freigabe-->
+					</div> <!-- /.row freigabe-->
+				</section>
+				<section>
+					<div class="row">
+						<div class="col-lg-12">
+							<div class="panel panel-primary">
+								<div class="panel-heading text-center">
+									<a name="Nachrichten"></a>
+									<h4 class="text-center">
+										<?php echo ucfirst($this->p->t('global', 'nachrichten')) ?>
+									</h4>
+								</div>
+								<div class="panel-body">
+									<div class="row" id="messagelist">
+										<?php
+										$this->load->view('system/infocenter/messageList.php', $messages);
+										?>
+									</div>
 								</div>
 							</div>
 						</div>
 					</div>
-				</div>
-			</section>
-			<section>
-				<div class="row">
-					<div class="col-lg-12">
-						<div class="panel panel-primary">
-							<div class="panel-heading text-center">
-								<a name="NotizAkt"></a>
-								<h4 class="text-center">
-									<?php echo ucfirst($this->p->t('global', 'notizen')).' & '.ucfirst($this->p->t('global', 'aktivitaeten')) ?>
-								</h4>
-							</div>
-							<div class="panel-body">
-								<div class="row">
-									<div class="col-lg-6">
-										<div id="addnotiz">
-											<?php $this->load->view('system/infocenter/addNotiz.php'); ?>
+				</section>
+				<section>
+					<div class="row">
+						<div class="col-lg-12">
+							<div class="panel panel-primary">
+								<div class="panel-heading text-center">
+									<a name="NotizAkt"></a>
+									<h4 class="text-center">
+										<?php echo ucfirst($this->p->t('global', 'notizen')).' & '.ucfirst($this->p->t('global', 'aktivitaeten')) ?>
+									</h4>
+								</div>
+								<div class="panel-body">
+									<div class="row">
+										<div class="col-lg-6">
+											<div id="addnotiz">
+												<?php $this->load->view('system/infocenter/addNotiz.php'); ?>
+											</div>
+											<div id="notizen">
+												<?php $this->load->view('system/infocenter/notizen.php'); ?>
+											</div>
 										</div>
-										<div id="notizen">
-											<?php $this->load->view('system/infocenter/notizen.php'); ?>
-										</div>
-									</div>
-									<div class="col-lg-6">
-										<div id="postponing"></div>
-										<div id="logs">
-										<?php $this->load->view('system/infocenter/logs.php'); ?>
-										</div>
-									</div> <!-- ./column -->
-								</div> <!-- ./row -->
-							</div> <!-- ./panel-body -->
-						</div> <!-- ./panel -->
-					</div> <!-- ./main column -->
-				</div> <!-- ./main row -->
-			</section>
-		</div> <!-- ./container-fluid-->
-	</div> <!-- ./page-wrapper-->
-</div> <!-- ./wrapper -->
-<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
-</body>
+										<div class="col-lg-6">
+											<div id="postponing"></div>
+											<div id="logs">
+											<?php $this->load->view('system/infocenter/logs.php'); ?>
+											</div>
+										</div> <!-- ./column -->
+									</div> <!-- ./row -->
+								</div> <!-- ./panel-body -->
+							</div> <!-- ./panel -->
+						</div> <!-- ./main column -->
+					</div> <!-- ./main row -->
+				</section>
+			</div> <!-- ./container-fluid-->
+		</div> <!-- ./page-wrapper-->
+	</div> <!-- ./wrapper -->
+	<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
index 4855e5cd6..d3e44ea95 100644
--- a/application/views/system/infocenter/infocenterFreigegeben.php
+++ b/application/views/system/infocenter/infocenterFreigegeben.php
@@ -3,13 +3,13 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Info Center',
-			'jquery' => true,
-			'jqueryui' => true,
-			'jquerycheckboxes' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
index f2d838fac..71a7a1d5e 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
@@ -3,13 +3,13 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Info Center',
-			'jquery' => true,
-			'jqueryui' => true,
-			'jquerycheckboxes' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/infocenter/infocenterZgvDetails.php b/application/views/system/infocenter/infocenterZgvDetails.php
index 62fefbec8..8faa5aa63 100644
--- a/application/views/system/infocenter/infocenterZgvDetails.php
+++ b/application/views/system/infocenter/infocenterZgvDetails.php
@@ -3,15 +3,15 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'InfocenterZgvDetails',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'jqueryui' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'jqueryui1' => true,
 			'dialoglib' => true,
 			'ajaxlib' => true,
-			'tablesorter' => true,
-			'tinymce' => true,
-			'sbadmintemplate' => true,
+			'tablesorter2' => true,
+			'tinymce4' => true,
+			'sbadmintemplate3' => true,
 			'addons' => true,
 			'navigationwidget' => true,
 			'udfs' => true,
diff --git a/application/views/system/infocenter/infocenterZgvUeberpruefung.php b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
index e0b8f9eae..7b285edb2 100644
--- a/application/views/system/infocenter/infocenterZgvUeberpruefung.php
+++ b/application/views/system/infocenter/infocenterZgvUeberpruefung.php
@@ -3,13 +3,13 @@ $this->load->view(
     'templates/FHC-Header',
     array(
         'title' => 'Info Center',
-        'jquery' => true,
-        'jqueryui' => true,
-        'jquerycheckboxes' => true,
-        'bootstrap' => true,
-        'fontawesome' => true,
-        'sbadmintemplate' => true,
-        'tablesorter' => true,
+        'jquery3' => true,
+        'jqueryui1' => true,
+        'jquerycheckboxes1' => true,
+        'bootstrap3' => true,
+        'fontawesome4' => true,
+        'sbadmintemplate3' => true,
+        'tablesorter2' => true,
         'ajaxlib' => true,
         'filterwidget' => true,
         'navigationwidget' => true,
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
index 1b699d634..e508bd505 100644
--- a/application/views/system/infocenter/studiengangZgvInfo.php
+++ b/application/views/system/infocenter/studiengangZgvInfo.php
@@ -3,10 +3,10 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'ZGV Info',
-		'jquery' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'sbadmintemplate' => true,
+		'jquery3' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
 		'customCSSs' => 'public/css/sbadmin2/admintemplate_contentonly.css'
 	)
 );
diff --git a/application/views/system/issues/issues.php b/application/views/system/issues/issues.php
index 9812528d5..5e8efd547 100644
--- a/application/views/system/issues/issues.php
+++ b/application/views/system/issues/issues.php
@@ -3,13 +3,13 @@ $this->load->view(
 	'templates/FHC-Header',
 	array(
 		'title' => 'Fehler Monitoring',
-		'jquery' => true,
-		'jqueryui' => true,
-		'jquerycheckboxes' => true,
-		'bootstrap' => true,
-		'fontawesome' => true,
-		'sbadmintemplate' => true,
-		'tablesorter' => true,
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'jquerycheckboxes1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
+		'tablesorter2' => true,
 		'ajaxlib' => true,
 		'filterwidget' => true,
 		'navigationwidget' => true,
diff --git a/application/views/system/jq/jobsQueueViewer.php b/application/views/system/jq/jobsQueueViewer.php
index 6d92d610b..bf4e16645 100644
--- a/application/views/system/jq/jobsQueueViewer.php
+++ b/application/views/system/jq/jobsQueueViewer.php
@@ -3,12 +3,12 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Jobs Queue Viewer',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
diff --git a/application/views/system/login/usernamePassword.php b/application/views/system/login/usernamePassword.php
index 944212b49..ba6062b46 100644
--- a/application/views/system/login/usernamePassword.php
+++ b/application/views/system/login/usernamePassword.php
@@ -3,11 +3,11 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Login',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
 			'customCSSs' => 'public/css/Login.css',
diff --git a/application/views/system/logs/logsViewer.php b/application/views/system/logs/logsViewer.php
index 86423006b..2718480e9 100644
--- a/application/views/system/logs/logsViewer.php
+++ b/application/views/system/logs/logsViewer.php
@@ -1,28 +1,26 @@
 <?php
-	$this->load->view(
-		'templates/FHC-Header',
-		array(
-			'title' => 'Logs Viewer',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'tablesorter' => true,
-			'ajaxlib' => true,
-			'filterwidget' => true,
-			'navigationwidget' => true,
-			'phrases' => array(
-				'global' => array('mailAnXversandt'),
-				'ui' => array('bitteEintragWaehlen')
-			),
-			'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css',
-			'customJSs' => array('public/js/bootstrapper.js')
-		)
+	$includesArray = array(
+		'title' => 'Logs Viewer',
+		'jquery3' => true,
+		'jqueryui1' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'sbadmintemplate3' => true,
+		'tablesorter2' => true,
+		'ajaxlib' => true,
+		'bootstrapper' => true, // to be used only if you know what you are doing!
+		'filterwidget' => true,
+		'navigationwidget' => true,
+		'phrases' => array(
+			'global' => array('mailAnXversandt'),
+			'ui' => array('bitteEintragWaehlen')
+		),
+		'customCSSs' => 'public/css/sbadmin2/tablesort_bootstrap.css'
 	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
 ?>
 
-<body>
 	<div id="wrapper">
 
 		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -42,6 +40,6 @@
 			</div>
 		</div>
 	</div>
-</body>
 
-<?php $this->load->view('templates/FHC-Footer'); ?>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+
diff --git a/application/views/system/messages/ajaxRead.php b/application/views/system/messages/ajaxRead.php
index f7d60a68d..2cb88708e 100644
--- a/application/views/system/messages/ajaxRead.php
+++ b/application/views/system/messages/ajaxRead.php
@@ -3,16 +3,16 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Read personal messages',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
-			'momentjs' => true,
-			'tabulator' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'momentjs2' => true,
+			'tabulator4' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce' => true,
+			'tinymce4' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/read.js')
diff --git a/application/views/system/messages/ajaxWrite.php b/application/views/system/messages/ajaxWrite.php
index de3d79806..3b1582f22 100644
--- a/application/views/system/messages/ajaxWrite.php
+++ b/application/views/system/messages/ajaxWrite.php
@@ -3,14 +3,14 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Write a new message',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce' => true,
+			'tinymce4' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/write.js')
diff --git a/application/views/system/messages/ajaxWriteReply.php b/application/views/system/messages/ajaxWriteReply.php
index 3721565e9..0a496c93e 100644
--- a/application/views/system/messages/ajaxWriteReply.php
+++ b/application/views/system/messages/ajaxWriteReply.php
@@ -3,14 +3,14 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Reply to a message',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'ajaxlib' => true,
 			'dialoglib' => true,
-			'tinymce' => true,
+			'tinymce4' => true,
 			'phrases' => array('global', 'ui'),
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/writeReply.js')
diff --git a/application/views/system/messages/htmlMessageSentError.php b/application/views/system/messages/htmlMessageSentError.php
index 90191fcf0..f8a0f8491 100644
--- a/application/views/system/messages/htmlMessageSentError.php
+++ b/application/views/system/messages/htmlMessageSentError.php
@@ -3,10 +3,10 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Message sent failure - Fehler beim Senden der Nachricht',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
 		)
 	);
diff --git a/application/views/system/messages/htmlMessageSentSuccess.php b/application/views/system/messages/htmlMessageSentSuccess.php
index 48409a5f4..91eeab519 100644
--- a/application/views/system/messages/htmlMessageSentSuccess.php
+++ b/application/views/system/messages/htmlMessageSentSuccess.php
@@ -3,10 +3,10 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Message sent successfully - Nachricht erfolgreich versandt!',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
 		)
 	);
diff --git a/application/views/system/messages/htmlRead.php b/application/views/system/messages/htmlRead.php
index 5413af9f4..35e162b70 100644
--- a/application/views/system/messages/htmlRead.php
+++ b/application/views/system/messages/htmlRead.php
@@ -3,10 +3,10 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Read message - Lies die Nachricht',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css')
 		)
 	);
diff --git a/application/views/system/messages/htmlWriteReply.php b/application/views/system/messages/htmlWriteReply.php
index fa3390bfa..9106d802b 100644
--- a/application/views/system/messages/htmlWriteReply.php
+++ b/application/views/system/messages/htmlWriteReply.php
@@ -3,11 +3,11 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Reply to a message',
-			'jquery' => true,
-			'bootstrap' => true,
-			'fontawesome' => true,
-			'tinymce' => true,
-			'sbadmintemplate' => true,
+			'jquery3' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'tinymce4' => true,
+			'sbadmintemplate3' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
 			'customJSs' => array('public/js/bootstrapper.js', 'public/js/messaging/messageWriteReply.js')
 		)
diff --git a/application/views/system/messages/htmlWriteTemplate.php b/application/views/system/messages/htmlWriteTemplate.php
index 95ab12630..4c0c0baba 100644
--- a/application/views/system/messages/htmlWriteTemplate.php
+++ b/application/views/system/messages/htmlWriteTemplate.php
@@ -3,13 +3,13 @@
 		'templates/FHC-Header',
 		array(
 			'title' => 'Write a new message or reply using templates',
-			'jquery' => true,
-			'jqueryui' => true,
-			'bootstrap' => true,
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'bootstrap3' => true,
 			'ajaxlib' => true,
-			'fontawesome' => true,
-			'tinymce' => true,
-			'sbadmintemplate' => true,
+			'fontawesome4' => true,
+			'tinymce4' => true,
+			'sbadmintemplate3' => true,
 			'dialoglib' => true,
 			'widgets' => true,
 			'customCSSs' => array('public/css/sbadmin2/admintemplate_contentonly.css', 'public/css/messaging/message.css'),
diff --git a/application/views/system/phrases/phraseinhaltEdit.php b/application/views/system/phrases/phraseinhaltEdit.php
index 594e8d9dd..388f1dd06 100644
--- a/application/views/system/phrases/phraseinhaltEdit.php
+++ b/application/views/system/phrases/phraseinhaltEdit.php
@@ -1,5 +1,5 @@
 <?php
-	$this->load->view('templates/header', array('title' => 'TemplateEdit', 'jquery' => true, 'textile' => true));
+	$this->load->view('templates/header', array('title' => 'TemplateEdit', 'jquery3' => true, 'textile' => true));
 ?>
 
 <div class="row">
diff --git a/application/views/system/vorlage/templatetextEdit.php b/application/views/system/vorlage/templatetextEdit.php
index 40ebd1599..42efc1519 100644
--- a/application/views/system/vorlage/templatetextEdit.php
+++ b/application/views/system/vorlage/templatetextEdit.php
@@ -1,5 +1,5 @@
 <?php
-	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce' => true, 'jsonforms' => true));
+	$this->load->view('templates/header', array('title' => 'VorlageEdit', 'tinymce4' => true, 'jsonforms' => true));
 ?>
 
 <div class="row">
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
new file mode 100644
index 000000000..cfbec86db
--- /dev/null
+++ b/application/views/templates/FHC-Common.php
@@ -0,0 +1,44 @@
+<?php
+	// All the following global variables are used in the FHC-Header and the FHC-Footer views
+
+	// By default set the parameters to null
+	$phrases = isset($phrases) ? $phrases : null;
+	
+	// By default set the parameters to false
+
+	// External resources
+	$bootstrap3 = isset($bootstrap3) ? $bootstrap3 : false;
+	$bootstrap5 = isset($bootstrap5) ? $bootstrap5 : false;
+	$captcha3 = isset($captcha3) ? $captcha3 : false;
+	$fontawesome4 = isset($fontawesome4) ? $fontawesome4 : false;
+	$fontawesome6 = isset($fontawesome6) ? $fontawesome6 : false;
+	$jquery3 = isset($jquery3) ? $jquery3 : false;
+	$jqueryui1 = isset($jqueryui1) ? $jqueryui1 : false;
+	$jquerycheckboxes1 = isset($jquerycheckboxes1) ? $jquerycheckboxes1 : false;
+	$jquerytreetable3 = isset($jquerytreetable3) ? $jquerytreetable3 : false;
+	$momentjs2 = isset($momentjs2) ? $momentjs2 : false;
+	$pivotui2 = isset($pivotui2) ? $pivotui2 : false;
+	$sbadmintemplate3 = isset($sbadmintemplate3) ? $sbadmintemplate3 : false;
+	$tablesorter2 = isset($tablesorter2) ? $tablesorter2 : false;
+	$tabulator4 = isset($tabulator4) ? $tabulator4 : false;
+	$tabulator5 = isset($tabulator5) ? $tabulator5 : false;
+	$tinymce4 = isset($tinymce4) ? $tinymce4 : false;
+	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
+	$vue3 = isset($vue3) ? $vue3 : false;
+
+	// Hooks
+	$addons = isset($addons) ? $addons : false;
+
+	// Internal resources
+	$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
+	$bootstrapper = isset($bootstrapper) ? $bootstrapper : false;
+	$dialoglib = isset($dialoglib) ? $dialoglib : false;
+	$filtercomponent = isset($filtercomponent) ? $filtercomponent : false;
+	$filterwidget = isset($filterwidget) ? $filterwidget : false;
+	$navigationcomponent = isset($navigationcomponent) ? $navigationcomponent : false;
+	$navigationwidget = isset($navigationwidget) ? $navigationwidget : false;
+	$tablecomponent = isset($tablecomponent) ? $tablecomponent : false;
+	$tablewidget = isset($tablewidget) ? $tablewidget : false;
+	$udfs = isset($udfs) ? $udfs : false;
+	$widgets = isset($widgets) ? $widgets : false;
+
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index 9be2faef3..dff868eab 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -1,3 +1,158 @@
 <!-- Footer start -->
+<?php
+	if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+	// Defines the includes variables
+	require('FHC-Common.php');
+
+	// All the following variables are used only in this view
+
+	// Retrieves the name of the index page, the URL path of the called controller and the called controller
+	// NOTE: placed here because it doesn't work inside functions
+	$indexPage = $this->config->item('index_page');
+	$calledPath = $this->router->directory.$this->router->class;
+	$calledMethod = $this->router->method;
+
+	// By default set the parameters to null
+	$customJSs = isset($customJSs) ? $customJSs : null;
+
+	// --------------------------------------------------------------------------------------------------------
+	// Javascripts
+
+	// Generates the global object to pass useful parameters to other javascripts
+	// NOTE: must be called before any other JS include
+	generateJSDataStorageObject($indexPage, $calledPath, $calledMethod);
+
+	// Generates the global object to pass phrases to javascripts
+	// NOTE: must be called before including the PhrasesLib.js
+	if ($phrases != null) generateJSPhrasesStorageObject($phrases);
+
+	// --------------------------------------------------------------------------------------------------------
+	// From vendor folder
+
+	// jQuery V3
+	if ($jquery3 === true) generateJSsInclude('vendor/components/jquery/jquery.min.js');
+
+	// jQuery UI
+	if ($jqueryui1 === true)
+	{
+		generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
+		generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file
+	}
+
+	// jQuery checkboxes
+	// NOTE: keep it after jQuery includes
+	if ($jquerycheckboxes1 === true) generateJSsInclude('vendor/rmariuzzo/jquery-checkboxes/dist/jquery.checkboxes-1.0.7.min.js');
+
+	// jQuery treetable
+	// NOTE: keep it after jQuery includes
+	if ($jquerytreetable3 === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');
+
+	// Bootstrap 3 JS
+	if ($bootstrap3 === true) generateJSsInclude('vendor/twbs/bootstrap3/dist/js/bootstrap.min.js');
+
+	// Bootstrap 5 JS
+	if ($bootstrap5 === true) generateJSsInclude('vendor/twbs/bootstrap5/js/bootstrap.min.js');
+
+	// Securimage JS
+	if ($captcha3 === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js');
+
+	// Moment JS
+	if ($momentjs2 === true)
+	{
+		generateJSsInclude('vendor/moment/momentjs/min/moment.min.js');
+		generateJSsInclude('vendor/moment/momentjs/locale/de-at.js');
+		generateJSsInclude('vendor/moment/momentjs/locale/en-ie.js');
+	}
+
+	// PivotUI JS
+	if ($pivotui2 === true) generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js');
+
+	// SB Admin 2 template JS
+	if ($sbadmintemplate3 === true)
+	{
+		generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
+		generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
+		generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
+		generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
+	}
+
+	// Table sorter JS
+	if ($tablesorter2 === true)
+	{
+		generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.min.js');
+		generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.widgets.min.js');
+		generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
+	}
+
+	// Tabulator 4 JS
+	if ($tabulator4 === true)
+	{
+		generateJSsInclude('vendor/olifolkerd/tabulator4/dist/js/tabulator.min.js');
+		generateJSsInclude('vendor/olifolkerd/tabulator4/dist/js/jquery_wrapper.min.js');
+	}
+
+	// Tabulator 5 JS
+	if ($tabulator5 === true) generateJSsInclude('vendor/olifolkerd/tabulator5/dist/js/tabulator.min.js');
+
+	// Tinymce 4 JS
+	if ($tinymce4 === true) generateJSsInclude('vendor/tinymce/tinymce4/tinymce.min.js');
+
+	// Tinymce 5 JS
+	if ($tinymce5 === true) generateJSsInclude('vendor/tinymce/tinymce5/tinymce.min.js');
+
+	// Vue 3 JS
+	if ($vue3 === true) generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js');
+
+	// --------------------------------------------------------------------------------------------------------
+	// From public folder
+
+	// DialogLib JS
+	// NOTE: must be called before including others JS libraries that use it
+	if ($dialoglib === true) generateJSsInclude('public/js/DialogLib.js');
+
+	// AjaxLib JS
+	// NOTE: must be called before including others JS libraries that use it
+	if ($ajaxlib === true) generateJSsInclude('public/js/AjaxLib.js');
+
+	// Bootstrapper include
+	// NOTE: to be used only if you know what you are doing!
+	if ($bootstrapper === true) generateJSsInclude('public/js/bootstrapper.js');
+
+	// VUE Navigation Component JS
+	if ($navigationcomponent === true) generateJSsInclude('public/js/components/Navigation.js');
+
+	// NavigationWidget JS
+	if ($navigationwidget === true) generateJSsInclude('public/js/NavigationWidget.js');
+
+	// VUE Filter Component JS
+	if ($filtercomponent === true) generateJSsInclude('public/js/components/Filter.js');
+
+	// FilterWidget JS
+	if ($filterwidget === true) generateJSsInclude('public/js/FilterWidget.js');
+
+	// PhrasesLib JS
+	if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js');
+
+	// VUE Table Component JS
+	if ($tablecomponent === true) generateJSsInclude('public/js/components/Table.js');
+
+	// TableWidget JS
+	if ($tablewidget === true) generateJSsInclude('public/js/TableWidget.js');
+
+	// User Defined Fields
+	if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
+
+	// Load addon hooks JS
+	// NOTE: keep it as the last but one
+	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
+
+	// Eventually required JS
+	// NOTE: keep it as the latest
+	generateJSsInclude($customJSs);
+?>
+	</body>
 </html>
+
 <!-- Footer end -->
+
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index 8620f8d1c..eed8b6590 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -1,45 +1,17 @@
 <?php
-
 	if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-	// Retrieves the name of the index page, the URL path of the called controller and the called controller
-	// NOTE: placed here because it doesn't work inside functions
-	$indexPage = $this->config->item('index_page');
-	$calledPath = $this->router->directory.$this->router->class;
-	$calledMethod = $this->router->method;
+	// Defines the includes variables
+	require('FHC-Common.php');
 
+	// All the following variables are used only in this view
 	// By default set the parameters to null
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
-	$customJSs = isset($customJSs) ? $customJSs : null;
-	$phrases = isset($phrases) ? $phrases : null;
-
-	// By default set the parameters to false
-	$addons = isset($addons) ? $addons : false;
-	$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
-	$bootstrap = isset($bootstrap) ? $bootstrap : false;
-	$captcha = isset($captcha) ? $captcha : false;
-	$dialoglib = isset($dialoglib) ? $dialoglib : false;
-	$filterwidget = isset($filterwidget) ? $filterwidget : false;
-	$fontawesome = isset($fontawesome) ? $fontawesome : false;
-	$jquery = isset($jquery) ? $jquery : false;
-	$jqueryui = isset($jqueryui) ? $jqueryui : false;
-	$jquerycheckboxes = isset($jquerycheckboxes) ? $jquerycheckboxes : false;
-	$jquerytreetable = isset($jquerytreetable) ? $jquerytreetable : false;
-	$momentjs = isset($momentjs) ? $momentjs : false;
-	$navigationwidget = isset($navigationwidget) ? $navigationwidget : false;
-	$pivotui = isset($pivotui) ? $pivotui : false;
-	$sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
-	$tablesorter = isset($tablesorter) ? $tablesorter : false;
-	$tablewidget = isset($tablewidget) ? $tablewidget : false;
-	$tabulator = isset($tabulator) ? $tabulator : false;
-	$tinymce = isset($tinymce) ? $tinymce : false;
-	$udfs = isset($udfs) ? $udfs : false;
-	$widgets = isset($widgets) ? $widgets : false;
 ?>
-
 <!-- Header start -->
+
 <!DOCTYPE HTML>
 <html>
 	<head>
@@ -58,47 +30,64 @@
 			// --------------------------------------------------------------------------------------------------------
 			// From vendor folder
 
-			// jQuery UI CSS
-			if ($jqueryui === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
+			// Bootstrap 3 CSS
+			if ($bootstrap3 === true) generateCSSsInclude('vendor/twbs/bootstrap3/dist/css/bootstrap.min.css');
 
-			// Bootstrap CSS
-			if ($bootstrap === true) generateCSSsInclude('vendor/twbs/bootstrap/dist/css/bootstrap.min.css');
+			// Bootstrap 5 CSS
+			if ($bootstrap5 === true) generateCSSsInclude('vendor/twbs/bootstrap5/css/bootstrap.min.css');
+
+			// jQuery UI CSS
+			if ($jqueryui1 === true) generateCSSsInclude('vendor/components/jqueryui/themes/base/jquery-ui.min.css');
 
 			// jQuery treetable
-			if ($jquerytreetable === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
+			if ($jquerytreetable3 === true) generateCSSsInclude('vendor/ludo/jquery-treetable/css/jquery.treetable.css');
 
-			// Font Awesome CSS
-			if ($fontawesome === true) generateCSSsInclude('vendor/components/font-awesome/css/font-awesome.min.css');
+			// Font Awesome 4 CSS free icons
+			if ($fontawesome4 === true) generateCSSsInclude('vendor/fortawesome/font-awesome4/css/font-awesome.min.css');
+
+			// Font Awesome 6 CSS free icons
+			if ($fontawesome6 === true)
+			{
+				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/fontawesome.min.css');
+				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/solid.min.css');
+				generateCSSsInclude('vendor/fortawesome/font-awesome6/css/brands.min.css');
+			}
 
 			// PivotUI CSS
-			if ($pivotui === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
+			if ($pivotui2 === true) generateCSSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.css');
 
 			// SB Admin 2 template CSS
-			if ($sbadmintemplate === true)
+			if ($sbadmintemplate3 === true)
 			{
 				generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.css');
 				generateCSSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/css/sb-admin-2.min.css');
 			}
 
 			// Securimage CSS
-			if ($captcha === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
+			if ($captcha3 === true) generateCSSsInclude('vendor/dapphp/securimage/securimage.css');
 
 			// Table sorter CSS
-			if ($tablesorter === true)
+			if ($tablesorter2 === true)
 			{
 				generateCSSsInclude('vendor/mottie/tablesorter/dist/css/theme.default.min.css');
 				generateCSSsInclude('vendor/mottie/tablesorter/dist/css/jquery.tablesorter.pager.min.css');
 			}
 
-			// Tabulator CSS
-			if ($tabulator === true)
+			// Tabulator 4 CSS
+			if ($tabulator4 === true)
 			{
-				generateCSSsInclude('vendor/olifolkerd/tabulator/dist/css/bootstrap/tabulator_bootstrap.min.css');
+				generateCSSsInclude('vendor/olifolkerd/tabulator4/dist/css/bootstrap/tabulator_bootstrap.min.css');
 				generateCSSsInclude('public/css/Tabulator.css');
 			}
 
-			// Tinymce CSS
-			if ($tinymce === true) generateCSSsInclude('public/css/TinyMCE.css');
+			// Tabulator 5 CSS
+			if ($tabulator5 === true) generateCSSsInclude('vendor/olifolkerd/tabulator5/dist/css/tabulator_bootstrap5.min.css');
+
+			// Tinymce 4 CSS
+			if ($tinymce4 === true) generateCSSsInclude('public/css/TinyMCE4.css');
+
+			// Tinymce 5 CSS
+			if ($tinymce5 === true) generateCSSsInclude('public/css/TinyMCE5.css');
 
 			// --------------------------------------------------------------------------------------------------------
 			// From public folder
@@ -109,9 +98,15 @@
 			// DialogLib CSS
 			if ($dialoglib === true) generateCSSsInclude('public/css/DialogLib.css');
 
+			// VUE FilterWidget CSS
+			if ($filtercomponent === true) generateCSSsInclude('public/css/FilterComponent.css');
+
 			// FilterWidget CSS
 			if ($filterwidget === true) generateCSSsInclude('public/css/FilterWidget.css');
 
+			// VUE NavigationWidget CSS
+			if ($navigationcomponent === true) generateCSSsInclude('public/css/NavigationComponent.css');
+
 			// NavigationWidget CSS
 			if ($navigationwidget === true) generateCSSsInclude('public/css/NavigationWidget.css');
 
@@ -120,117 +115,9 @@
 
 			// Eventually required CSS
 			generateCSSsInclude($customCSSs); // Eventually required CSS
-
-
-			// --------------------------------------------------------------------------------------------------------
-			// Javascripts
-
-			// Generates the global object to pass useful parameters to other javascripts
-			// NOTE: must be called before any other JS include
-			generateJSDataStorageObject($indexPage, $calledPath, $calledMethod);
-
-			// Generates the global object to pass phrases to javascripts
-			// NOTE: must be called before including the PhrasesLib.js
-			if ($phrases != null) generateJSPhrasesStorageObject($phrases);
-
-			// --------------------------------------------------------------------------------------------------------
-			// From vendor folder
-
-			// jQuery V3
-			if ($jquery === true) generateJSsInclude('vendor/components/jquery/jquery.min.js');
-
-			// jQuery UI
-			if ($jqueryui === true)
-			{
-				generateJSsInclude('vendor/components/jqueryui/jquery-ui.min.js');
-				generateJSsInclude('vendor/components/jqueryui/ui/i18n/datepicker-de.js'); // datepicker german language file
-			}
-
-			// jQuery checkboxes
-			// NOTE: keep it after jQuery includes
-			if ($jquerycheckboxes === true) generateJSsInclude('vendor/rmariuzzo/jquery-checkboxes/dist/jquery.checkboxes-1.0.7.min.js');
-			// jQuery treetable
-			// NOTE: keep it after jQuery includes
-			if ($jquerytreetable === true) generateJSsInclude('vendor/ludo/jquery-treetable/jquery.treetable.js');
-
-			// Bootstrap JS
-			if ($bootstrap === true) generateJSsInclude('vendor/twbs/bootstrap/dist/js/bootstrap.min.js');
-
-			// SB Admin 2 template JS
-			if ($sbadmintemplate === true)
-			{
-				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/vendor/metisMenu/metisMenu.min.js');
-				generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
-				generateBackwardCompatibleJSMsIe('vendor/afarkas/html5shiv/dist/html5shiv.min.js');
-				generateBackwardCompatibleJSMsIe('vendor/scottjehl/Respond/dest/respond.min.js');
-			}
-
-			// Securimage JS
-			if ($captcha === true) generateJSsInclude('vendor/dapphp/securimage/securimage.js');
-
-			// Moment JS
-			if ($momentjs === true)
-			{
-				generateJSsInclude('vendor/moment/momentjs/min/moment.min.js');
-				generateJSsInclude('vendor/moment/momentjs/locale/de-at.js');
-				generateJSsInclude('vendor/moment/momentjs/locale/en-ie.js');
-			}
-
-			// PivotUI JS
-			if ($pivotui === true) generateJSsInclude('vendor/nicolaskruchten/pivottable/dist/pivot.min.js');
-
-			// Table sorter JS
-			if ($tablesorter === true)
-			{
-				generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.min.js');
-				generateJSsInclude('vendor/mottie/tablesorter/dist/js/jquery.tablesorter.widgets.min.js');
-				generateJSsInclude('vendor/mottie/tablesorter/dist/js/extras/jquery.tablesorter.pager.min.js');
-			}
-
-			// Tabulator JS
-			if ($tabulator === true)
-			{
-				generateJSsInclude('vendor/olifolkerd/tabulator/dist/js/tabulator.min.js');
-				generateJSsInclude('vendor/olifolkerd/tabulator/dist/js/jquery_wrapper.min.js');
-			}
-
-			// Tinymce JS
-			if ($tinymce === true) generateJSsInclude('vendor/tinymce/tinymce/tinymce.min.js');
-
-			// --------------------------------------------------------------------------------------------------------
-			// From public folder
-
-			// DialogLib JS
-			// NOTE: must be called before including others JS libraries that use it
-			if ($dialoglib === true) generateJSsInclude('public/js/DialogLib.js');
-
-			// AjaxLib JS
-			// NOTE: must be called before including others JS libraries that use it
-			if ($ajaxlib === true) generateJSsInclude('public/js/AjaxLib.js');
-
-			// FilterWidget JS
-			if ($filterwidget === true) generateJSsInclude('public/js/FilterWidget.js');
-
-			// NavigationWidget JS
-			if ($navigationwidget === true) generateJSsInclude('public/js/NavigationWidget.js');
-
-			// PhrasesLib JS
-			if ($phrases != null) generateJSsInclude('public/js/PhrasesLib.js');
-
-			// TableWidget JS
-			if ($tablewidget === true) generateJSsInclude('public/js/TableWidget.js');
-
-			// User Defined Fields
-			if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
-
-			// Load addon hooks JS
-			// NOTE: keep it as the last but one
-			if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
-
-			// Eventually required JS
-			// NOTE: keep it as the latest
-			generateJSsInclude($customJSs);
 		?>
-
 	</head>
+	<body>
+
 <!-- Header end -->
+
diff --git a/composer.json b/composer.json
index 540025875..f29a6b071 100644
--- a/composer.json
+++ b/composer.json
@@ -308,9 +308,9 @@
 			"type": "package",
 			"package": {
 				"name": "twbs/bootstrap5",
-				"version": "5.0.2",
+				"version": "5.1.3",
 				"dist": {
-					"url": "https://github.com/twbs/bootstrap/releases/download/v5.0.2/bootstrap-5.0.2-dist.zip",
+					"url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip",
 					"type": "zip"
 				}
 			}
@@ -364,7 +364,7 @@
 		"tinymce/tinymce5": "5.10.*",
 
 		"twbs/bootstrap3": "3.4.*",
-		"twbs/bootstrap5": "5.0.*",
+		"twbs/bootstrap5": "5.1.*",
 
 		"vuejs/vuejs3": "3.2.33",
 
diff --git a/composer.lock b/composer.lock
index 5f2557632..e7e207c7d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d12bb05ce04aaee58782e9ad4803c387",
-    "content-hash": "798c94bdd795a81a8bdbb43f2a09fc33",
+    "hash": "f35123d066def191c9f17dbbc4e78807",
+    "content-hash": "ddcd02108923c9169e0d3bcb3de85d70",
     "packages": [
         {
             "name": "BlackrockDigital/startbootstrap-sb-admin-2",
@@ -1649,10 +1649,10 @@
         },
         {
             "name": "twbs/bootstrap5",
-            "version": "5.0.2",
+            "version": "5.1.3",
             "dist": {
                 "type": "zip",
-                "url": "https://github.com/twbs/bootstrap/releases/download/v5.0.2/bootstrap-5.0.2-dist.zip",
+                "url": "https://github.com/twbs/bootstrap/archive/refs/tags/v5.1.3.zip",
                 "reference": null,
                 "shasum": null
             },
diff --git a/public/css/NavigationComponent.css b/public/css/NavigationComponent.css
new file mode 100644
index 000000000..64d908b02
--- /dev/null
+++ b/public/css/NavigationComponent.css
@@ -0,0 +1,23 @@
+.header-menu-link-entry {
+	font-size: 18px;
+	color: #5e5e5e !important;
+}
+
+.navbar-header {
+	background-color: #f8f8f8;
+	border-color: #e7e7e7;
+}
+
+.sidebar {
+	z-index: 1;
+	position: absolute;
+	width: 250px;
+}
+
+#content {
+    position: inherit;
+    margin: 0 0 0 250px;
+    padding: 30px 30px;
+    border-left: 1px solid #e7e7e7;
+}
+
diff --git a/public/js/bootstrapper.js b/public/js/bootstrapper.js
index 6bc1372e2..91c1f2987 100644
--- a/public/js/bootstrapper.js
+++ b/public/js/bootstrapper.js
@@ -12,5 +12,7 @@ var Bootstrapper = {
 		$("input[type=text], select, textarea").addClass("form-control");
 		$("button, input[type=button]").addClass("btn btn-default");
 		$("table").addClass("table-condensed");
+		$("#tableDataset").addClass('table-bordered');
 	}
-};
\ No newline at end of file
+};
+