diff --git a/public/main/admin/course_edit.php b/public/main/admin/course_edit.php
index d7fd5e5d9d..046fe07403 100644
--- a/public/main/admin/course_edit.php
+++ b/public/main/admin/course_edit.php
@@ -509,7 +509,6 @@ function valide() {
 }
 </script>";
 
-// Display the form
 $form->display();
 
-Display :: display_footer();
+Display::display_footer();
diff --git a/public/main/admin/index.php b/public/main/admin/index.php
index 2f39114457..108976caeb 100644
--- a/public/main/admin/index.php
+++ b/public/main/admin/index.php
@@ -200,7 +200,7 @@ if (api_is_platform_admin()) {
     $searchForm = new FormValidator(
         'search_session',
         'GET',
-        api_get_path(WEB_CODE_PATH).'admin/session_list.php',
+        $sessionPath.'session_list.php',
         null,
         null,
         FormValidator::LAYOUT_BOX_SEARCH
diff --git a/public/main/admin/user_edit.php b/public/main/admin/user_edit.php
index 2f5f58cb6e..c107c88897 100644
--- a/public/main/admin/user_edit.php
+++ b/public/main/admin/user_edit.php
@@ -537,14 +537,8 @@ $content = Display::toolbarAction('toolbar-user-information', [implode(PHP_EOL,
 
 $bigImage = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_ORIGINAL);
 $normalImage = UserManager::getUserPicture($user_id, USER_IMAGE_SIZE_BIG);
-$content .= '<div class="row">';
-$content .= '<div class="col-md-10">';
-// Display form
+
 $content .= $form->returnForm();
-$content .= '</div>';
-$content .= '<div class="col-md-2">';
-$content .= '<a class="thumbnail expand-image" href="'.$bigImage.'" /><img src="'.$normalImage.'" /></a>';
-$content .= '</div>';
 
 $tpl = new Template($tool_name);
 $tpl->assign('content', $content);
diff --git a/public/main/inc/lib/display.lib.php b/public/main/inc/lib/display.lib.php
index 273e5f83b9..569fc7fea1 100644
--- a/public/main/inc/lib/display.lib.php
+++ b/public/main/inc/lib/display.lib.php
@@ -2547,7 +2547,7 @@ class Display
     {
         $col = count($contentList);
         $html = ' <div id="'.$id.'" class="q-card">';
-        $html .= ' <div class="flex justify-between '.$col.'">';
+        $html .= ' <div class="flex justify-between mb-3 '.$col.'">';
         foreach ($contentList as $item) {
             $html .= '<div class=" flex p-3 gap-2 ">'.$item.'</div>';
         }
diff --git a/public/main/inc/lib/formvalidator/Element/DatePicker.php b/public/main/inc/lib/formvalidator/Element/DatePicker.php
index 61cd0f9ac4..77b1188aba 100644
--- a/public/main/inc/lib/formvalidator/Element/DatePicker.php
+++ b/public/main/inc/lib/formvalidator/Element/DatePicker.php
@@ -72,58 +72,6 @@ class DatePicker extends HTML_QuickForm_text
         );
     }
 
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="form-group {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="form-group row {error_class}">
-                    <label {label-for} class="col-sm-'.$size[0].' col-form-label {extra_label_class}" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '{element}';
-                break;
-        }
-    }
-
     /**
      * Get the necessary javascript for this datepicker.
      *
diff --git a/public/main/inc/lib/formvalidator/Element/DateTimePicker.php b/public/main/inc/lib/formvalidator/Element/DateTimePicker.php
index 6e31e0a0c2..2d34c99d90 100644
--- a/public/main/inc/lib/formvalidator/Element/DateTimePicker.php
+++ b/public/main/inc/lib/formvalidator/Element/DateTimePicker.php
@@ -1,4 +1,5 @@
 <?php
+
 /* For licensing terms, see /license.txt */
 
 /**
@@ -91,58 +92,6 @@ class DateTimePicker extends HTML_QuickForm_text
         $this->updateAttributes(['value' => $value]);
     }
 
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="form-group {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="form-group row {error_class}">
-                    <label {label-for} class="col-sm-'.$size[0].' col-form-label {extra_label_class}" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '{element}';
-                break;
-        }
-    }
-
     /**
      * Get the necessary javascript for this datepicker.
      *
diff --git a/public/main/inc/lib/formvalidator/FormValidator.class.php b/public/main/inc/lib/formvalidator/FormValidator.class.php
index d37ca53723..92995aa76c 100644
--- a/public/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/public/main/inc/lib/formvalidator/FormValidator.class.php
@@ -38,7 +38,7 @@ class FormValidator extends HTML_QuickForm
     ) {
         // Default form class.
         if (is_array($attributes) && !isset($attributes['class']) || empty($attributes)) {
-            $attributes['class'] = 'form-horizontal';
+            $attributes['class'] = 'form-horizontal q-pt-md';
         }
 
         if (isset($attributes['class']) && false !== strpos($attributes['class'], 'form-search')) {
@@ -52,13 +52,18 @@ class FormValidator extends HTML_QuickForm
 
         switch ($layout) {
             case self::LAYOUT_HORIZONTAL:
-                $attributes['class'] = 'form-horizontal';
+                $attributes['class'] = 'w-full ';
+                break;
+            case self::LAYOUT_BOX_SEARCH:
+                $attributes['class'] = 'w-full flex gap-2';
+                $formTemplate = $this->getInLineTemplate();
                 break;
             case self::LAYOUT_INLINE:
-                $attributes['class'] = 'form-inline';
+                $attributes['class'] = ' flex gap-1 ';
+                $formTemplate = $this->getInLineTemplate();
                 break;
             case self::LAYOUT_BOX:
-                $attributes['class'] = 'form-inline-box';
+                $attributes['class'] = 'flex gap-1 ';
                 break;
             case self::LAYOUT_GRID:
                 $attributes['class'] = 'form-grid';
@@ -70,11 +75,12 @@ class FormValidator extends HTML_QuickForm
 
         // Modify the default templates
         $renderer = &$this->defaultRenderer();
-
         $renderer->setFormTemplate($formTemplate);
 
         // Element template
-        if (isset($attributes['class']) && 'form-inline' === $attributes['class']) {
+        if ((isset($attributes['class']) && 'form-inline' === $attributes['class']) ||
+            (self::LAYOUT_INLINE === $layout || self::LAYOUT_BOX_SEARCH === $layout)
+        ) {
             $elementTemplate = ' {label}  {element} ';
             $renderer->setElementTemplate($elementTemplate);
         } elseif (isset($attributes['class']) && 'form-search' === $attributes['class']) {
@@ -97,12 +103,14 @@ class FormValidator extends HTML_QuickForm
         }
 
         //Set Header template
-        $renderer->setHeaderTemplate('<legend>{header}</legend>');
+        $renderer->setHeaderTemplate(' <h1 class="text-2xl font-small text-gray-800 mb-4">{header}<hr /></h1>');
 
-        //Set required field template
-        $this->setRequiredNote(
-            '<span class="form_required">*</span> <small>'.get_lang('Required field').'</small>'
-        );
+        $required = '<span class="form_required">*</span> <small>'.get_lang('Required field').'</small>';
+        if ((self::LAYOUT_INLINE === $layout || self::LAYOUT_BOX_SEARCH === $layout)) {
+            $required = '';
+        }
+        // Set required field template
+        $this->setRequiredNote($required);
 
         $noteTemplate = <<<EOT
 	<div class="form-group">
@@ -112,23 +120,29 @@ EOT;
         $renderer->setRequiredNoteTemplate($noteTemplate);
     }
 
-    /**
-     * @return string
-     */
-    public function getFormTemplate()
+    public function getFormTemplate(): string
+    {
+        return '
+                <div class="pt-4">
+                    <div class="q-card p-4">
+                        <form{attributes}>
+                            {content}
+                            {hidden}
+                        </form>
+                    </div>
+                </div>
+        ';
+    }
+
+    public function getInLineTemplate(): string
     {
         return '<form{attributes}>
-        <fieldset>
             {content}
-        </fieldset>
         {hidden}
         </form>';
     }
 
-    /**
-     * @return string
-     */
-    public function getGridFormTemplate()
+    public function getGridFormTemplate(): string
     {
         return '
         <style>
@@ -152,13 +166,11 @@ EOT;
 
     /**
      * @todo this function should be added in the element class
-     *
-     * @return string
      */
-    public function getDefaultElementTemplate()
+    public function getDefaultElementTemplate(): string
     {
         return '
-            <div class="form-group row {error_class}">
+            <div class="row mb-3 {error_class}">
                 <label {label-for} class="col-sm-2 col-form-label {extra_label_class}" >
                     <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
                     {label}
@@ -491,7 +503,7 @@ EOT;
         return $this->addButton(
             $name,
             $label,
-            'pencil',
+            'fa fas fa-pencil-alt',
             'primary',
             null,
             null,
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php b/public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
index 1e24f344ab..b95a68ab7e 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/advanced_settings.php
@@ -5,12 +5,6 @@
  */
 class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static
 {
-    /**
-     * Class constructor
-     *
-     * @param string $name
-     * @param string $label
-     */
     public function __construct($name = '', $label = '')
     {
         if (empty($label)) {
@@ -46,14 +40,15 @@ class HTML_QuickForm_advanced_settings extends HTML_QuickForm_static
         $text = $this->getAttribute('label');
         $label = is_array($text) ? $text[0] : $text;
 
-        $html = '<div class="form-group row"><label class="col-sm-2 col-form-label"></label>';
+        $html = '<div class="md:flex md:items-center mb-6">
+                    <label class="ch-form-label h-4 md:w-1/4 flex justify-left md:justify-end pr-3 text-gray-600"></label>';
 
         if (is_array($text) && isset($text[1])) {
             $html .= '<span class="clearfix">'.$text[1].'</span>';
         }
 
-        $html .= '  
-            <div class="col-sm-10">         
+        $html .= '
+            <div class="md:w-3/4 ">
             <button id="'.$name.'" type="button" class="btn btn-secondary advanced_options"
                     data-toggle="button" aria-pressed="false" autocomplete="off">
                 <em class="fa fa-bars"></em> '.$label.'
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php b/public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
index fb62244c7b..838938acf3 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/advmultiselect.php
@@ -1,4 +1,7 @@
 <?php
+
+define('HTML_QUICKFORM_ADVMULTISELECT_ERROR_INVALID_INPUT', 1);
+
 /**
  * Copyright (c) 2005-2009, Laurent Laville <pear@laurent-laville.org>
  *
@@ -29,8 +32,6 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * PHP versions 4 and 5
- *
  * @category  HTML
  * @package   HTML_QuickForm_advmultiselect
  * @author    Laurent Laville <pear@laurent-laville.org>
@@ -39,33 +40,10 @@
  * @version   CVS: $Id: advmultiselect.php,v 1.36 2009/04/05 07:03:39 farell Exp $
  * @link      http://pear.php.net/package/HTML_QuickForm_advmultiselect
  * @since     File available since Release 0.4.0
- */
-
-/**
- * Basic error codes
- *
- * @var        integer
- * @since      1.5.0
- */
-define('HTML_QUICKFORM_ADVMULTISELECT_ERROR_INVALID_INPUT', 1);
-
-/**
- * @todo clean class to use only with the multiselect.js library
- *
- * Element for HTML_QuickForm that emulate a multi-select.
  *
  * The HTML_QuickForm_advmultiselect package adds an element to the
  * HTML_QuickForm package that is two select boxes next to each other
  * emulating a multi-select.
- *
- * @category  HTML
- * @package   HTML_QuickForm_advmultiselect
- * @author    Laurent Laville <pear@laurent-laville.org>
- * @copyright 2005-2009 Laurent Laville
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD
- * @version   Release: @package_version@
- * @link      http://pear.php.net/package/HTML_QuickForm_advmultiselect
- * @since     Class available since Release 0.4.0
  */
 class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
 {
@@ -260,11 +238,11 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         }
         if (is_null($this->getAttribute('class'))) {
             // default width of each select box
-            $this->updateAttributes(array('class' => 'form-control'));
+            $this->updateAttributes(array('class' => 'form-control w-full'));
         }
 
         $this->removeAttribute('class');
-        $this->setAttribute('class','form-control');
+        $this->setAttribute('class','form-control w-full');
 
         // set default add button attributes
         $this->setButtonAttributes('add');
@@ -490,10 +468,10 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
         } else {
             $this->_elementTemplate = '
             {javascript}
-            <div class="row">
-              <div class="col-sm"><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
-              <div class="col-sm-auto"><div class="text-center">{add}{remove}</div></div>
-              <div class="col-sm"><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
+            <div class="grid grid-cols-3">
+              <div><!-- BEGIN label_2 -->{label_2}<!-- END label_2 --> {unselected}</div>
+              <div><div class="text-center">{add}{remove}</div></div>
+              <div><!-- BEGIN label_3 -->{label_3}<!-- END label_3 -->{selected}</div>
             </div>
             ';
         }
@@ -571,8 +549,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $checkbox_id_suffix = 0;
 
             foreach ($this->_options as $option) {
-                $_labelAttributes
-                    = array('style', 'class', 'onmouseover', 'onmouseout');
+                $_labelAttributes = ['style', 'class', 'onmouseover', 'onmouseout'];
                 $labelAttributes = array();
                 foreach ($_labelAttributes as $attr) {
                     if (isset($option['attr'][$attr])) {
@@ -644,20 +621,18 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
             $attrUnselected = $this->_getAttrString($this->_attributesUnselected);
 
             // set name of Select To Box
-            $this->_attributesSelected
-                = array(
+            $this->_attributesSelected = [
                 'id' => $selectId.'_to',
                 'name' => $selectNameTo,
-            );
+            ];
             $this->_attributesSelected = array_merge($this->_attributes, $this->_attributesSelected);
             $attrSelected = $this->_getAttrString($this->_attributesSelected);
 
             // set name of Select hidden Box
-            $this->_attributesHidden
-                = array(
+            $this->_attributesHidden = [
                 'name' => $selectName,
                 'style' => 'overflow: hidden; visibility: hidden; width: 1px; height: 0;',
-            );
+            ];
             $this->_attributesHidden
                 = array_merge($this->_attributes, $this->_attributesHidden);
             $attrHidden = $this->_getAttrString($this->_attributesHidden);
@@ -925,7 +900,7 @@ class HTML_QuickForm_advmultiselect extends HTML_QuickForm_select
                             left: \''.$search.'\',
                             right: \''.$search.'\'
                         },
-                        fireSearch: function(value) {                        
+                        fireSearch: function(value) {
                             return value.length > 2;
                         }
                     });
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/button.php b/public/main/inc/lib/pear/HTML/QuickForm/button.php
index c52fbac73c..d9e703cbe9 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/button.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/button.php
@@ -1,5 +1,4 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
 
 /**
  * HTML class for an <input type="button" /> elements
@@ -91,16 +90,14 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
             unset($this->_attributes['class']);
 
             $icon = $this->getIcon();
-
             if (!empty($icon)) {
                 $icon = '<em class="' . $this->getIcon() . '"></em> ';
             }
-
             $class = $this->getClass().' '.$this->getStyle().' '.$this->getSize();
 
             return
                 $this->_getTabs() . '
-                <button class="'.$class.'" ' . $this->_getAttrString($this->_attributes) . '>'.
+                <button class="'.$class.'"' . $this->_getAttrString($this->_attributes) . '>'.
                 $icon.
                 $value.
                 '</button>';
@@ -203,12 +200,7 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
         return false;
     }
 
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
+    public function getTemplate(string $layout): string
     {
         $size = $this->calculateSize();
         $attributes = $this->getAttributes();
@@ -223,34 +215,36 @@ class HTML_QuickForm_button extends HTML_QuickForm_input
                         {element}
                     ';
                 } else {
-                        $template = '
-                            <div class="row form-group {error_class}">
-                                <label {label-for} class="col-sm-'.$size[0].' col-form-label" >
-                                    <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                                    {label}
-                                </label>
-                                <div class="col-sm-'.$size[1].'">
-                                    {icon}
-                                    {element}
+                    $template = '
+                        <div class="md:flex md:items-center mb-6 {error_class}">
+                            <label {label-for} class="ch-form-label h-4 md:w-1/4 flex justify-left md:justify-end pr-3 text-gray-600 '.$size[0].' " >
+                                <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                                {label}
+                            </label>
+                            <div class="md:w-3/4 '.$size[1].'">
+                                {icon}
+                                {element}
 
-                                    <!-- BEGIN label_2 -->
-                                        <p class="help-block">{label_2}</p>
-                                    <!-- END label_2 -->
+                                <!-- BEGIN label_2 -->
+                                    <p class="help-block">{label_2}</p>
+                                <!-- END label_2 -->
 
-                                    <!-- BEGIN error -->
-                                        <span class="help-inline help-block">{error}</span>
-                                    <!-- END error -->
-                                </div>
-                                <div class="col-sm-'.$size[2].'">
-                                    <!-- BEGIN label_3 -->
-                                        {label_3}
-                                    <!-- END label_3 -->
-                                </div>
-                            </div>';
+                                <!-- BEGIN error -->
+                                    <span class="help-inline help-block">{error}</span>
+                                <!-- END error -->
+                            </div>
+                            <div class="col-sm-'.$size[2].'">
+                                <!-- BEGIN label_3 -->
+                                    {label_3}
+                                <!-- END label_3 -->
+                            </div>
+                        </div>';
                     }
 
                 break;
             case FormValidator::LAYOUT_INLINE:
+                $template = '  {element}  ';
+                break;
             case FormValidator::LAYOUT_GRID:
             case FormValidator::LAYOUT_BOX_NO_LABEL:
             default:
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/checkbox.php b/public/main/inc/lib/pear/HTML/QuickForm/checkbox.php
index a4ef357677..e9ae8fcf4d 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/checkbox.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/checkbox.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * HTML class for a checkbox type field.
  *
@@ -153,73 +154,6 @@ class HTML_QuickForm_checkbox extends HTML_QuickForm_input
         return HTML_QuickForm_input::toHtml().$label;
     }
 
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="input-group">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                </div>
-                <div class="input-group {error_class}">
-                    {element}
-                </div>
-                ';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="row form-group {error_class}">
-                    <label {label-for}  class="col-sm-'.$size[0].' col-form-label  {extra_label_class}" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
-                        <div class="input-group">
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-            case FormValidator::LAYOUT_GRID:
-            case FormValidator::LAYOUT_BOX:
-                return '
-                        <div class="input-group">
-                            <label>{label}</label>
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-        }
-    }
-
     /**
      * Returns the value of field without HTML tags.
      *
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/element.php b/public/main/inc/lib/pear/HTML/QuickForm/element.php
index fcd5391736..5b70453bd8 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/element.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/element.php
@@ -1,10 +1,6 @@
 <?php
 
 /**
- * Base class for form elements
- *
- * PHP versions 4 and 5
- *
  * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_01.txt If you did not receive a copy of
@@ -12,7 +8,6 @@
  * send a note to license@php.net so we can mail you a copy immediately.
  *
  * @category    HTML
- * @package     HTML_QuickForm
  * @author      Adam Daniel <adaniel1@eesus.jnj.com>
  * @author      Bertrand Mansion <bmansion@mamasam.com>
  * @author      Alexey Borzov <avb@php.net>
@@ -20,15 +15,6 @@
  * @license     http://www.php.net/license/3_01.txt PHP License 3.01
  * @version     CVS: $Id: element.php,v 1.37 2009/04/04 21:34:02 avb Exp $
  * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for form elements
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
  * @author      Alexey Borzov <avb@php.net>
  * @version     Release: 3.2.11
  * @since       1.0
@@ -78,7 +64,6 @@ class HTML_QuickForm_element extends HTML_Common
      * @access    private
      */
     public $_persistantFreeze = false;
-
     protected $columnsSize;
 
     /**
@@ -624,4 +609,92 @@ class HTML_QuickForm_element extends HTML_Common
 
         return $size;
     }
+
+    public function getTemplate(string $layout): string
+    {
+        $size = $this->calculateSize();
+        $attributes = $this->getAttributes();
+
+        $hasBottomLabel = is_array($this->getLabel());
+        $height = 'h-4';
+        if ($hasBottomLabel) {
+            $height = 'h-8';
+        }
+
+        $template = '<label {label-for}>{label}</label>
+                        <div class="input-group">
+                            {icon}
+                            {element}
+                        </div>';
+
+        switch ($layout) {
+            case FormValidator::LAYOUT_BOX_SEARCH:
+            case FormValidator::LAYOUT_INLINE:
+                // <label {label-for} >
+                //         <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                //           {label}
+                //         </label>
+                $template = '{element}';
+                break;
+            case FormValidator::LAYOUT_GRID:
+                $template = '
+                <div class="form-group {error_class}">
+                    <label {label-for} >
+                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                        {label}
+                    </label>
+                    {element}
+                </div>';
+                break;
+            case FormValidator::LAYOUT_HORIZONTAL:
+                $template = '
+                <div class="md:flex md:items-center mb-6  '.$size[0].' {error_class}">
+                    <label {label-for} class="
+                        ch-form-label '.$height.'
+
+                        md:w-1/4
+                        flex justify-left
+                        text-sm font-medium text-gray-700
+                        md:justify-end pr-3
+
+                    " >
+                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
+                        {label}
+                    </label>
+                    <div class="md:w-3/4 '.$size[1].'">
+                        {icon}
+                        {element}
+                        <!-- BEGIN label_2 -->
+                            <p class="help-block">{label_2}</p>
+                        <!-- END label_2 -->
+
+                         <!-- BEGIN label_3 -->
+                            <p class="help-block">{label_3}</p>
+                        <!-- END label_3 -->
+
+                        <!-- BEGIN error -->
+                            <span class="help-inline help-block">{error}</span>
+                        <!-- END error -->
+                    </div>
+                </div>';
+                break;
+            case FormValidator::LAYOUT_BOX_NO_LABEL:
+                if (isset($attributes['custom']) && $attributes['custom'] == true) {
+                    $template = '
+                        <div class="input-group">
+                            {icon}
+                            {element}
+                            <div class="input-group-btn">
+                                <button class="btn btn-default" type="submit">
+                                    <em class="fa fa-search"></em>
+                                </button>
+                            </div>
+                        </div>
+                    ';
+                }
+                break;
+        }
+
+        return $template;
+    }
 }
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/file.php b/public/main/inc/lib/pear/HTML/QuickForm/file.php
index 7ad0346fe5..b1257c5971 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/file.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/file.php
@@ -386,100 +386,4 @@ class HTML_QuickForm_file extends HTML_QuickForm_input
                 '<input class="'.$class.'" '.$this->_getAttrString($this->_attributes).' />';
         }
     }
-
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $name = $this->getName();
-        $attributes = $this->getAttributes();
-        $size = $this->calculateSize();
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="form-group {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                if (isset($attributes['custom']) && $attributes['custom']) {
-                    $template = '
-                        <div class="input-file-container">
-                            {element}
-                            <label tabindex="0" {label-for} class="input-file-trigger">
-                                <i class="fa fa-picture-o fa-lg" aria-hidden="true"></i> {label}
-                            </label>
-                        </div>
-                        <p class="file-return"></p>
-                        <script>
-                            document.querySelector("html").classList.add(\'js\');
-                            var fileInput  = document.querySelector( ".input-file" ),
-                                button     = document.querySelector( ".input-file-trigger" ),
-                                the_return = document.querySelector(".file-return");
-
-                            button.addEventListener("keydown", function(event) {
-                                if ( event.keyCode == 13 || event.keyCode == 32 ) {
-                                    fileInput.focus();
-                                }
-                            });
-                            button.addEventListener("click", function(event) {
-                               fileInput.focus();
-                               return false;
-                            });
-                            fileInput.addEventListener("change", function(event) {
-                                fileName = this.value;
-                                if (this.files[0]) {
-                                    fileName = this.files[0].name;
-                                }
-                                the_return.innerHTML = fileName;
-                            });
-                        </script>
-                    ';
-                } else {
-                    $template = '
-                    <div id="file_'.$name.'" class="row form-group  {error_class}">
-
-                        <label {label-for} class="col-sm-'.$size[0].' col-form-label" >
-                            <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                            {label}
-                        </label>
-                         <div class="col-sm-'.$size[1].'">
-                            {icon}
-                            {element}
-                            <!-- BEGIN label_2 -->
-                                <p class="help-block">{label_2}</p>
-                            <!-- END label_2 -->
-                            <!-- BEGIN error -->
-                                <span class="help-inline help-block">{error}</span>
-                            <!-- END error -->
-                        </div>
-                        <div class="col-sm-'.$size[2].'">
-                            <!-- BEGIN label_3 -->
-                                {label_3}
-                            <!-- END label_3 -->
-                        </div>
-                    </div>';
-                }
-                return $template;
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
-                        <label {label-for}>{label}</label>
-                        <div class="input-group">
-
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-        }
-    }
-
 }
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/group.php b/public/main/inc/lib/pear/HTML/QuickForm/group.php
index 1ebd2abf2c..f3877f16f4 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/group.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/group.php
@@ -1,10 +1,6 @@
 <?php
 
 /**
- * HTML class for a form element group.
- *
- * PHP versions 4 and 5
- *
  * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_01.txt If you did not receive a copy of
@@ -18,24 +14,7 @@
  * @author      Alexey Borzov <avb@php.net>
  * @copyright   2001-2009 The PHP Group
  * @license     http://www.php.net/license/3_01.txt PHP License 3.01
- *
  * @version     CVS: $Id: group.php,v 1.40 2009/04/04 21:34:03 avb Exp $
- *
- * @see        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for a form element group.
- *
- * @category    HTML
- *
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
- * @author      Alexey Borzov <avb@php.net>
- *
- * @version     Release: 3.2.11
- *
- * @since       1.0
  */
 class HTML_QuickForm_group extends HTML_QuickForm_element
 {
@@ -544,71 +523,4 @@ class HTML_QuickForm_group extends HTML_QuickForm_element
             $this->_elements[$key]->setPersistantFreeze($persistant);
         }
     }
-
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="input-group">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                </div>
-                <div class="input-group {error_class}">
-                    {element}
-                </div>
-                ';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="row form-group {error_class}" id="'.$this->getName().'-group">
-                    <label {label-for}  class="col-sm-'.$size[0].'  {extra_label_class}" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-                        <!-- BEGIN label_2 -->
-                        <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                        <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
-                        <div class="input-group">
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-            case FormValidator::LAYOUT_BOX:
-                return '
-
-                        <div class="input-group">
-                            <label>{label}</label>
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-        }
-    }
 }
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/input.php b/public/main/inc/lib/pear/HTML/QuickForm/input.php
index 3122088b1f..119ad0ef11 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/input.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/input.php
@@ -2,32 +2,19 @@
 
 /**
  * Base class for <input /> form elements
- *
- * PHP versions 4 and 5
- *
  * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_01.txt If you did not receive a copy of
  * the PHP License and are unable to obtain it through the web, please
  * send a note to license@php.net so we can mail you a copy immediately.
  *
- * @category    HTML
- * @package     HTML_QuickForm
  * @author      Adam Daniel <adaniel1@eesus.jnj.com>
  * @author      Bertrand Mansion <bmansion@mamasam.com>
  * @copyright   2001-2009 The PHP Group
  * @license     http://www.php.net/license/3_01.txt PHP License 3.01
  * @version     CVS: $Id: input.php,v 1.10 2009/04/04 21:34:03 avb Exp $
  * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Base class for <input /> form elements
- *
  * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
  * @version     Release: 3.2.11
  * @since       1.0
  * @abstract
@@ -35,8 +22,6 @@
 class HTML_QuickForm_input extends HTML_QuickForm_element
 {
     /**
-     * Sets the element type
-     *
      * @param     string    $type   Element type
      * @since     1.0
      * @access    public
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/radio.php b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
index 205ef7a7fe..88b9b65ff3 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/radio.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/radio.php
@@ -56,8 +56,8 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
         $value = null,
         $attributes = []
     ) {
-        $this->labelClass = isset($attributes['label-class']) ? $attributes['label-class'] : '';
-        $this->radioClass = isset($attributes['radio-class']) ? $attributes['radio-class'] : 'form-check';
+        $this->labelClass = $attributes['label-class'] ?? '';
+        $this->radioClass = $attributes['radio-class'] ?? 'form-check';
 
         if (isset($attributes['label-class'])) {
             unset($attributes['label-class']);
@@ -68,7 +68,7 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
         }
         $attributes['class'] = ' form-check-input';
 
-        $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
+        $columnsSize = $attributes['cols-size'] ?? null;
         $this->setColumnsSize($columnsSize);
 
         parent::__construct($elementName, $elementLabel, $attributes);
@@ -103,12 +103,10 @@ class HTML_QuickForm_radio extends HTML_QuickForm_input
             $radioClass = $this->radioClass;
             $id = $this->getAttribute('id');
 
-            $label = '<div class="'.$radioClass.'">
+            return '<div class="'.$radioClass.'">
                 '.HTML_QuickForm_input::toHtml().'
                 <label for="'.$id.'" class="form-check-label '.$labelClass.'">'.$this->_text.'</label>
             </div>';
-
-            return $label;
         }
 
         return parent::toHtml().$label;
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/select.php b/public/main/inc/lib/pear/HTML/QuickForm/select.php
index b230b9fc3e..3c6a68befb 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/select.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/select.php
@@ -1,10 +1,6 @@
 <?php
 
 /**
- * Class to dynamically create an HTML SELECT
- *
- * PHP versions 4 and 5
- *
  * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_01.txt If you did not receive a copy of
@@ -20,15 +16,6 @@
  * @license     http://www.php.net/license/3_01.txt PHP License 3.01
  * @version     CVS: $Id: select.php,v 1.34 2009/04/04 21:34:04 avb Exp $
  * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * Class to dynamically create an HTML SELECT
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
  * @author      Alexey Borzov <avb@php.net>
  * @version     Release: 3.2.11
  * @since       1.0
@@ -79,7 +66,8 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
             if (empty($attributes)) {
                 $attributes = []; // Initialize variable to avoid warning in PHP 7.1
             }
-            $attributes['class'] = $oldClass . ' selectpicker form-control';
+            //selectpicker
+            $attributes['class'] = $oldClass . '  form-control mt-1 block w-full py-2 px-3 border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-indigo-500 sm:text-sm';
             $attributes['data-live-search'] = 'true';
 
             if (isset($attributes['disable_js']) && $attributes['disable_js']) {
@@ -554,69 +542,4 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
             </script>'
         );
     }
-
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="row mb-3  {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="row form-group {error_class}">
-                    <label {label-for}  class="col-sm-'.$size[0].' col-form-label  {extra_label_class}" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
-                        <div class="input-group">
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-            case FormValidator::LAYOUT_GRID:
-            case FormValidator::LAYOUT_BOX:
-                return '
-                        <div class="input-group" style="z-index: auto">
-                            <label>{label}</label>
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-        }
-    }
 }
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/text.php b/public/main/inc/lib/pear/HTML/QuickForm/text.php
index 4d9896ea16..3d9d86cc9a 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/text.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/text.php
@@ -1,10 +1,6 @@
 <?php
 
 /**
- * HTML class for a text field
- *
- * PHP versions 4 and 5
- *
  * LICENSE: This source file is subject to version 3.01 of the PHP license
  * that is available through the world-wide-web at the following URI:
  * http://www.php.net/license/3_01.txt If you did not receive a copy of
@@ -18,24 +14,13 @@
  * @copyright   2001-2009 The PHP Group
  * @license     http://www.php.net/license/3_01.txt PHP License 3.01
  * @version     CVS: $Id: text.php,v 1.7 2009/04/04 21:34:04 avb Exp $
- * @link        http://pear.php.net/package/HTML_QuickForm
- */
-
-/**
- * HTML class for a text field
- *
- * @category    HTML
- * @package     HTML_QuickForm
- * @author      Adam Daniel <adaniel1@eesus.jnj.com>
- * @author      Bertrand Mansion <bmansion@mamasam.com>
+ * @link        http://pear.php.net/package/HTML_QuickForm *
  * @version     Release: 3.2.11
  * @since       1.0
  */
 class HTML_QuickForm_text extends HTML_QuickForm_input
 {
     /**
-     * Class constructor
-     *
      * @param string $elementName    (optional)Input field name attribute
      * @param string $elementLabel   (optional)Input field label
      * @param mixed  $attributes     (optional)Either a typical HTML attribute string
@@ -44,23 +29,30 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
      * @access    public
      * @return    void
      */
-    public function __construct(
-        $elementName = null,
-        $elementLabel = null,
-        $attributes = []
-    ) {
+    public function __construct($elementName = null, $elementLabel = null, $attributes = [])
+    {
         if (is_string($attributes) && empty($attributes)) {
             $attributes = [];
         }
         if (is_array($attributes) || empty($attributes)) {
-            $classFromAttributes = isset($attributes['class']) ? $attributes['class'] : '';
-            $attributes['class'] = $classFromAttributes.' form-control';
+            $classFromAttributes = $attributes['class'] ?? '';
+            //w-1/2
+            $attributes['class'] = $classFromAttributes.'
+
+
+            sm:text-sm
+            text-gray-600
+            focus:outline-none
+            focus:border
+            focus:border-blue-700
+            bg-white font-normal
+            flex items-center pl-3 border-gray-300 rounded-md border shadow';
         }
-        $inputSize = isset($attributes['input-size']) ? $attributes['input-size'] : null;
+        $inputSize = $attributes['input-size'] ?? null;
         $this->setInputSize($inputSize);
-        $columnsSize = isset($attributes['cols-size']) ? $attributes['cols-size'] : null;
+        $columnsSize = $attributes['cols-size'] ?? null;
         $this->setColumnsSize($columnsSize);
-        $icon = isset($attributes['icon']) ? $attributes['icon'] : null;
+        $icon = $attributes['icon'] ?? null;
         $this->setIcon($icon);
 
         if (!empty($inputSize)) {
@@ -93,89 +85,6 @@ class HTML_QuickForm_text extends HTML_QuickForm_input
                 </div>';
     }
 
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->calculateSize();
-        $attributes = $this->getAttributes();
-
-        $template = '<label {label-for}>{label}</label>
-                        <div class="input-group">
-                            {icon}
-                            {element}
-                        </div>';
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                //                    <div class="form-group {error_class}">
-                $template = '
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    {element}
-                ';
-                break;
-            case FormValidator::LAYOUT_GRID:
-                $template = '
-                <div class="form-group {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                $template = '
-                <div class="row form-group {error_class}">
-                    <label {label-for} class="col-sm-'.$size[0].' col-form-label" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                if (isset($attributes['custom']) && $attributes['custom'] == true) {
-                    $template = '
-                        <div class="input-group">
-                            {icon}
-                            {element}
-                            <div class="input-group-btn">
-                                <button class="btn btn-default" type="submit">
-                                    <em class="fa fa-search"></em>
-                                </button>
-                            </div>
-                        </div>
-                    ';
-                }
-                break;
-        }
-
-        return $template;
-    }
-
     /**
      * Sets size of text field
      *
diff --git a/public/main/inc/lib/pear/HTML/QuickForm/textarea.php b/public/main/inc/lib/pear/HTML/QuickForm/textarea.php
index 50a039a760..be0195a71c 100644
--- a/public/main/inc/lib/pear/HTML/QuickForm/textarea.php
+++ b/public/main/inc/lib/pear/HTML/QuickForm/textarea.php
@@ -146,13 +146,6 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         $this->updateAttributes(array('cols' => $cols));
     }
 
-    /**
-     * Returns the textarea element in HTML
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     */
     public function toHtml()
     {
         if ($this->_flagFrozen) {
@@ -186,78 +179,4 @@ class HTML_QuickForm_textarea extends HTML_QuickForm_element
         }
         return $html . $this->_getPersistantData();
     }
-
-    /**
-     * @param string $layout
-     *
-     * @return string
-     */
-    public function getTemplate($layout)
-    {
-        $size = $this->getColumnsSize();
-        $this->removeAttribute('cols-size');
-
-        if (empty($size)) {
-            $size = [2, 8, 2];
-        }
-
-        switch ($layout) {
-            case FormValidator::LAYOUT_INLINE:
-                return '
-                <div class="form-group {error_class}">
-                    <label {label-for} >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    {element}
-                </div>';
-                break;
-            case FormValidator::LAYOUT_HORIZONTAL:
-                return '
-                <div class="row form-group {error_class}">
-                    <label class="col-sm-'.$size[0].' col-form-label" >
-                        <!-- BEGIN required --><span class="form_required">*</span><!-- END required -->
-                        {label}
-                    </label>
-                    <div class="col-sm-'.$size[1].'">
-                        {icon}
-                        {element}
-
-                        <!-- BEGIN label_2 -->
-                            <p class="help-block">{label_2}</p>
-                        <!-- END label_2 -->
-
-                        <!-- BEGIN error -->
-                            <span class="help-inline help-block">{error}</span>
-                        <!-- END error -->
-                    </div>
-                    <div class="col-sm-'.$size[2].'">
-                        <!-- BEGIN label_3 -->
-                            {label_3}
-                        <!-- END label_3 -->
-                    </div>
-                </div>';
-
-                break;
-            case FormValidator::LAYOUT_BOX_NO_LABEL:
-                return '
-                        <label {label-for}>{label}</label>
-                        <div class="input-group">
-
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-            case FormValidator::LAYOUT_GRID:
-            case FormValidator::LAYOUT_BOX:
-                return '
-                        <label {label-for}>{label}</label>
-                        <div class="input-group">
-                            {label}
-                            {icon}
-                            {element}
-                        </div>';
-                break;
-        }
-    }
 }
diff --git a/public/main/inc/lib/pear/HTML/Table.php b/public/main/inc/lib/pear/HTML/Table.php
index 0df18400cf..7c558a438b 100644
--- a/public/main/inc/lib/pear/HTML/Table.php
+++ b/public/main/inc/lib/pear/HTML/Table.php
@@ -1,5 +1,5 @@
 <?php
-/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
 /**
  * PEAR::HTML_Table makes the design of HTML tables easy, flexible, reusable and
  * efficient.
@@ -193,12 +193,15 @@ class HTML_Table extends HTML_Common
     {
         if (is_null($this->_thead)) {
             $this->_useTGroups = true;
-            $this->_thead = new HTML_Table_Storage($this->_tabOffset,
-                                                    $this->_useTGroups);
+            $this->_thead = new HTML_Table_Storage(
+                $this->_tabOffset,
+                $this->_useTGroups
+            );
             for ($i = 0; $i < $this->_tbodyCount; $i++) {
                 $this->_tbodies[$i]->setUseTGroups(true);
             }
         }
+
         return $this->_thead;
     }
 
@@ -211,12 +214,15 @@ class HTML_Table extends HTML_Common
     {
         if (is_null($this->_tfoot)) {
             $this->_useTGroups = true;
-            $this->_tfoot = new HTML_Table_Storage($this->_tabOffset,
-                                                    $this->_useTGroups);
+            $this->_tfoot = new HTML_Table_Storage(
+                $this->_tabOffset,
+                $this->_useTGroups
+            );
             for ($i = 0; $i < $this->_tbodyCount; $i++) {
                 $this->_tbodies[$i]->setUseTGroups(true);
             }
         }
+
         return $this->_tfoot;
     }
 
@@ -235,6 +241,7 @@ class HTML_Table extends HTML_Common
         if (PEAR::isError($ret)) {
             return $ret;
         }
+
         return $this->_tbodies[$body];
     }
 
@@ -255,10 +262,13 @@ class HTML_Table extends HTML_Common
         }
 
         $body = $this->_tbodyCount++;
-        $this->_tbodies[$body] = new HTML_Table_Storage($this->_tabOffset,
-                                                         $this->_useTGroups);
+        $this->_tbodies[$body] = new HTML_Table_Storage(
+            $this->_tabOffset,
+            $this->_useTGroups
+        );
         $this->_tbodies[$body]->setAutoFill($this->_autoFill);
         $this->_tbodies[$body]->setAttributes($attributes);
+
         return $body;
     }
 
@@ -1026,7 +1036,7 @@ class HTML_Table extends HTML_Common
                 for ($i = 0; $i < $this->_tbodyCount; $i++) {
                     $this->_tbodies[$i]->setColCount($maxColCount);
                     if ($this->_tbodies[$i]->getRowCount() > 0) {
-                        $strHtml .= $tabs . $tab . '<tbody' .
+                        $strHtml .= $tabs . $tab . '<tbody ' .
                                     $this->_getAttrString($this->_tbodies[$i]->_attributes) .
                                     '>' . $lnEnd;
                         $strHtml .= $this->_tbodies[$i]->toHtml($tabs, $tab);
diff --git a/public/main/inc/lib/pear/Pager/Common.php b/public/main/inc/lib/pear/Pager/Common.php
index e828caab15..b877f47277 100644
--- a/public/main/inc/lib/pear/Pager/Common.php
+++ b/public/main/inc/lib/pear/Pager/Common.php
@@ -847,30 +847,34 @@ class Pager_Common
             if (array_key_exists($this->_urlVar, $this->_linkData)) {
                 $onclick = str_replace('%d', $this->_linkData[$this->_urlVar], $this->_onclick);
             }
-            return sprintf('<a class="btn btn-outline-secondary" href="%s"%s%s%s%s title="%s">%s</a>',
-                           // Modified by Ivan Tcholakov, 17-OCT-2008.
-                           //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
-                           api_htmlentities($this->_url . $href),
-                           //
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
-                           empty($onclick)            ? '' : ' onclick="'.$onclick.'"',
-                           $altText,
-                           $linkText
+
+            return sprintf(
+                '<a class="btn btn-link" href="%s"%s%s%s%s title="%s">%s</a>',
+                // Modified by Ivan Tcholakov, 17-OCT-2008.
+                //htmlentities($this->_url . $href, ENT_COMPAT, 'UTF-8'),
+                api_htmlentities($this->_url.$href),
+                //
+                empty($this->_classString) ? '' : ' '.$this->_classString,
+                empty($this->_attributes) ? '' : ' '.$this->_attributes,
+                empty($this->_accesskey) ? '' : ' accesskey="'.$this->_linkData[$this->_urlVar].'"',
+                empty($onclick) ? '' : ' onclick="'.$onclick.'"',
+                $altText,
+                $linkText
             );
-        } elseif ($this->_httpMethod == 'POST') {
+        } elseif ($this->_httpMethod === 'POST') {
             $href = $this->_url;
             if (!empty($_GET)) {
-                $href .= '?' . $this->_http_build_query_wrapper($_GET);
+                $href .= '?'.$this->_http_build_query_wrapper($_GET);
             }
-            return sprintf("<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
-                           $this->_generateFormOnClick($href, $this->_linkData),
-                           empty($this->_classString) ? '' : ' '.$this->_classString,
-                           empty($this->_attributes)  ? '' : ' '.$this->_attributes,
-                           empty($this->_accesskey)   ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
-                           $altText,
-                           $linkText
+
+            return sprintf(
+                "<a href='javascript:void(0)' onclick='%s'%s%s%s title='%s'>%s</a>",
+                $this->_generateFormOnClick($href, $this->_linkData),
+                empty($this->_classString) ? '' : ' '.$this->_classString,
+                empty($this->_attributes) ? '' : ' '.$this->_attributes,
+                empty($this->_accesskey) ? '' : ' accesskey=\''.$this->_linkData[$this->_urlVar].'\'',
+                $altText,
+                $linkText
             );
         }
         return '';
diff --git a/public/main/inc/lib/sessionmanager.lib.php b/public/main/inc/lib/sessionmanager.lib.php
index e054206a43..b520989b41 100644
--- a/public/main/inc/lib/sessionmanager.lib.php
+++ b/public/main/inc/lib/sessionmanager.lib.php
@@ -7848,9 +7848,7 @@ class SessionManager
                         $orderClause;
 
                 if (api_is_multiple_url_enabled()) {
-                    $userRelAccessUrlTable = Database::get_main_table(
-                        TABLE_MAIN_ACCESS_URL_REL_USER
-                    );
+                    $userRelAccessUrlTable = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
                     $accessUrlId = api_get_current_access_url_id();
                     if (-1 != $accessUrlId) {
                         $sql = "SELECT user.id as user_id, username, lastname, firstname
@@ -7872,8 +7870,7 @@ class SessionManager
                         api_get_person_name($coachItem['firstname'], $coachItem['lastname']).' ('.$coachItem['username'].')';
                 }
 
-                $form->addElement(
-                    'select',
+                $form->addSelect(
                     'coach_username',
                     get_lang('Coach name'),
                     $coachesOptions,
@@ -7883,8 +7880,7 @@ class SessionManager
                     ]
                 );
             } else {
-                $form->addElement(
-                    'select_ajax',
+                $form->addSelectAjax(
                     'coach_username',
                     get_lang('Coach name'),
                     $coachInfo ? [$coachInfo['id'] => $coachInfo['complete_name_with_username']] : [],
diff --git a/public/main/inc/lib/sortable_table.class.php b/public/main/inc/lib/sortable_table.class.php
index 10d3a73e71..c9500837a3 100644
--- a/public/main/inc/lib/sortable_table.class.php
+++ b/public/main/inc/lib/sortable_table.class.php
@@ -144,7 +144,8 @@ class SortableTable extends HTML_Table
 
         if (empty($attributes)) {
             $attributes = [];
-            $attributes['class'] = 'table table-hover table-striped table-bordered data_table';
+            //$attributes['class'] = 'table table-hover table-striped table-bordered data_table';
+            $attributes['class'] = 'q-table';
             $attributes['id'] = $table_id;
         }
 
@@ -299,26 +300,33 @@ class SortableTable extends HTML_Table
             $params['urlVar'] = $this->param_prefix.'page_nr';
             $params['currentPage'] = $this->page_nr;
             $icon_attributes = ['style' => 'vertical-align: middle;'];
-            $params['prevImg'] = Display:: return_icon(
+            /*$params['prevImg'] = Display:: return_icon(
                 'action_prev.png',
                 get_lang('Previous page'),
                 $icon_attributes
-            );
-            $params['nextImg'] = Display:: return_icon(
+            );*/
+            $params['prevImg'] = Display::returnFontAwesomeIcon('caret-left');
+
+            /*$params['nextImg'] = Display:: return_icon(
                 'action_next.png',
                 get_lang('Next page'),
                 $icon_attributes
-            );
-            $params['firstPageText'] = Display:: return_icon(
+            );*/
+            $params['nextImg'] = Display::returnFontAwesomeIcon('caret-right');
+
+            /*$params['firstPageText'] = Display:: return_icon(
                 'action_first.png',
                 get_lang('First page'),
                 $icon_attributes
-            );
-            $params['lastPageText'] = Display:: return_icon(
+            );*/
+            $params['firstPageText'] = Display::returnFontAwesomeIcon('step-backward');
+
+            /*$params['lastPageText'] = Display:: return_icon(
                 'action_last.png',
                 get_lang('Last page'),
                 $icon_attributes
-            );
+            );*/
+            $params['lastPageText'] = Display::returnFontAwesomeIcon('step-forward');
             $params['firstPagePre'] = '';
             $params['lastPagePre'] = '';
             $params['firstPagePost'] = '';
@@ -391,16 +399,16 @@ class SortableTable extends HTML_Table
         if (false === $this->hideNavigation) {
             $form = $this->get_page_select_form();
             $nav = $this->get_navigation_html();
-            $html = '<div class="card-action">';
-            $html .= '<div class="row">';
-            $html .= '<div class="col-12 col-md-4">';
+            $html = '<div class="q-card">';
+            $html .= '<div class="q-pa-md fit row wrap justify-between items-start content-start">';
+            $html .= '<div class="col">';
             $html .= '<div class="page-select pb-2 pt-2">'.$form.'</div>';
             $html .= '</div>';
-            $html .= '<div class="col-12 col-md-4">';
-            $html .= '<div class="page-number pb-2 pt-2">'.$this->get_table_title().'</div>';
+            $html .= '<div class="col">';
+            $html .= '<div class="row justify-center">'.$this->get_table_title().'</div>';
             $html .= '</div>';
-            $html .= '<div class="col-12 col-md-4">';
-            $html .= '<div class="page-nav pb-2 pt-2">'.$nav.'</div>';
+            $html .= '<div class="col">';
+            $html .= '<div class="row justify-end">'.$nav.'</div>';
             $html .= '</div>';
             $html .= '</div>';
             $html .= '</div>';
@@ -416,7 +424,9 @@ class SortableTable extends HTML_Table
                 name="form_'.$this->table_name.'">';
         }
 
-        $html .= '<div class="table-responsive">'.$content.'</div>';
+        //$html .= '<div class="table-responsive">'.$content.'</div>';
+        $html .= '<div class="q-table__container q-table--horizontal-separator column no-wrap q-table__card q-table--no-wrap">'.
+            $content.'</div>';
 
         if (!empty($this->additional_parameters)) {
             foreach ($this->additional_parameters as $key => $value) {
@@ -425,19 +435,18 @@ class SortableTable extends HTML_Table
             }
         }
         $html .= '<input type="hidden" name="action">';
-        $html .= '<div class="card-action">';
-        $html .= '<div class="row">';
-        $html .= '<div class="col-12 col-md-6">';
-        $html .= '<div class="page-action pb-2 pt-2">';
+
+        $html .= '<div class="q-card">';
+        $html .= '<div class="flex p-3">';
 
         if (count($this->form_actions) > 0) {
             $html .= '<div class="btn-group" role="group">';
             $html .= '<a
-                class="btn btn-outline-primary"
+                class="btn btn-primary"
                 href="?'.$params.'&amp;'.$this->param_prefix.'selectall=1"
                 onclick="javascript: setCheckbox(true, \''.$table_id.'\'); return false;">'.get_lang('Select all').'</a>';
             $html .= '<a
-                class="btn btn-outline-primary"
+                class="btn btn-primary"
                 href="?'.$params.'"
                 onclick="javascript: setCheckbox(false, \''.$table_id.'\'); return false;">'.get_lang('UnSelect all').'</a> ';
             $html .= '<div class="btn-group" role="group">
@@ -465,7 +474,7 @@ class SortableTable extends HTML_Table
         }
 
         $html .= '</div>';
-        $html .= '</div>';
+
         // Pagination
         if ($this->get_total_number_of_items() > $this->default_items_per_page) {
             $html .= '<div class="col-12 col-md-6">';
@@ -473,7 +482,6 @@ class SortableTable extends HTML_Table
             $html .= '</div>';
         }
 
-        $html .= '</div>';
         $html .= '</div>';
         if (count($this->form_actions) > 0) {
             $html .= '</form>';
@@ -694,7 +702,6 @@ class SortableTable extends HTML_Table
         $from = $offset[0] - 1;
         $table_data = $this->get_table_data($from, $this->per_page, $this->column);
         $this->processHeaders();
-        $this->addBody();
         if (is_array($table_data)) {
             $count = 1;
             foreach ($table_data as &$row) {