diff --git a/app/Resources/public/css/base.css b/app/Resources/public/css/base.css
index eea9d23fb0..b2c69d54d8 100644
--- a/app/Resources/public/css/base.css
+++ b/app/Resources/public/css/base.css
@@ -303,7 +303,7 @@ ul#navigation .report a {
 .actions {
     background:#ffffff;
     border:1px solid #dddddd;
-    padding: 15px;
+    padding: 10px;
     border-radius: 4px;
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
@@ -341,18 +341,41 @@ ul#navigation .report a {
 .muted {
   color: #999999 !important;
 }
-.actions a {
+.actions .btn-default{
+    padding: 6px;
+    border: 1px solid #DDD
+}
+/* .actions a img{
+  margin-right: 5px;
+}*/
+.actions a{
+    border: 1px solid #ddd;
+    border-radius: 5px;
     display: inline-block;
-    margin-right: 10px;
+    margin-left: 5px;
+    padding: 5px;
+    background: #ffffff; /* Old browsers */
+    background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */
+    background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
+}
+.actions a:hover{
+    background: #f4f4f4; /* Old browsers */
+    background: -moz-linear-gradient(top, #f4f4f4 0%, #dddddd 71%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(71%,#dddddd)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* IE10+ */
+    background: linear-gradient(to bottom, #f4f4f4 0%,#dddddd 71%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
 }
 .actions .btn-toolbar {
     margin : 0px;
 }
-.actions span {
-    display: inline-block;
-    margin-right: 10px;
-    vertical-align:middle;
-}
 .actions form {
     margin-right: 10px;
     vertical-align:middle;
@@ -848,7 +871,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {
 }
 
 .right {
-    float:right !important;
+    text-align: right;
 }
 
 /* Nice buttons v2 */
@@ -2800,7 +2823,8 @@ form .formw .freeze {
   line-height: 18px;
   padding-top: 10px;
   padding-bottom: 10px;
-  text-align: center;
+  padding-left: 10px;
+  padding-right: 10px;
 }
 
 .data_table th {
@@ -3401,6 +3425,82 @@ div#no-data-view div.controls {
     padding-top: 1px;
 }
 
+/* styles for the star rater 
+.star-rating{
+    list-style:none;
+    margin: 0px;
+    padding:0px;
+    width: 125px;
+    height: 25px;
+    position: relative;
+    overflow:hidden;
+    background: url(../../main/img/alt_star.png) top left repeat-x;
+}
+.star-rating li{
+    padding:0px;
+    margin:0px;
+    width:25px;
+    height:25px;
+    float: left;
+}
+.star-rating li a{
+    display:block;
+    width:25px;
+    height: 25px;
+    line-height:25px;
+    text-decoration: none;
+    text-indent: -9000px;
+    z-index: 20;
+    position: absolute;
+    padding: 0px;
+    overflow:hidden;
+}
+.star-rating li a:hover{
+    background: url(../../main/img/alt_star.png) left bottom;
+    z-index: 2;
+    left: 0px;
+    border:none;
+}
+.star-rating a.one-star{
+    left: 0px;
+}
+.star-rating a.one-star:hover{
+    width:25px;
+}
+.star-rating a.two-stars{
+    left:25px;
+}
+.star-rating a.two-stars:hover{
+    width: 50px;
+}
+.star-rating a.three-stars{
+    left: 50px;
+}
+.star-rating a.three-stars:hover{
+    width: 75px;
+}
+.star-rating a.four-stars{
+    left: 75px;
+}
+.star-rating a.four-stars:hover{
+    width: 100px;
+}
+.star-rating a.five-stars{
+    left: 100px;
+}
+.star-rating a.five-stars:hover{
+    width: 125px;
+}
+.star-rating li.current-rating{
+    background: url(../../main/img/alt_star.png) left center;
+    position: absolute;
+    height: 25px;
+    display: block;
+    text-indent: -9000px;
+    z-index: 1;
+}
+remove halo effect in firefox   */
+
 /* styles for the star rater */
 .star-rating{
     list-style:none;
@@ -3475,7 +3575,7 @@ div#no-data-view div.controls {
     text-indent: -9000px;
     z-index: 1;
 }
-/* remove halo effect in firefox   */
+
 a:active{
     outline: none;
 }
@@ -3915,20 +4015,34 @@ a.forum_group_link {
     text-align: center;
 }
 .new_actions {
-    background-color: #EEEEEE;
-    background-image: -moz-linear-gradient(center top , #F5F5F5 0%, #EEEEEE 100%);
-    background-repeat: repeat-x;
+    background: #ffffff; /* Old browsers */
+    background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#ffffff), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, #ffffff 0%,#e5e5e5 100%); /* IE10+ */
+    background: linear-gradient(to bottom, #ffffff 0%,#e5e5e5 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
     border: 1px solid #E5E5E5;
     border-radius: 4px 4px 4px 4px;
-    height: 53px;
+    min-height: 50px;
 }
 .new_actions .nav > li > a {
-    border-left: 1px solid #F5F5F5;
+    
     border-radius: 0 0 0 0;
     border-right: 1px solid #E5E5E5;
     margin: 0;
-    padding-bottom: 11px;
-    padding-top: 11px;
+    padding: 10px;
+}
+.new_actions .nav li a:hover{
+    background: #f4f4f4; /* Old browsers */
+    background: -moz-linear-gradient(top, #f4f4f4 0%, #dddddd 71%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f4f4f4), color-stop(71%,#dddddd)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, #f4f4f4 0%,#dddddd 71%); /* IE10+ */
+    background: linear-gradient(to bottom, #f4f4f4 0%,#dddddd 71%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f4f4f4', endColorstr='#dddddd',GradientType=0 ); /* IE6-9 */
 }
 .new_actions-fixed {
     border-color: #D5D5D5;
@@ -3940,17 +4054,25 @@ a.forum_group_link {
     top: 0px;
     z-index: 1030;
 }
-.new_actions .nav > .active > a, .new_actions .nav > .active > a:hover {
-    background-color: #E9E9E9;
+.new_actions .nav .active a:hover {
+    background: #E9E9E9;
     border-left: 0 none;
     border-right-color: #DDDDDD;
     box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05) inset;
     color: #777777;
-    padding-left: 13px;
 }
 .new_actions .nav-tabs > li > a, .new_actions .nav-pills > li > a {
-    padding-left: 6px;
-    padding-right: 6px;
+    padding:8px;
+}
+.new_actions .nav-pills li.active a{
+    background: #dddddd; /* Old browsers */
+    background: -moz-linear-gradient(top, #dddddd 10%, #f4f4f4 100%); /* FF3.6+ */
+    background: -webkit-gradient(linear, left top, left bottom, color-stop(10%,#dddddd), color-stop(100%,#f4f4f4)); /* Chrome,Safari4+ */
+    background: -webkit-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Chrome10+,Safari5.1+ */
+    background: -o-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* Opera 11.10+ */
+    background: -ms-linear-gradient(top, #dddddd 10%,#f4f4f4 100%); /* IE10+ */
+    background: linear-gradient(to bottom, #dddddd 10%,#f4f4f4 100%); /* W3C */
+    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#f4f4f4',GradientType=0 ); /* IE6-9 */
 }
 .subnav .nav > li > .logout {
     padding-top:8px;
@@ -4992,7 +5114,8 @@ i.size-32.icon-new-work{
   display: inline-block;
 }
 .actions .form-inline {
-    display:inline-block;
+    display:block;
+    width: 100%;
 }
 ul.holder{
   list-style: none;
@@ -5823,7 +5946,10 @@ div#chat-remote-video video {
     font-size:22px;
     margin-top:5px;
 }
-#work-list{
+#student-list-work{
+    padding: 10px;
+}
+#work-list, #session-list{
   padding: 10px;
   border:1px solid #dddddd;
   border-radius: 5px;
@@ -5831,6 +5957,12 @@ div#chat-remote-video video {
   -webkit-border-radius: 5px;
   margin-bottom: 10px;
 }
+.list-category{
+    display: inline-block;
+}
+.list-category .chosen-container{
+    width: 450px !important;
+}
 .ui-accordion .ui-accordion-content-active{
 
 }
@@ -5884,34 +6016,35 @@ div#chat-remote-video video {
 .ui-jqgrid .ui-pg-table td{
   font-size: 12px;
 }
-/* .ui-state-hover,.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus{
-  border:none;
-  background: #ECF0F1;
-  font-weight:normal;
-  color:#212121
-}
-.ui-state-hover a,
-.ui-state-hover a:hover,
-.ui-state-hover a:link,
-.ui-state-hover a:visited,
-.ui-state-focus a,
-.ui-state-focus a:hover,
-.ui-state-focus a:link,
-.ui-state-focus a:visited {
-  color:#212121;text-decoration:none
-}
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active{
-  border:1px solid #aaa;
-  background: #fff;
-  font-weight:normal;
-  color:#212121
-}*/
+.ui-jqgrid .ui-widget-content .ui-state-default{
+  background: #EEEEEE;
+}
+.ui-tabs .ui-widget-header{
+    background: none;
+    border-top: none;
+    border-left: none;
+    border-right: none;
+    border-radius: 0px;
+    border-bottom-color: #dedede;
+}
+.ui-tabs.ui-widget-content{
+    border: none;
+}
+
+.ui-tabs .ui-state-default, .ui-tabs .ui-widget-content .ui-state-default, .ui-tabs .ui-widget-header .ui-state-default{
+    background: #fff;
+}
+.ui-tabs .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active{
+    border-color: #dedede;
+}
+.ui-widget{
+    font-family: "Open Sans",sans-serif;
+}
+.ui-tabs .ui-widget-content a.btn-success{
+    color: #fff;
+}
+
+
 .ui-priority-secondary,
 .ui-widget-content .ui-priority-secondary,
 .ui-widget-header .ui-priority-secondary{
@@ -5928,6 +6061,12 @@ div#chat-remote-video video {
 .ui-jqgrid .ui-jqgrid-htable th div{
   height: 25px;
 }
+.ui-jqgrid .ui-state-highlight, .ui-jqgrid .ui-widget-content .ui-state-highlight,.ui-jqgrid .ui-widget-header .ui-state-highlight{
+  background: #F7F7F7;
+}
+.ui-jqgrid .ui-state-hover, .ui-jqgrid .ui-widget-content .ui-state-hover,.ui-jqgrid .ui-widget-header .ui-state-hover{
+  background: #F7F7F7;
+}
 /* ui diglog */
 .ui-dialog .ui-widget-header{
   border:none;
@@ -5940,7 +6079,8 @@ div#chat-remote-video video {
 .ui-dialog .ui-dialog-buttonpane{
   border-top: 1px solid #DDD;
 }
-/*.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+
+.ui-button.ui-widget.ui-state-default {
   background-color:#f5f5f5;
   background-image:-moz-linear-gradient(top,#fff,#e6e6e6);
   background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));
@@ -5955,12 +6095,7 @@ div#chat-remote-video video {
   box-shadow:inset 0 1px 0 rgba(255,255,255,.2),0 1px 2px rgba(0,0,0,.05)
 }
 
-.ui-state-hover,
-.ui-widget-content .ui-state-hover,
-.ui-widget-header .ui-state-hover,
-.ui-state-focus,
-.ui-widget-content .ui-state-focus,
-.ui-widget-header .ui-state-focus{
+.ui-button.ui-widget.ui-state-hover{
   border-width: 1px;
   border-style:solid;
   border-color: #e6e6e6 #e6e6e6 #bfbfbf;
@@ -5969,7 +6104,14 @@ div#chat-remote-video video {
   background-color: #E6E6E6;
   font-weight:normal;
   color:#333333;
-}*/
+}
+
+
+
+.select2-container .select2-selection--single{
+  height: 32px !important;
+  border-color: #CCCCCC !important;
+}
 #dialog-form .dialog-form-content{
   font-size: 12px;
 }
@@ -6317,9 +6459,12 @@ a.sessionView {
   padding-left: 10px;
 }
 #course-list.data_table .title{
-    width: 360px;
+    width: 390px;
     padding-left: 0;
 }
+.actions label{
+    display: none;
+}
 /* CSS NEW TOP ******************************************************************************/
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
diff --git a/main/admin/course_list.php b/main/admin/course_list.php
index 8ae3d1f9ae..94fbf124ff 100755
--- a/main/admin/course_list.php
+++ b/main/admin/course_list.php
@@ -359,7 +359,7 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
     $form = new FormValidator('search_simple', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
     $form->addElement('text', 'keyword', null, array('id' => 'course-search-keyword'));
     $form->addButtonSearch(get_lang('SearchCourse'));
-    $form->addElement('static', 'search_advanced_link', null, '<a href="course_list.php?search=advanced">'.get_lang('AdvancedSearch').'</a>');
+    $advanced .= '<a class="btn btn-default" href="'.  api_get_path(WEB_CODE_PATH).'admin/course_list.php?search=advanced"><i class="fa fa-search"></i> '.get_lang('AdvancedSearch').'</a>';
 
     // Create a filter by session
     $sessionFilter = new FormValidator('course_filter', 'get', '', '', array(), FormValidator::LAYOUT_INLINE);
@@ -381,7 +381,25 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
         )
     );
     $courseListUrl = api_get_self();
-    $actions = '
+    $actions .= '<div class="row">';
+    $actions .= '<div class="col-md-4">';
+    $actions .= $form->return_form();
+    $actions .= '</div>';
+    $actions .= '<div class="col-md-4">';
+    $actions .= $sessionFilter->return_form();
+    $actions .= '</div>';
+    $actions .= '<div class="col-md-4">';
+        
+        $actions .= $advanced;
+        $actions .= '<div class="pull-right">';
+        $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
+        if (api_get_setting('course_validation') == 'true') {
+            $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
+        }
+        $actions .= '</div>';
+    $actions .= '</div>';
+    $actions .= '</div>';
+    $actions .= '
     <script>
     $(function() {
         $("#session_name").on("change", function() {
@@ -390,18 +408,9 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') {
         });
     });
     </script>';
-    $actions .= '<div class="pull-right">';
-    $actions .= '<a href="course_add.php">'.Display::return_icon('new_course.png', get_lang('AddCourse'),'',ICON_SIZE_MEDIUM).'</a> ';
-    if (api_get_setting('course_validation') == 'true') {
-        $actions .= '<a href="course_request_review.php">'.Display::return_icon('course_request_pending.png', get_lang('ReviewCourseRequests'),'',ICON_SIZE_MEDIUM).'</a>';
-    }
-    $actions .= '</div>';
-
-    $actions .= '<div class="pull-right">';
-    $actions .= $sessionFilter->return_form();
-    $actions .= '</div>';
-
-    $actions .= $form->return_form();
+    
+   
+    
 
     if (isset($_GET['session_id']) && !empty($_GET['session_id'])) {
         // Create a sortable table with the course data filtered by session
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index 3f23a464b2..bcc7167ac4 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -741,10 +741,10 @@ $form->addElement(
 
 $actions  = '';
 if (api_is_platform_admin()) {
-	$actions .= '<span style="float:right;">'.
+	$actions .= '<div style="float:right;">'.
 		 '<a href="'.api_get_path(WEB_CODE_PATH).'admin/user_add.php">'.
          Display::return_icon('new_user.png',get_lang('AddUsers'),'',ICON_SIZE_MEDIUM).'</a>'.
-		 '</span>';
+		 '</div>';
 }
 $actions .= $form->return_form();
 
diff --git a/main/course_description/listing.php b/main/course_description/listing.php
index 06b4831337..b13fad8d7b 100755
--- a/main/course_description/listing.php
+++ b/main/course_description/listing.php
@@ -77,6 +77,7 @@ if (isset($descriptions) && count($descriptions) > 0) {
             echo '<div class="panel-body">';
             echo $description['content'];
             echo '</div></div>';
+            
         }
     }
 } else {
diff --git a/main/document/document.php b/main/document/document.php
index 1ccabe7e07..b3d71c694b 100755
--- a/main/document/document.php
+++ b/main/document/document.php
@@ -1502,32 +1502,19 @@ if ($groupId != 0) {
 if (!isset($folders) || $folders === false) {
     $folders = array();
 }
-
+$btngroup= array('class' => 'btn btn-default');
 $actions = '<div class="actions">';
-if (!$is_certificate_mode) {
-    /* BUILD SEARCH FORM */
-
-    $form = new FormValidator(
-        'search_document',
-        'get',
-        api_get_self().'?'.api_get_cidreq(),
-        '',
-        array(),
-        FormValidator::LAYOUT_INLINE
-    );
-    $form->addText('keyword', '', false, array('class' => 'col-md-2'));
-    $form->addElement('hidden', 'cidReq', api_get_course_id());
-    $form->addElement('hidden', 'id_session', api_get_session_id());
-    $form->addElement('hidden', 'gidReq', $groupId);
-    $form->addButtonSearch(get_lang('Search'));
-    $actions .= $form->returnForm();
-}
+$actions .= '<div class="row">';
+$actions .= '<div class="col-md-8">';
 
 /* GO TO PARENT DIRECTORY */
+
 if ($curdirpath != '/' && $curdirpath != $group_properties['directory'] && !$is_certificate_mode) {
+    
     $actions .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&id='.$parent_id.'">';
     $actions .= Display::return_icon('folder_up.png', get_lang('Up'), '', ICON_SIZE_MEDIUM);
     $actions .= '</a>';
+    
 }
 
 if ($is_certificate_mode && $curdirpath != '/certificates') {
@@ -1649,6 +1636,48 @@ if ($is_allowed_to_edit ||
         );
     }
 }
+require 'document_slideshow.inc.php';
+if ($image_present && !isset($_GET['keyword'])) {
+    $actions .= Display::url(
+        Display::return_icon('slideshow.png', get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM),
+        api_get_path(WEB_CODE_PATH).'document/slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl
+    );
+}
+
+if (api_is_allowed_to_edit(null, true)) {
+    $actions .= Display::url(
+        Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM),
+        api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq()
+    );
+}
+
+$actions .= '</div>';
+$actions .= '<div class="col-md-4">';
+$actions .= '<div class="pull-right">';
+if (!$is_certificate_mode) {
+    /* BUILD SEARCH FORM */
+
+    $form = new FormValidator(
+        'search_document',
+        'get',
+        api_get_self().'?'.api_get_cidreq(),
+        '',
+        array(),
+        FormValidator::LAYOUT_INLINE
+    );
+    $form->addText('keyword', '', false, array('class' => 'col-md-2'));
+    $form->addElement('hidden', 'cidReq', api_get_course_id());
+    $form->addElement('hidden', 'id_session', api_get_session_id());
+    $form->addElement('hidden', 'gidReq', $groupId);
+    $form->addButtonSearch(get_lang('Search'));
+    $actions .= $form->returnForm();
+}
+$actions .= '</div>';
+$actions .= '</div>';
+$actions .= '</div>';
+
+
+
 
 $table_footer = '';
 $total_size = 0;
@@ -1825,20 +1854,7 @@ if (!is_null($documentAndFolders)) {
     }
 }
 
-require 'document_slideshow.inc.php';
-if ($image_present && !isset($_GET['keyword'])) {
-    $actions .= Display::url(
-        Display::return_icon('slideshow.png', get_lang('ViewSlideshow'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH).'document/slideshow.php?'.api_get_cidreq().'&curdirpath='.$curdirpathurl
-    );
-}
 
-if (api_is_allowed_to_edit(null, true)) {
-    $actions .= Display::url(
-        Display::return_icon('percentage.png', get_lang('DocumentQuota'), '', ICON_SIZE_MEDIUM),
-        api_get_path(WEB_CODE_PATH).'document/document_quota.php?'.api_get_cidreq()
-    );
-}
 $actions .= '</div>';
 
 if (!empty($moveTo)) {
diff --git a/main/group/group.php b/main/group/group.php
index 57e202b215..ee56f024e1 100755
--- a/main/group/group.php
+++ b/main/group/group.php
@@ -162,13 +162,14 @@ Display::display_header(get_lang('Groups'));
 Display::display_introduction_section(TOOL_GROUP);
 
 echo '<div class="actions">';
+
+echo '<div class="row">';
+echo '<div class="col-md-6">';
 if (api_is_allowed_to_edit(false, true)) {
 
     echo '<a href="group_creation.php?'.api_get_cidreq().'">'.
         Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo GroupManager::getSearchForm();
-
     if (api_get_setting('allow_group_categories') == 'true') {
         echo '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
@@ -192,6 +193,14 @@ if (api_is_allowed_to_edit(false, true)) {
     echo '<a href="group_overview.php?'.api_get_cidreq().'">'.
         Display::return_icon('group_summary.png', get_lang('GroupOverview'), '', ICON_SIZE_MEDIUM).'</a>';
 }
+echo '</div>';
+echo '<div class="col-md-6">';
+echo '<div class="pull-right">';
+echo GroupManager::getSearchForm();
+echo '</div>';
+echo '</div>';
+echo '</div>';
+
 
 $group_cats = GroupManager::get_categories(api_get_course_id());
 echo '</div>';
@@ -244,7 +253,7 @@ if (api_get_setting('allow_group_categories') == 'true') {
         echo Display::page_header(
             Security::remove_XSS($category['title'].' '. $label.' ').$actions,
             null,
-            'h2',
+            'h4',
             false
         );
 
diff --git a/main/group/group_overview.php b/main/group/group_overview.php
index 669e824269..8acce58ca6 100755
--- a/main/group/group_overview.php
+++ b/main/group/group_overview.php
@@ -83,39 +83,50 @@ if (!isset ($_GET['origin']) || $_GET['origin'] != 'learnpath') {
     Display::display_reduced_header();
 }
 
-// Action links
-echo '<div class="actions">';
-    echo '<a href="group_creation.php?'.api_get_cidreq().'">'.
+$actions = '<a href="group_creation.php?'.api_get_cidreq().'">'.
         Display::return_icon('add.png', get_lang('NewGroupCreate'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo GroupManager::getSearchForm();
-
     if (api_get_setting('allow_group_categories') == 'true') {
-        echo '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
+        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.
             Display::return_icon('new_folder.png', get_lang('AddCategory'), '', ICON_SIZE_MEDIUM).'</a>';
     } else {
-        echo '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
+        $actions.= '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.
             Display::return_icon('settings.png', get_lang('PropModify'), '', ICON_SIZE_MEDIUM).'</a>';
     }
-    echo  '<a href="import.php?'.api_get_cidreq().'&action=import">'.
+    $actions.= '<a href="import.php?'.api_get_cidreq().'&action=import">'.
         Display::return_icon('import_csv.png', get_lang('Import'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo  '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
+    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_all&type=csv">'.
         Display::return_icon('export_csv.png', get_lang('Export'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
+    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.
     Display::return_icon('export_excel.png', get_lang('ExportAsXLS'), '', ICON_SIZE_MEDIUM).'</a>';
 
-   echo  '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
+    $actions.= '<a href="group_overview.php?'.api_get_cidreq().'&action=export_pdf">'.
         Display::return_icon('pdf.png', get_lang('ExportToPDF'), '', ICON_SIZE_MEDIUM).'</a>';
 
-    echo '<a href="group.php?'.api_get_cidreq().'">'.
+    $actions.= '<a href="group.php?'.api_get_cidreq().'">'.
         Display::return_icon('group.png', get_lang('Groups'),'',ICON_SIZE_MEDIUM).'</a>';
 
 
-    echo '<a href="../user/user.php?'.api_get_cidreq().'">'.
+    $actions.= '<a href="../user/user.php?'.api_get_cidreq().'">'.
     Display::return_icon('user.png', get_lang('GoTo').' '.get_lang('Users'), '', ICON_SIZE_MEDIUM).'</a>';
 
+// Action links
+echo '<div class="actions">';
+echo '<div class="row">';
+echo '<div class="col-md-6">';
+echo $actions;
+echo '</div>';
+echo '<div class="col-md-6">';
+echo '<div class="pull-right">';
+echo GroupManager::getSearchForm();
+echo '</div>';
+echo '</div>';
+echo '</div>';
+    
+    
+
 echo '</div>';
 
 echo GroupManager::getOverview($courseId, $keyword);
diff --git a/main/img/icons/128/listwork.png b/main/img/icons/128/listwork.png
new file mode 100644
index 0000000000..c86fd317d4
Binary files /dev/null and b/main/img/icons/128/listwork.png differ
diff --git a/main/img/icons/22/listwork.png b/main/img/icons/22/listwork.png
new file mode 100644
index 0000000000..91e290adcc
Binary files /dev/null and b/main/img/icons/22/listwork.png differ
diff --git a/main/img/icons/32/listwork.png b/main/img/icons/32/listwork.png
new file mode 100644
index 0000000000..7af981760b
Binary files /dev/null and b/main/img/icons/32/listwork.png differ
diff --git a/main/img/icons/48/listwork.png b/main/img/icons/48/listwork.png
new file mode 100644
index 0000000000..21608694d4
Binary files /dev/null and b/main/img/icons/48/listwork.png differ
diff --git a/main/img/icons/64/listwork.png b/main/img/icons/64/listwork.png
new file mode 100644
index 0000000000..d6bb7c6fa4
Binary files /dev/null and b/main/img/icons/64/listwork.png differ
diff --git a/main/img/icons/svg/listwork.svg b/main/img/icons/svg/listwork.svg
new file mode 100644
index 0000000000..f96d0772fc
--- /dev/null
+++ b/main/img/icons/svg/listwork.svg
@@ -0,0 +1,1365 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="128"
+   height="128"
+   id="svg43586"
+   inkscape:version="0.91 r"
+   sodipodi:docname="listwork.svg">
+  <metadata
+     id="metadata170">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1051"
+     id="namedview168"
+     showgrid="false"
+     inkscape:zoom="3.9559791"
+     inkscape:cx="76.005742"
+     inkscape:cy="56.582862"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" />
+  <defs
+     id="defs43588">
+    <linearGradient
+       id="linearGradient44699">
+      <stop
+         id="stop44701"
+         style="stop-color:#000173;stop-opacity:0.93333334"
+         offset="0" />
+      <stop
+         id="stop44703"
+         style="stop-color:#3575f0;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44693">
+      <stop
+         id="stop44695"
+         style="stop-color:#3690e6;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44697"
+         style="stop-color:#d0e9ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44681">
+      <stop
+         id="stop44683"
+         style="stop-color:#ff5c38;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44685"
+         style="stop-color:#fb7e65;stop-opacity:0.99607843"
+         offset="0.30397323" />
+      <stop
+         id="stop44687"
+         style="stop-color:#cd0000;stop-opacity:0.98039216"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44627">
+      <stop
+         id="stop44629"
+         style="stop-color:#fffcfb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44633"
+         style="stop-color:#f4ad94;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44615">
+      <stop
+         id="stop44617"
+         style="stop-color:#2f68fa;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44619"
+         style="stop-color:#c7d5fb;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44605">
+      <stop
+         id="stop44607"
+         style="stop-color:#d0ecff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44609"
+         style="stop-color:#d7f0ff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop44611"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44090">
+      <stop
+         id="stop44092"
+         style="stop-color:#0926bb;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44094"
+         style="stop-color:#6bb5fe;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient44080">
+      <stop
+         id="stop44082"
+         style="stop-color:#2c8300;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44084"
+         style="stop-color:#57aeff;stop-opacity:1"
+         offset="0.25" />
+      <stop
+         id="stop44086"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop44088"
+         style="stop-color:#5aafff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <filter
+       id="filter3297">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.26694977"
+         id="feGaussianBlur3299" />
+    </filter>
+    <filter
+       id="filter3293">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.355"
+         id="feGaussianBlur3295" />
+    </filter>
+    <linearGradient
+       x1="41.945538"
+       y1="46.665127"
+       x2="41.945538"
+       y2="82.333244"
+       id="linearGradient3277"
+       xlink:href="#linearGradient3319"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4960409,0,0,1.4960409,402.17032,589.33425)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient3267"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-247.63486,-320.15198)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient3243"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-0.1200468,0)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient3240"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,983.32613,0)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient3211"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1805.2301,-312.49477)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient3203"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       id="filter3385">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.14607691"
+         id="feGaussianBlur3387" />
+    </filter>
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient3345"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       cx="53.60223"
+       cy="59.728882"
+       r="17.834057"
+       fx="53.60223"
+       fy="59.728882"
+       id="radialGradient3333"
+       xlink:href="#linearGradient3327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)" />
+    <linearGradient
+       x1="41.945538"
+       y1="46.665127"
+       x2="41.945538"
+       y2="82.333244"
+       id="linearGradient3325"
+       xlink:href="#linearGradient3319"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="96.381813"
+       y1="30.666691"
+       x2="96.381813"
+       y2="13.187494"
+       id="linearGradient3302"
+       xlink:href="#linearGradient3282"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9348508,0,0,0.9348508,453.69103,638.99314)" />
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient3296"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(447.42856,636.93359)" />
+    <radialGradient
+       cx="546.31165"
+       cy="705.48486"
+       r="25.28125"
+       fx="546.31165"
+       fy="705.48486"
+       id="radialGradient3288"
+       xlink:href="#linearGradient3282"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0328206,0,-3.2890618e-8,1.7173381,-565.71835,-518.49911)" />
+    <filter
+       id="filter14850">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.23870038"
+         id="feGaussianBlur14852" />
+    </filter>
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient14842"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(458.16198,644.6232)" />
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient14833"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(458.16198,644.6232)" />
+    <filter
+       id="filter14824">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.37332047"
+         id="feGaussianBlur14826" />
+    </filter>
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient14723"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(447.42856,636.93359)" />
+    <radialGradient
+       cx="546.31165"
+       cy="705.48486"
+       r="25.28125"
+       fx="546.31165"
+       fy="705.48486"
+       id="radialGradient14715"
+       xlink:href="#linearGradient14709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0328206,0,-3.2890618e-8,1.7173381,-565.71835,-518.49911)" />
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient14699"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(447.42856,636.93359)" />
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient14691"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient14685">
+      <stop
+         id="stop14687"
+         style="stop-color:#0917a0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop14689"
+         style="stop-color:#0345f4;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14709">
+      <stop
+         id="stop14711"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop14713"
+         style="stop-color:#5eb2ff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3282">
+      <stop
+         id="stop3284"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3286"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3319">
+      <stop
+         id="stop3321"
+         style="stop-color:#7d491f;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop44679"
+         style="stop-color:#87570f;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3323"
+         style="stop-color:#926600;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3327">
+      <stop
+         id="stop3329"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3335"
+         style="stop-color:#fdd99a;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3331"
+         style="stop-color:#c39539;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3339">
+      <stop
+         id="stop3341"
+         style="stop-color:#e8e8e8;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3347"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3343"
+         style="stop-color:#e8e8e8;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3197">
+      <stop
+         id="stop3199"
+         style="stop-color:#002f32;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3201"
+         style="stop-color:#045b04;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3205">
+      <stop
+         id="stop3207"
+         style="stop-color:#2c8300;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3215"
+         style="stop-color:#3db800;stop-opacity:1"
+         offset="0.25" />
+      <stop
+         id="stop3213"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop3209"
+         style="stop-color:#69cf35;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3219">
+      <stop
+         id="stop3221"
+         style="stop-color:#0e7309;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3223"
+         style="stop-color:#70d13e;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3261">
+      <stop
+         id="stop3263"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop3269"
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0.5" />
+      <stop
+         id="stop3265"
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient43942"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <linearGradient
+       x1="96.381813"
+       y1="30.666691"
+       x2="96.381813"
+       y2="13.187494"
+       id="linearGradient43945"
+       xlink:href="#linearGradient3282"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.9348508,0,0,0.9348508,-335.7785,862.51168)" />
+    <linearGradient
+       x1="96.125"
+       y1="11.1875"
+       x2="96.125"
+       y2="52.101334"
+       id="linearGradient43948"
+       xlink:href="#linearGradient14685"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <radialGradient
+       cx="546.31165"
+       cy="705.48486"
+       r="25.28125"
+       fx="546.31165"
+       fy="705.48486"
+       id="radialGradient43952"
+       xlink:href="#linearGradient14709"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.0328206,0,-3.2890618e-8,1.7173381,-1355.1879,-294.98057)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient43957"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-1037.1044,-96.63344)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient43963"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,193.8566,223.51854)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient43966"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-789.58958,223.51854)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient43969"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1015.7606,-88.97623)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient43972"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient43992"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient43994"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1015.7606,-88.97623)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient43996"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-789.58958,223.51854)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient43998"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,193.8566,223.51854)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient44000"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-1037.1044,-96.63344)" />
+    <radialGradient
+       cx="53.60223"
+       cy="59.728882"
+       r="17.834057"
+       fx="53.60223"
+       fy="59.728882"
+       id="radialGradient44002"
+       xlink:href="#linearGradient3327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)" />
+    <linearGradient
+       x1="41.945538"
+       y1="46.665127"
+       x2="41.945538"
+       y2="82.333244"
+       id="linearGradient44004"
+       xlink:href="#linearGradient3319"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient44006"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient44038"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient44040"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1015.7606,-88.97623)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44042"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-789.58958,223.51854)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44044"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,193.8566,223.51854)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient44046"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-1037.1044,-96.63344)" />
+    <radialGradient
+       cx="53.60223"
+       cy="59.728882"
+       r="17.834057"
+       fx="53.60223"
+       fy="59.728882"
+       id="radialGradient44048"
+       xlink:href="#linearGradient44627"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)" />
+    <linearGradient
+       x1="41.945538"
+       y1="46.665127"
+       x2="41.945538"
+       y2="82.333244"
+       id="linearGradient44050"
+       xlink:href="#linearGradient3319"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient44052"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient44057"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-282.47353,882.69271)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient44061"
+       xlink:href="#linearGradient44605"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.856113,-0.0637264,0.1161478,1.5603521,-743.30707,-121.7687)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44067"
+       xlink:href="#linearGradient44090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,253.42404,245.75912)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44070"
+       xlink:href="#linearGradient44090"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-730.02214,245.75912)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient44073"
+       xlink:href="#linearGradient44080"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1075.328,-66.735647)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient44076"
+       xlink:href="#linearGradient44699"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-282.47353,882.69271)" />
+    <linearGradient
+       x1="-246.57739"
+       y1="958.07971"
+       x2="-248.7769"
+       y2="964.61743"
+       id="linearGradient44613"
+       xlink:href="#linearGradient44615"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-246.57739"
+       y1="958.07971"
+       x2="-248.7769"
+       y2="964.61743"
+       id="linearGradient44625"
+       xlink:href="#linearGradient44615"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,-476.93424,0)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient44635"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient44637"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1015.7606,-88.97623)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44639"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-789.58958,223.51854)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44641"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,193.8566,223.51854)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient44643"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-1037.1044,-96.63344)" />
+    <radialGradient
+       cx="53.60223"
+       cy="59.728882"
+       r="17.834057"
+       fx="53.60223"
+       fy="59.728882"
+       id="radialGradient44645"
+       xlink:href="#linearGradient3327"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,1.655849,-1.6391884,0,152.15006,-32.923726)" />
+    <linearGradient
+       x1="41.945538"
+       y1="46.665127"
+       x2="41.945538"
+       y2="82.333244"
+       id="linearGradient44647"
+       xlink:href="#linearGradient3319"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient44649"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-342.04097,860.45213)" />
+    <linearGradient
+       x1="28.429483"
+       y1="61.798298"
+       x2="58.95916"
+       y2="61.798298"
+       id="linearGradient44654"
+       xlink:href="#linearGradient3339"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-324.93283,864.80693)" />
+    <radialGradient
+       cx="479.68311"
+       cy="709.6579"
+       r="5.0058851"
+       fx="479.68311"
+       fy="709.6579"
+       id="radialGradient44658"
+       xlink:href="#linearGradient3261"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2339764,-0.1516032,0.1907967,1.5529925,-1019.9963,-92.27864)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44664"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1,0,0,1,210.96474,227.87334)" />
+    <linearGradient
+       x1="517.02167"
+       y1="705.48438"
+       x2="517.02167"
+       y2="745.30084"
+       id="linearGradient44667"
+       xlink:href="#linearGradient3219"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-772.48144,227.87334)" />
+    <radialGradient
+       cx="491.52231"
+       cy="670.92523"
+       r="36.426601"
+       fx="491.52231"
+       fy="670.92523"
+       id="radialGradient44670"
+       xlink:href="#linearGradient3205"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0,2.0237831,-1.9580539,0,1032.8687,-84.621431)" />
+    <linearGradient
+       x1="83.28125"
+       y1="123.09795"
+       x2="83.28125"
+       y2="66.310989"
+       id="linearGradient44673"
+       xlink:href="#linearGradient3197"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-324.93283,864.80693)" />
+    <linearGradient
+       x1="60.126968"
+       y1="81.913818"
+       x2="60.126968"
+       y2="47.542713"
+       id="linearGradient44677"
+       xlink:href="#linearGradient44681"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="-35.566662"
+       y1="76.562927"
+       x2="-35.566662"
+       y2="84.910484"
+       id="linearGradient44691"
+       xlink:href="#linearGradient44693"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient4799">
+      <stop
+         style="stop-color:#ffde00;stop-opacity:1;"
+         offset="0"
+         id="stop4801" />
+      <stop
+         style="stop-color:#ffa700;stop-opacity:1;"
+         offset="1"
+         id="stop4803" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4039"
+       id="linearGradient4329"
+       gradientUnits="userSpaceOnUse"
+       x1="10.897278"
+       y1="107.74331"
+       x2="-11.051572"
+       y2="97.579109"
+       gradientTransform="matrix(1.0246281,0,0,1.0353085,40.519616,-0.22424324)" />
+    <linearGradient
+       id="linearGradient4039">
+      <stop
+         style="stop-color:#d01509;stop-opacity:1"
+         offset="0"
+         id="stop4041" />
+      <stop
+         id="stop4047"
+         offset="0.60592282"
+         style="stop-color:#ff8100;stop-opacity:1" />
+      <stop
+         style="stop-color:#de7524;stop-opacity:1"
+         offset="1"
+         id="stop4043" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3768"
+       id="linearGradient4331"
+       gradientUnits="userSpaceOnUse"
+       x1="43.131836"
+       y1="59.241096"
+       x2="14.742223"
+       y2="43.908661"
+       gradientTransform="matrix(1.0246281,0,0,1.0353085,40.519616,-0.22424324)" />
+    <linearGradient
+       id="linearGradient3768">
+      <stop
+         style="stop-color:#f06a00;stop-opacity:1"
+         offset="0"
+         id="stop3770" />
+      <stop
+         id="stop3776"
+         offset="0.5"
+         style="stop-color:#ffa700;stop-opacity:1" />
+      <stop
+         style="stop-color:#fffbf2;stop-opacity:1"
+         offset="1"
+         id="stop3772" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4006"
+       id="linearGradient4333"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.96721377,0.05007735,0.04267558,0.92032192,42.390256,-0.8424629)"
+       x1="62.940292"
+       y1="32.194218"
+       x2="30.114321"
+       y2="14.002395" />
+    <linearGradient
+       id="linearGradient4006">
+      <stop
+         id="stop4008"
+         offset="0"
+         style="stop-color:#7e84a2;stop-opacity:1" />
+      <stop
+         style="stop-color:#a0a0b6;stop-opacity:1"
+         offset="0.59688359"
+         id="stop4018" />
+      <stop
+         style="stop-color:#e5e5eb;stop-opacity:1"
+         offset="0.72071856"
+         id="stop4016" />
+      <stop
+         style="stop-color:#fcfcfd;stop-opacity:1"
+         offset="0.79710156"
+         id="stop4014" />
+      <stop
+         style="stop-color:#dfdfe6;stop-opacity:1"
+         offset="0.86165124"
+         id="stop4010" />
+      <stop
+         id="stop4012"
+         offset="1"
+         style="stop-color:#c6c6d2;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3819"
+       id="linearGradient4335"
+       gradientUnits="userSpaceOnUse"
+       x1="73.720337"
+       y1="72.383949"
+       x2="73.89666"
+       y2="15.011312" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3819">
+      <stop
+         style="stop-color:#99a1ff;stop-opacity:1"
+         offset="0"
+         id="stop3821" />
+      <stop
+         style="stop-color:#eef3ff;stop-opacity:1"
+         offset="1"
+         id="stop3823" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3282"
+       id="linearGradient4337"
+       gradientUnits="userSpaceOnUse"
+       x1="45.661526"
+       y1="6.5193067"
+       x2="47.762714"
+       y2="7.8751364"
+       gradientTransform="translate(42.069153,-0.17825912)" />
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter4265"
+       x="-0.10085711"
+       width="1.2017142"
+       y="-0.09158922"
+       height="1.1831784">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.23505925"
+         id="feGaussianBlur4267" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter3937"
+       x="-0.10852589"
+       width="1.2170517"
+       y="-0.13418721"
+       height="1.2683744">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.53062488"
+         id="feGaussianBlur3939" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter4059">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.34235246"
+         id="feGaussianBlur4061" />
+    </filter>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter4293"
+       x="-0.13063501"
+       width="1.26127"
+       y="-0.049694721"
+       height="1.0993894">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.57582119"
+         id="feGaussianBlur4295" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4071"
+       id="linearGradient4339"
+       gradientUnits="userSpaceOnUse"
+       x1="-12.798099"
+       y1="121.35239"
+       x2="-9.0282564"
+       y2="114.59396"
+       gradientTransform="matrix(1.0246281,0,0,1.0353085,40.519616,-0.22424324)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4071">
+      <stop
+         style="stop-color:#224fda;stop-opacity:1"
+         offset="0"
+         id="stop4073" />
+      <stop
+         style="stop-color:#b7dcff;stop-opacity:1"
+         offset="1"
+         id="stop4075" />
+    </linearGradient>
+    <filter
+       style="color-interpolation-filters:sRGB"
+       inkscape:collect="always"
+       id="filter4209"
+       x="-0.63874197"
+       width="2.2774839"
+       y="-0.10476104"
+       height="1.2095221">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5252421"
+         id="feGaussianBlur4211" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4071"
+       id="linearGradient12588"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.0246281,0,0,1.0353085,40.519616,-0.22424324)"
+       x1="-12.798099"
+       y1="121.35239"
+       x2="-9.0282564"
+       y2="114.59396" />
+  </defs>
+  <g
+     transform="translate(324,-882.64789)"
+     id="layer1">
+    <g
+       id="g13425">
+      <rect
+         ry="0"
+         y="882.88092"
+         x="-323.81882"
+         height="128"
+         width="128"
+         id="rect12623"
+         style="opacity:1;fill:#2e75a3;fill-opacity:0;stroke:none;stroke-width:1.00486362;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+      <g
+         transform="translate(-1.4176664,-1.2652297)"
+         id="g12590">
+        <g
+           id="g3498"
+           transform="matrix(1.1454774,0,0,1.1454774,12.477895,-148.19204)">
+          <path
+             style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44667);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path3217"
+             d="m -263.35265,933.74757 c 8.46364,9.0621 14.91528,24.09751 16.80551,38.65267"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#000000;fill-opacity:0.50196078;stroke:none;stroke-width:1.33686185;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3297)"
+             id="path44010"
+             d="m -237.54657,906.14303 c -14.71669,0 -26.69498,11.97829 -26.69498,26.69498 0,14.71669 11.97829,26.69498 26.69498,26.69498 14.71668,0 26.69497,-11.97829 26.69497,-26.69498 0,-14.71669 -11.97829,-26.69498 -26.69497,-26.69498 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#000000;fill-opacity:0.50196078;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter3293)"
+             id="path44012"
+             d="m -237.62978,943.41146 c -21.63445,0 -39.1875,17.34747 -39.1875,38.75 l 0,6.125 c 0,6.05287 6.27536,18.75004 28.90625,18.75004 l 20.53125,0 c 22.63038,0 28.9375,-12.07968 28.9375,-18.75004 l 0,-6.125 c 0,-21.40254 -17.55305,-38.75 -39.1875,-38.75 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#linearGradient44076);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+             id="path44014"
+             d="m -238.37978,942.16146 c -21.63445,0 -39.1875,17.34747 -39.1875,38.75 l 0,6.125 c 0,6.05287 6.27536,18.75004 28.90625,18.75004 l 20.53125,0 c 22.63038,0 28.9375,-12.07968 28.9375,-18.75004 l 0,-6.125 c 0,-21.40254 -17.55305,-38.75 -39.1875,-38.75 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#radialGradient44073);fill-opacity:1;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
+             id="path44016"
+             d="m -238.37978,944.32217 c -20.11022,0 -36.4266,15.9074 -36.4266,35.53322 l 0,5.61655 c 0,5.55039 5.83324,17.19346 26.8697,17.19346 l 19.08475,0 c 21.03599,0 26.89875,-11.07683 26.89875,-17.19346 l 0,-5.61655 c 0,-19.62582 -16.31638,-35.53322 -36.4266,-35.53322 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44070);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path44018"
+             d="m -220.89335,951.63335 c 8.46364,9.0621 14.91528,24.09751 16.80551,38.65267"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#000000;fill-opacity:0;fill-rule:evenodd;stroke:url(#linearGradient44067);stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="path44020"
+             d="m -255.70476,951.63335 c -8.46364,9.0621 -14.91528,24.09751 -16.80551,38.65267"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#c5ffbd;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient44613);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="path44022"
+             d="m -245.07157,955.83473 c -2.3027,1.97418 -4.96223,3.5307 -3.72122,8.28271 -5.66073,-1.14662 -9.94971,-8.89011 -6.36208,-14.40472 l 10.0833,6.12201 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#linearGradient44691);fill-opacity:1;stroke:none;stroke-width:0.85552669;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="path44024"
+             transform="matrix(1.1784451,0,0,0.9316118,-194.72944,886.86434)"
+             d="m -36.972118,84.910487 -5.409768,-9.369991 10.819535,-10e-7 -5.409767,9.369992 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#radialGradient44061);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="path44028"
+             d="m -254.93334,950.41537 9,5.46875 c -0.98816,0.81483 -2.01362,1.64574 -2.75,2.78125 -0.74928,1.1554 -0.98341,2.74156 -0.65625,4.71875 -2.36917,-0.72853 -4.49352,-2.64468 -5.65625,-5.0625 -1.20326,-2.5021 -1.34831,-5.40312 0.0625,-7.90625 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:#9dcfff;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient44625);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+             id="path44621"
+             d="m -231.86267,955.83473 c 2.3027,1.97418 4.96223,3.5307 3.72122,8.28271 5.66073,-1.14662 9.94971,-8.89011 6.36208,-14.40472 l -10.0833,6.12201 z"
+             inkscape:connector-curvature="0" />
+          <path
+             style="fill:url(#radialGradient44048);fill-opacity:1;stroke:url(#linearGradient44677);stroke-width:1.33686185;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+             id="path44030"
+             transform="matrix(1.4960409,0,0,1.4960409,-327.73177,835.09337)"
+             d="m 76.945221,64.499184 a 17.165627,17.165627 0 1 1 -34.331253,0 17.165627,17.165627 0 1 1 34.331253,0 z"
+             inkscape:connector-curvature="0" />
+        </g>
+        <g
+           transform="matrix(0.70295274,-0.0697736,0.0697736,0.70295274,-278.54472,904.97212)"
+           style="display:inline"
+           id="g12375">
+          <path
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="rect4020"
+             d="m 61.55478,99.620729 c 0,0 -13.381069,19.907321 -16.916128,21.034561 -14.217558,1.55684 -16.042689,2.44593 -19.339986,-11.55596 -0.01371,-4.55558 9.273616,-24.122002 9.273616,-24.122002 5.346699,-5.292612 29.278706,10.399614 26.982498,14.643401 z"
+             style="fill:url(#linearGradient4329);fill-opacity:1;stroke:#740000;stroke-width:2.05990887;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <rect
+             transform="matrix(0.85917245,0.51168614,-0.50387058,0.86377916,0,0)"
+             ry="5.7185025"
+             y="-44.031021"
+             x="76.525764"
+             height="18.365309"
+             width="19.846708"
+             id="rect3839"
+             style="fill:#fd7347;fill-opacity:1;stroke:#740000;stroke-width:1.54496348;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cccccc"
+             inkscape:connector-curvature="0"
+             id="path3859"
+             d="m 102.13638,13.44454 c 0.0929,-1.633746 -0.82519,-3.227243 -2.175251,-4.3749744 L 92.270983,4.6284869 C 91.855361,4.42953 90.960906,4.141788 90.960906,4.141788 c 0,0 -0.202747,0.2745373 -0.343409,0.563876 4.199596,2.5399872 9.427013,5.1089 11.518883,8.738876 z"
+             style="fill:#ffddd2;fill-opacity:0.53881273;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="sssssssss"
+             inkscape:connector-curvature="0"
+             id="rect2997"
+             d="m 85.187995,10.047208 13.611422,7.862272 c 4.489163,2.593043 6.006923,8.314933 3.470883,12.868228 L 64.506902,98.579726 C 61.970911,103.13305 59.57107,98.974725 55.693414,95.518214 51.13193,91.452143 47.802933,90.007253 42.081993,87.655942 37.292162,85.687318 32.153086,85.909581 34.689117,81.356284 L 72.45252,13.554268 c 2.536034,-4.5532954 8.246315,-6.1001022 12.735475,-3.50706 z"
+             style="fill:url(#linearGradient4331);fill-opacity:1;stroke:#740000;stroke-width:2.05990887;stroke-miterlimit:4;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path3778"
+             d="m 36.426257,84.157503 c 7.74445,2.004055 16.232897,5.420808 25.232309,14.34351"
+             style="fill:none;stroke:#eec600;stroke-width:3.08986354;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4343"
+             d="M 71.32859,17.834074 C 73.100409,17.02795 99.388044,31.287246 99.341798,33.241473"
+             style="fill:none;stroke:#8489a6;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="sssccss"
+             inkscape:connector-curvature="0"
+             id="rect2997-8"
+             d="m 84.626029,10.828012 13.1728,7.654289 c 3.145631,1.82783 6.502551,6.445207 3.863631,11.217784 l -2.038248,3.686234 C 99.344883,31.088071 73.182696,16.826871 70.997975,17.515756 l 2.58734,-3.887143 c 2.493991,-3.7468975 6.696211,-5.3250519 11.040714,-2.800601 z"
+             style="fill:url(#linearGradient4333);fill-opacity:1;stroke:none" />
+          <ellipse
+             ry="29.367132"
+             rx="7.9648447"
+             cy="44.188427"
+             cx="73.991928"
+             transform="matrix(0.88775881,0.51694512,-0.51161224,0.89701252,32.514528,-33.611428)"
+             id="path3780"
+             style="fill:url(#linearGradient4335);fill-opacity:1;stroke:#323262;stroke-width:1.1651001;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="ccsc"
+             inkscape:connector-curvature="0"
+             id="path3829"
+             d="m 88.99281,18.527704 c 2.815821,3.456414 0.629146,13.298668 -6.066491,27.2507 C 91.013299,31.42609 93.940053,21.098102 90.081477,18.851237 89.75873,18.663303 89.39306,18.552946 88.99281,18.527704 Z"
+             style="fill:#ffffff;fill-opacity:1;stroke:#323262;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cscc"
+             inkscape:connector-curvature="0"
+             id="path3780-3"
+             d="m 69.515059,40.484906 c -8.077002,14.34292 -12.064982,27.132579 -8.208615,29.378153 0.31363,0.182628 0.359545,-0.0091 0.746486,0.01977 -2.767651,-3.505482 0.798224,-15.502882 7.462129,-29.397927 z"
+             style="fill:#ffffff;fill-opacity:1;stroke:#323262;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+          <path
+             transform="matrix(1.0246281,0,0,1.0353085,-2.5856208,-0.03969006)"
+             sodipodi:nodetypes="cccc"
+             inkscape:connector-curvature="0"
+             id="path3857"
+             d="M 91.269872,4.0152495 C 89.954225,3.5593462 88.235758,4.4779631 85.766516,8.405722 l 2.552273,1.672439 z"
+             style="fill:url(#linearGradient4337);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4265)" />
+          <path
+             transform="matrix(1.0246281,0,0,1.0353085,-2.5856208,-0.03969006)"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path3891"
+             d="m 91.342894,5.004722 -1.129071,2.3087209 c 4.628669,1.3173666 6.377738,2.679672 11.290697,7.8242961 0.21376,-0.481885 0.67747,-1.796448 0.70212,-2.152257 C 100.509,9.5774964 92.976773,5.9259487 91.342894,5.004722 Z"
+             style="fill:#d7120a;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3937)" />
+          <path
+             transform="matrix(1.0246281,0,0,1.0353085,-2.5856208,-0.03969006)"
+             sodipodi:nodetypes="ccccc"
+             inkscape:connector-curvature="0"
+             id="path4049"
+             d="M 40.074867,84.723001 C 34.831163,94.669636 28.317353,105.55668 28.995499,113.52936 l 2.769842,2.99142 c 0.487896,-4.8461 5.493327,-17.574056 12.96286,-29.6927 z"
+             style="opacity:0.75486378;fill:#ffeee1;fill-opacity:1;stroke:none;filter:url(#filter4059)" />
+          <path
+             transform="matrix(1.0246281,0,0,1.0353085,-2.5856208,-0.03969006)"
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4063"
+             d="M 39.964073,85.387762 C 34.726162,95.109418 28.756774,105.16669 29.438674,113.19697"
+             style="fill:none;stroke:#ffffff;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4293)" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4215"
+             d="m 24.822151,109.7259 c 2.95315,18.86142 3.512355,16.18009 19.672511,11.21937"
+             style="fill:url(#linearGradient12588);fill-opacity:1;stroke:#1b2eb2;stroke-width:1.02995443px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+          <path
+             sodipodi:nodetypes="cc"
+             inkscape:connector-curvature="0"
+             id="path4069"
+             d="M 44.494662,121.01668 C 45.289319,118.95197 28.795432,109.6112 24.822151,109.7259"
+             style="fill:url(#linearGradient4339);fill-opacity:1;stroke:#740000;stroke-width:1.02995443px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+          <path
+             transform="matrix(1.0246281,0,0,1.0353085,-2.5856208,-0.03969006)"
+             sodipodi:nodetypes="cccccc"
+             inkscape:connector-curvature="0"
+             id="path4079"
+             d="m 30.022911,107.95738 c -0.524422,0.0469 -1.163278,-0.57592 -1.111882,-0.0519 0.276522,3.82947 0.176857,6.18501 2.343025,10.9306 0.261576,-5.07057 -0.628776,-6.11393 -0.372401,-10.26432 -0.03112,-0.53521 -0.325065,-0.66547 -0.858742,-0.61436 z"
+             style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;filter:url(#filter4209);enable-background:accumulate" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/main/inc/lib/agenda.lib.php b/main/inc/lib/agenda.lib.php
index b1e162f4fb..d8e53deb84 100644
--- a/main/inc/lib/agenda.lib.php
+++ b/main/inc/lib/agenda.lib.php
@@ -2459,23 +2459,31 @@ class Agenda
      */
     public function displayActions($view, $filter = 0)
     {
-        $courseInfo = api_get_course_info();
-
-        $actions = "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php?type={$this->type}'>".
+        $courseInfo = api_get_course_info();     
+        
+        $toolbar = '';
+        $toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_js.php?type={$this->type}'>".
             Display::return_icon('calendar.png', get_lang('Calendar'), '', ICON_SIZE_MEDIUM)."</a>";
 
         $courseCondition = '';
         if (!empty($courseInfo)) {
             $courseCondition = api_get_cidreq();
         }
-        $actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_list.php?type={$this->type}&".$courseCondition."'>".
+        
+        $toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda_list.php?type={$this->type}&".$courseCondition."'>".
             Display::return_icon('week.png', get_lang('AgendaList'), '', ICON_SIZE_MEDIUM)."</a>";
-
+        
+       
         if (api_is_allowed_to_edit(false, true) ||
             (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()) && api_is_allowed_to_session_edit(false, true) ||
             GroupManager::user_has_access(api_get_user_id(), api_get_group_id(), GroupManager::GROUP_TOOL_CALENDAR) &&
             GroupManager::is_tutor_of_group(api_get_user_id(), api_get_group_id())
         ) {
+            $toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=add&type=course'>".
+                    Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM)."</a>";
+            $toolbar .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=importical&type=course'>".
+                    Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM)."</a>";
+            
             if ($this->type == 'course') {
                 $form = null;
                 if (!isset($_GET['action'])) {
@@ -2495,17 +2503,10 @@ class Agenda
                     $selectedValues = $this->parseAgendaFilter($filter);
                     $this->showToForm($form, $selectedValues, $attributes);
                     $form = $form->returnForm();
-                }
-                $actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=add&type=course'>".
-                    Display::return_icon('new_event.png', get_lang('AgendaAdd'), '', ICON_SIZE_MEDIUM)."</a>";
-                $actions .= "<a href='".api_get_path(WEB_CODE_PATH)."calendar/agenda.php?".api_get_cidreq()."&action=importical&type=course'>".
-                    Display::return_icon('import_calendar.png', get_lang('ICalFileImport'), '', ICON_SIZE_MEDIUM)."</a>";
-                if ($view == 'calendar') {
-                    $actions .= $form;
-                }
+                }   
             }
         }
-
+         
         if (api_is_platform_admin() ||
             api_is_teacher() ||
             api_is_student_boss() ||
@@ -2541,12 +2542,19 @@ class Agenda
                     $form->addButtonReset(get_lang('Reset'));
                     $form = $form->returnForm();
                 }
-
-                if ($view == 'calendar') {
-                    $actions .= $form;
-                }
             }
         }
+        
+        $actions = '<div class="row">';
+        $actions .= '<div class="col-md-9">';
+        if ($view == 'calendar') {
+            $actions .= $form;
+        }
+        $actions .= '</div>';
+        $actions .= '<div class="col-md-3 right">';
+        $actions .= $toolbar; 
+        $actions .= '</div>';
+        $actions .= '</div>';
 
         return $actions;
     }
diff --git a/main/inc/lib/formvalidator/Element/SelectAjax.php b/main/inc/lib/formvalidator/Element/SelectAjax.php
index 7fa925ab63..66c07b2114 100644
--- a/main/inc/lib/formvalidator/Element/SelectAjax.php
+++ b/main/inc/lib/formvalidator/Element/SelectAjax.php
@@ -46,7 +46,7 @@ class SelectAjax extends HTML_QuickForm_select
         $defaultValues = empty($defaultValues) ? [] : $defaultValues;
 
         $width = 'element';
-        $givenWidth = $this->getAttribute('width');
+        $givenWidth = '300';
         if (!empty($givenWidth)) {
             $width = $givenWidth;
         }
diff --git a/main/inc/lib/javascript/chosen/chosen.css b/main/inc/lib/javascript/chosen/chosen.css
index d995fa51b0..c8f5a3e554 100755
--- a/main/inc/lib/javascript/chosen/chosen.css
+++ b/main/inc/lib/javascript/chosen/chosen.css
@@ -162,8 +162,8 @@ This file is generated by `grunt build`, do not edit it by hand.
   position: relative;
   overflow-x: hidden;
   overflow-y: auto;
-  margin: 0 4px 4px 0;
-  padding: 0 0 0 4px;
+  margin: 0;
+  padding: 0;
   max-height: 240px;
   -webkit-overflow-scrolling: touch;
 }
diff --git a/main/inc/lib/pear/HTML/QuickForm/select.php b/main/inc/lib/pear/HTML/QuickForm/select.php
index d885c4e8be..4a7c76a768 100755
--- a/main/inc/lib/pear/HTML/QuickForm/select.php
+++ b/main/inc/lib/pear/HTML/QuickForm/select.php
@@ -550,7 +550,7 @@ class HTML_QuickForm_select extends HTML_QuickForm_element
                 $this->setName($myName);
             }
 
-            $strHtml .= $tabs . '<select' . $attrString . ">\n";
+            $strHtml .= $tabs . '<select class="chzn-select"' . $attrString . ">\n";
 
             $strValues = is_array($this->_values)? array_map('strval', $this->_values): array();
 
diff --git a/main/session/session_category_add.php b/main/session/session_category_add.php
index cedaec46cd..0b841f50f2 100644
--- a/main/session/session_category_add.php
+++ b/main/session/session_category_add.php
@@ -64,170 +64,170 @@ if (!empty($return)) {
 	Display::display_error_message($return,false);
 }
 ?>
-<form method="post" name="form" action="<?php echo api_get_self(); ?>" style="margin:0px;">
-<input type="hidden" name="formSent" value="1">
-<legend><?php echo $tool_name; ?></legend>
-<table border="0" cellpadding="5" cellspacing="0" width="550">
-<tr>
-  <td width="30%"><?php echo get_lang('SessionCategoryName') ?>&nbsp;&nbsp;</td>
-  <td width="70%"><input type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); ?>"></td>
-</tr>
-<tr >
-<td colspan="2">
-	<a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('AddTimeLimit') ?></a>
-		<div style="display: none" id="options">
-	<br>
-	<div>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr><td colspan="2"><?php echo get_lang('TheTimeLimitsAreReferential');?></td>
-</tr>
-<tr>
-  <td width="20%"><?php echo get_lang('DateStart') ?>&nbsp;&nbsp;</td>
-  <td width="80%">
-  <select name="day_start">
-	<option value="1">01</option>
-	<option value="2" <?php if((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) echo 'selected="selected"'; ?> >12</option>
-	<option value="13" <?php if((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) echo 'selected="selected"'; ?> >13</option>
-	<option value="14" <?php if((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) echo 'selected="selected"'; ?> >14</option>
-	<option value="15" <?php if((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) echo 'selected="selected"'; ?> >15</option>
-	<option value="16" <?php if((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) echo 'selected="selected"'; ?> >16</option>
-	<option value="17" <?php if((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) echo 'selected="selected"'; ?> >17</option>
-	<option value="18" <?php if((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) echo 'selected="selected"'; ?> >18</option>
-	<option value="19" <?php if((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) echo 'selected="selected"'; ?> >19</option>
-	<option value="20" <?php if((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) echo 'selected="selected"'; ?> >20</option>
-	<option value="21" <?php if((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) echo 'selected="selected"'; ?> >21</option>
-	<option value="22" <?php if((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) echo 'selected="selected"'; ?> >22</option>
-	<option value="23" <?php if((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) echo 'selected="selected"'; ?> >23</option>
-	<option value="24" <?php if((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) echo 'selected="selected"'; ?> >24</option>
-	<option value="25" <?php if((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) echo 'selected="selected"'; ?> >25</option>
-	<option value="26" <?php if((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) echo 'selected="selected"'; ?> >26</option>
-	<option value="27" <?php if((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) echo 'selected="selected"'; ?> >27</option>
-	<option value="28" <?php if((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) echo 'selected="selected"'; ?> >28</option>
-	<option value="29" <?php if((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) echo 'selected="selected"'; ?> >29</option>
-	<option value="30" <?php if((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) echo 'selected="selected"'; ?> >30</option>
-	<option value="31" <?php if((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) echo 'selected="selected"'; ?> >31</option>
-  </select>
-  /
-  <select name="month_start">
-	<option value="1">01</option>
-	<option value="2" <?php if((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) echo 'selected="selected"'; ?> >12</option>
-  </select>
-  /
-  <select name="year_start">
-
-<?php
-for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
-?>
-	<option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
-<?php
-}
-?>
-
-  </select>
-  </td>
-</tr>
-<tr>
-  <td width="20%"><?php echo get_lang('DateEnd') ?>&nbsp;&nbsp;</td>
-  <td width="80%">
-  <select name="day_end">
-	<option value="0">--</option>
-    <option value="1">01</option>
-	<option value="2">02</option>
-	<option value="3">03</option>
-	<option value="4">04</option>
-	<option value="5">05</option>
-	<option value="6">06</option>
-	<option value="7">07</option>
-	<option value="8">08</option>
-	<option value="9">09</option>
-	<option value="10">10</option>
-	<option value="11">11</option>
-	<option value="12">12</option>
-	<option value="13">13</option>
-	<option value="14">14</option>
-	<option value="15">15</option>
-	<option value="16">16</option>
-	<option value="17">17</option>
-	<option value="18">18</option>
-	<option value="19">19</option>
-	<option value="20">20</option>
-	<option value="21">21</option>
-	<option value="22">22</option>
-	<option value="23">23</option>
-	<option value="24">24</option>
-	<option value="25">25</option>
-	<option value="26">26</option>
-	<option value="27">27</option>
-	<option value="28">28</option>
-	<option value="29">29</option>
-	<option value="30">30</option>
-	<option value="31">31</option>
-  </select>
-  /
-  <select name="month_end">
-	<option value="0">--</option>
-    <option value="1">01</option>
-	<option value="2">02</option>
-	<option value="3">03</option>
-	<option value="4">04</option>
-	<option value="5">05</option>
-	<option value="6">06</option>
-	<option value="7">07</option>
-	<option value="8">08</option>
-	<option value="9">09</option>
-	<option value="10">10</option>
-	<option value="11">11</option>
-	<option value="12">12</option>
-  </select>
-  /
-  <select name="year_end">
-    <option value="0">----</option>
-<?php
-for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
-?>
-	<option value="<?php echo $i; ?>"><?php echo $i; ?></option>
-<?php
-}
-?>
-  </select>
-  </td>
-</tr>
-
-</table>
-</div>
-<br>
+<div class="row">
+    <div class="col-md-12">
+        <form method="post" name="form" action="<?php echo api_get_self(); ?>" class="form-horizontal">
+            <input type="hidden" name="formSent" value="1">
+            <legend><?php echo $tool_name; ?></legend>
+            <div class="form-group">
+                <label class="col-sm-3 control-label"><?php echo get_lang('SessionCategoryName') ?></label>
+                <div class="col-sm-6">
+                    <input type="text" class="form-control" name="name" placeholder="<?php echo get_lang('Category') ?>" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); ?>">
+                </div>
+                <div class="col-md-3"></div>
+            </div>
+            <div class="form-group">
+                <div class="col-sm-offset-3 col-sm-6">
+                    <?php echo get_lang('TheTimeLimitsAreReferential');?> <a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('AddTimeLimit') ?></a>
+                </div>
+                <div class="col-md-3"></div>
+            </div>
+            
+            <div style="display: none" id="options">
+            
+            <div class="form-group">
+                <label class="col-sm-3 control-label"><?php echo get_lang('DateStart') ?></label>
+                <div class="col-sm-6">
+                    <select name="day_start">
+                        <option value="1">01</option>
+                        <option value="2" <?php if((!$formSent && $thisDay == 2) || ($formSent && $day_start == 2)) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if((!$formSent && $thisDay == 3) || ($formSent && $day_start == 3)) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if((!$formSent && $thisDay == 4) || ($formSent && $day_start == 4)) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if((!$formSent && $thisDay == 5) || ($formSent && $day_start == 5)) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if((!$formSent && $thisDay == 6) || ($formSent && $day_start == 6)) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if((!$formSent && $thisDay == 7) || ($formSent && $day_start == 7)) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if((!$formSent && $thisDay == 8) || ($formSent && $day_start == 8)) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if((!$formSent && $thisDay == 9) || ($formSent && $day_start == 9)) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if((!$formSent && $thisDay == 10) || ($formSent && $day_start == 10)) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if((!$formSent && $thisDay == 11) || ($formSent && $day_start == 11)) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if((!$formSent && $thisDay == 12) || ($formSent && $day_start == 12)) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if((!$formSent && $thisDay == 13) || ($formSent && $day_start == 13)) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if((!$formSent && $thisDay == 14) || ($formSent && $day_start == 14)) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if((!$formSent && $thisDay == 15) || ($formSent && $day_start == 15)) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if((!$formSent && $thisDay == 16) || ($formSent && $day_start == 16)) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if((!$formSent && $thisDay == 17) || ($formSent && $day_start == 17)) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if((!$formSent && $thisDay == 18) || ($formSent && $day_start == 18)) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if((!$formSent && $thisDay == 19) || ($formSent && $day_start == 19)) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if((!$formSent && $thisDay == 20) || ($formSent && $day_start == 20)) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if((!$formSent && $thisDay == 21) || ($formSent && $day_start == 21)) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if((!$formSent && $thisDay == 22) || ($formSent && $day_start == 22)) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if((!$formSent && $thisDay == 23) || ($formSent && $day_start == 23)) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if((!$formSent && $thisDay == 24) || ($formSent && $day_start == 24)) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if((!$formSent && $thisDay == 25) || ($formSent && $day_start == 25)) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if((!$formSent && $thisDay == 26) || ($formSent && $day_start == 26)) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if((!$formSent && $thisDay == 27) || ($formSent && $day_start == 27)) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if((!$formSent && $thisDay == 28) || ($formSent && $day_start == 28)) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if((!$formSent && $thisDay == 29) || ($formSent && $day_start == 29)) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if((!$formSent && $thisDay == 30) || ($formSent && $day_start == 30)) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if((!$formSent && $thisDay == 31) || ($formSent && $day_start == 31)) echo 'selected="selected"'; ?> >31</option>
+                    </select>
+                    /
+                    <select name="month_start">
+                          <option value="1">01</option>
+                          <option value="2" <?php if((!$formSent && $thisMonth == 2) || ($formSent && $month_start == 2)) echo 'selected="selected"'; ?> >02</option>
+                          <option value="3" <?php if((!$formSent && $thisMonth == 3) || ($formSent && $month_start == 3)) echo 'selected="selected"'; ?> >03</option>
+                          <option value="4" <?php if((!$formSent && $thisMonth == 4) || ($formSent && $month_start == 4)) echo 'selected="selected"'; ?> >04</option>
+                          <option value="5" <?php if((!$formSent && $thisMonth == 5) || ($formSent && $month_start == 5)) echo 'selected="selected"'; ?> >05</option>
+                          <option value="6" <?php if((!$formSent && $thisMonth == 6) || ($formSent && $month_start == 6)) echo 'selected="selected"'; ?> >06</option>
+                          <option value="7" <?php if((!$formSent && $thisMonth == 7) || ($formSent && $month_start == 7)) echo 'selected="selected"'; ?> >07</option>
+                          <option value="8" <?php if((!$formSent && $thisMonth == 8) || ($formSent && $month_start == 8)) echo 'selected="selected"'; ?> >08</option>
+                          <option value="9" <?php if((!$formSent && $thisMonth == 9) || ($formSent && $month_start == 9)) echo 'selected="selected"'; ?> >09</option>
+                          <option value="10" <?php if((!$formSent && $thisMonth == 10) || ($formSent && $month_start == 10)) echo 'selected="selected"'; ?> >10</option>
+                          <option value="11" <?php if((!$formSent && $thisMonth == 11) || ($formSent && $month_start == 11)) echo 'selected="selected"'; ?> >11</option>
+                          <option value="12" <?php if((!$formSent && $thisMonth == 12) || ($formSent && $month_start == 12)) echo 'selected="selected"'; ?> >12</option>
+                    </select>
+                    /
+                      <select name="year_start">
+                      <?php
+                      for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                      ?>
+                              <option value="<?php echo $i; ?>" <?php if((!$formSent && $thisYear == $i) || ($formSent && $year_start == $i)) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                      <?php
+                      }
+                      ?>
+                        </select>
+                </div>
+                <div class="col-md-3"></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label"><?php echo get_lang('DateEnd') ?></label>
+                <div class="col-sm-6">
+                    <select name="day_end">
+                        <option value="0">--</option>
+                        <option value="1">01</option>
+                        <option value="2">02</option>
+                        <option value="3">03</option>
+                        <option value="4">04</option>
+                        <option value="5">05</option>
+                        <option value="6">06</option>
+                        <option value="7">07</option>
+                        <option value="8">08</option>
+                        <option value="9">09</option>
+                        <option value="10">10</option>
+                        <option value="11">11</option>
+                        <option value="12">12</option>
+                        <option value="13">13</option>
+                        <option value="14">14</option>
+                        <option value="15">15</option>
+                        <option value="16">16</option>
+                        <option value="17">17</option>
+                        <option value="18">18</option>
+                        <option value="19">19</option>
+                        <option value="20">20</option>
+                        <option value="21">21</option>
+                        <option value="22">22</option>
+                        <option value="23">23</option>
+                        <option value="24">24</option>
+                        <option value="25">25</option>
+                        <option value="26">26</option>
+                        <option value="27">27</option>
+                        <option value="28">28</option>
+                        <option value="29">29</option>
+                        <option value="30">30</option>
+                        <option value="31">31</option>
+                  </select>
+                  /
+                  <select name="month_end">
+                        <option value="0">--</option>
+                        <option value="1">01</option>
+                        <option value="2">02</option>
+                        <option value="3">03</option>
+                        <option value="4">04</option>
+                        <option value="5">05</option>
+                        <option value="6">06</option>
+                        <option value="7">07</option>
+                        <option value="8">08</option>
+                        <option value="9">09</option>
+                        <option value="10">10</option>
+                        <option value="11">11</option>
+                        <option value="12">12</option>
+                  </select>
+                  /
+                <select name="year_end">
+                  <option value="0">----</option>
+                    <?php
+                        for ($i=$thisYear-5;$i <= ($thisYear+5);$i++) {
+                        ?>
+                                <option value="<?php echo $i; ?>"><?php echo $i; ?></option>
+                    <?php
+                        }
+                    ?>
+                </select>
+                </div>
+                <div class="col-md-3">
+                    
+                </div>
+            </div>
+            </div>    
+            <div class="form-group">
+                <div class="col-sm-offset-3 col-sm-6">
+                    <button class="btn btn-success" type="submit" value="<?php echo get_lang('AddACategory') ?>"><i class="fa fa-plus"></i> <?php echo get_lang('AddACategory') ?></button>
+                </div>
+                <div class="col-md-3"></div>
+            </div>
+           
+        </form>
 </div>
-</td>
-</tr>
-<tr>
-  <td>&nbsp;</td>
-  <td><button class="save" type="submit" value="<?php echo get_lang('AddACategory') ?>"><?php echo get_lang('AddACategory') ?></button>
- </td>
-</tr>
-
-</table>
-
-</form>
 <script type="text/javascript">
 function setDisable(select) {
 	document.form.day_start.disabled = (select.checked) ? true : false;
diff --git a/main/session/session_category_edit.php b/main/session/session_category_edit.php
index 571321c70a..3d8f5a9ed1 100644
--- a/main/session/session_category_edit.php
+++ b/main/session/session_category_edit.php
@@ -76,166 +76,167 @@ if (!empty($return)) {
 	Display::display_error_message($return,false);
 }
 ?>
-<form method="post" name="form" action="<?php echo api_get_self(); ?>?id=<?php echo $id; ?>">
-<input type="hidden" name="formSent" value="1">
-<legend><?php echo $tool_name;?> </legend>
-<table border="0" cellpadding="5" cellspacing="0" width="550">
-<tr>
-  <td width="30%"><?php echo get_lang('SessionName') ?>&nbsp;&nbsp;</td>
-  <td width="70%"><input type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>"></td>
-</tr>
-<td colspan="2">
-	<a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('EditTimeLimit') ?></a>
-		<div style="display: <?php if($formSent && ($coachAccessStartDate!='0000-00-00 00:00:00' || $coachAccessEndDate!='0000-00-00 00:00:00')) echo 'block'; else echo 'none'; ?>;" id="options">
-	<br>
-	<div>
-<table border="0" cellpadding="5" cellspacing="0" width="100%">
-<tr><td colspan="2"><?php echo get_lang('TheTimeLimitsAreReferential');?></td>
-</tr>
-<tr>
-  <td width="20%"><?php echo get_lang('DateStart') ?>&nbsp;&nbsp;</td>
-  <td width="80%">
-  <select name="day_start">
-	<option value="1">01</option>
-	<option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option>
-	<option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option>
-	<option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option>
-	<option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option>
-	<option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option>
-	<option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option>
-	<option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option>
-	<option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option>
-	<option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option>
-	<option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option>
-	<option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option>
-	<option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option>
-	<option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option>
-	<option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option>
-	<option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option>
-	<option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option>
-	<option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option>
-	<option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option>
-	<option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option>
-	<option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option>
-  </select>
-  /
-  <select name="month_start">
-	<option value="1">01</option>
-	<option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option>
-  </select>
-  /
-  <select name="year_start">
-<?php
-for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
-{ ?>
-	<option value="<?php echo $i; ?>" <?php if($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
-<?php
-} ?>
-  </select>
-  </td>
-</tr>
-<tr>
-  <td width="20%"><?php echo get_lang('DateEnd') ?>&nbsp;&nbsp;</td>
-  <td width="80%">
-  <select name="day_end">
-	<option value="0">--</option>
-	<option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option>
-	<option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option>
-	<option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option>
-	<option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option>
-	<option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option>
-	<option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option>
-	<option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option>
-	<option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option>
-	<option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option>
-	<option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option>
-	<option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option>
-	<option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option>
-	<option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option>
-	<option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option>
-	<option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option>
-	<option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option>
-	<option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option>
-	<option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option>
-	<option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option>
-	<option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option>
-	<option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option>
-  </select>
-  /
-  <select name="month_end">
-	<option value="0">--</option>
-	<option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option>
-	<option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option>
-	<option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option>
-	<option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option>
-	<option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option>
-	<option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option>
-	<option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option>
-	<option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option>
-	<option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option>
-	<option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option>
-	<option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option>
-	<option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option>
-  </select>
-  /
-  <select name="year_end">
-     <option value="0">----</option>
-    <?php
-    for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
-    { ?>
-     <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
-    <?php
-} ?>
-  </select>
-  </td>
-</tr>
-
-</table>
+<div class="row">
+    <div class="col-md-12">
+        <form method="post" name="form" action="<?php echo api_get_self(); ?>?id=<?php echo $id; ?>" class="form-horizontal">
+        <input type="hidden" name="formSent" value="1">
+        <legend><?php echo $tool_name;?> </legend>
+        <div class="form-group">
+            <label class="col-sm-3 control-label"><?php echo get_lang('SessionName') ?></label>
+            <div class="col-sm-6">
+                <input class="form-control" type="text" name="name" size="50" maxlength="50" value="<?php if($formSent) echo api_htmlentities($name,ENT_QUOTES,$charset); else echo api_htmlentities($infos['name'],ENT_QUOTES,$charset); ?>">
+            </div>
+            <div class="col-sm-3"></div>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-offset-3 col-sm-6">
+                <?php echo get_lang('TheTimeLimitsAreReferential');?>
+                <a href="javascript://" onclick="if(document.getElementById('options').style.display == 'none'){document.getElementById('options').style.display = 'block';}else{document.getElementById('options').style.display = 'none';}"><?php echo get_lang('EditTimeLimit') ?></a>
+            </div>
+        </div>
+        <div style="display: <?php if($formSent && ($coachAccessStartDate!='0000-00-00 00:00:00' || $coachAccessEndDate!='0000-00-00 00:00:00')) echo 'block'; else echo 'none'; ?>;" id="options">
+            <div class="form-group">
+                <label class="col-sm-3 control-label"><?php echo get_lang('DateStart') ?></label>
+                <div class="col-sm-6">
+                    <select name="day_start">
+                        <option value="1">01</option>
+                        <option value="2" <?php if($day_start == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if($day_start == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if($day_start == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if($day_start == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if($day_start == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if($day_start == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if($day_start == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if($day_start == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if($day_start == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if($day_start == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if($day_start == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if($day_start == 13) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if($day_start == 14) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if($day_start == 15) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if($day_start == 16) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if($day_start == 17) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if($day_start == 18) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if($day_start == 19) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if($day_start == 20) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if($day_start == 21) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if($day_start == 22) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if($day_start == 23) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if($day_start == 24) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if($day_start == 25) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if($day_start == 26) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if($day_start == 27) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if($day_start == 28) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if($day_start == 29) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if($day_start == 30) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if($day_start == 31) echo 'selected="selected"'; ?> >31</option>
+                  </select>
+                  /
+                  <select name="month_start">
+                        <option value="1">01</option>
+                        <option value="2" <?php if($month_start == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if($month_start == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if($month_start == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if($month_start == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if($month_start == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if($month_start == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if($month_start == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if($month_start == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if($month_start == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if($month_start == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if($month_start == 12) echo 'selected="selected"'; ?> >12</option>
+                  </select>
+                  /
+                <select name="year_start">
+                        <?php
+                        for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
+                        { ?>
+                                <option value="<?php echo $i; ?>" <?php if($year_start == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                        <?php
+                        } ?>
+                </select>
+                </div>
+                <div class="col-sm-3"></div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label"><?php echo get_lang('DateEnd') ?></label>
+                <div class="col-sm-6">
+                    <select name="day_end">
+                        <option value="0">--</option>
+                        <option value="1" <?php if($day_end == 1) echo 'selected="selected"'; ?> >01</option>
+                        <option value="2" <?php if($day_end == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if($day_end == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if($day_end == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if($day_end == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if($day_end == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if($day_end == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if($day_end == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if($day_end == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if($day_end == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if($day_end == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if($day_end == 12) echo 'selected="selected"'; ?> >12</option>
+                        <option value="13" <?php if($day_end == 13) echo 'selected="selected"'; ?> >13</option>
+                        <option value="14" <?php if($day_end == 14) echo 'selected="selected"'; ?> >14</option>
+                        <option value="15" <?php if($day_end == 15) echo 'selected="selected"'; ?> >15</option>
+                        <option value="16" <?php if($day_end == 16) echo 'selected="selected"'; ?> >16</option>
+                        <option value="17" <?php if($day_end == 17) echo 'selected="selected"'; ?> >17</option>
+                        <option value="18" <?php if($day_end == 18) echo 'selected="selected"'; ?> >18</option>
+                        <option value="19" <?php if($day_end == 19) echo 'selected="selected"'; ?> >19</option>
+                        <option value="20" <?php if($day_end == 20) echo 'selected="selected"'; ?> >20</option>
+                        <option value="21" <?php if($day_end == 21) echo 'selected="selected"'; ?> >21</option>
+                        <option value="22" <?php if($day_end == 22) echo 'selected="selected"'; ?> >22</option>
+                        <option value="23" <?php if($day_end == 23) echo 'selected="selected"'; ?> >23</option>
+                        <option value="24" <?php if($day_end == 24) echo 'selected="selected"'; ?> >24</option>
+                        <option value="25" <?php if($day_end == 25) echo 'selected="selected"'; ?> >25</option>
+                        <option value="26" <?php if($day_end == 26) echo 'selected="selected"'; ?> >26</option>
+                        <option value="27" <?php if($day_end == 27) echo 'selected="selected"'; ?> >27</option>
+                        <option value="28" <?php if($day_end == 28) echo 'selected="selected"'; ?> >28</option>
+                        <option value="29" <?php if($day_end == 29) echo 'selected="selected"'; ?> >29</option>
+                        <option value="30" <?php if($day_end == 30) echo 'selected="selected"'; ?> >30</option>
+                        <option value="31" <?php if($day_end == 31) echo 'selected="selected"'; ?> >31</option>
+                  </select>
+                  /
+                  <select name="month_end">
+                        <option value="0">--</option>
+                        <option value="1" <?php if($month_end == 1) echo 'selected="selected"'; ?> >01</option>
+                        <option value="2" <?php if($month_end == 2) echo 'selected="selected"'; ?> >02</option>
+                        <option value="3" <?php if($month_end == 3) echo 'selected="selected"'; ?> >03</option>
+                        <option value="4" <?php if($month_end == 4) echo 'selected="selected"'; ?> >04</option>
+                        <option value="5" <?php if($month_end == 5) echo 'selected="selected"'; ?> >05</option>
+                        <option value="6" <?php if($month_end == 6) echo 'selected="selected"'; ?> >06</option>
+                        <option value="7" <?php if($month_end == 7) echo 'selected="selected"'; ?> >07</option>
+                        <option value="8" <?php if($month_end == 8) echo 'selected="selected"'; ?> >08</option>
+                        <option value="9" <?php if($month_end == 9) echo 'selected="selected"'; ?> >09</option>
+                        <option value="10" <?php if($month_end == 10) echo 'selected="selected"'; ?> >10</option>
+                        <option value="11" <?php if($month_end == 11) echo 'selected="selected"'; ?> >11</option>
+                        <option value="12" <?php if($month_end == 12) echo 'selected="selected"'; ?> >12</option>
+                  </select>
+                  /
+                  <select name="year_end">
+                        <option value="0">----</option>
+                        <?php
+                        for($i=$thisYear-5;$i <= ($thisYear+5);$i++)
+                        { ?>
+                         <option value="<?php echo $i; ?>" <?php if($year_end == $i) echo 'selected="selected"'; ?> ><?php echo $i; ?></option>
+                        <?php
+                        } ?>
+                 </select>
+                </div>
+                <div class="col-sm-3"></div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-offset-3 col-sm-6">
+                <button class="btn btn-success" type="submit" value="<?php echo get_lang('ModifyThisSession') ?>">
+                    <?php echo get_lang('ModifyThisSession') ?>
+                </button>
+            </div>
+        </div>
+    </form>
+    </div>
 </div>
-<br>
-</div>
-</td>
-</tr>
-<tr>
-  <td>&nbsp;</td>
-  <td>
-<button class="save" type="submit" value="<?php echo get_lang('ModifyThisSession') ?>">
-    <?php echo get_lang('ModifyThisSession') ?></button>
 
-  </td>
-</tr>
-</table>
-</form>
+
 <script>
 <?php if($year_start=="0000") echo "setDisable(document.form.nolimit);\r\n"; ?>
 function setDisable(select){
diff --git a/main/session/session_category_list.php b/main/session/session_category_list.php
index 47fa65c626..ae57dbc60a 100644
--- a/main/session/session_category_list.php
+++ b/main/session/session_category_list.php
@@ -109,21 +109,27 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
     ?>
 
     <div class="actions">
-        <?php
-        echo '<div style="float:right;">
-			<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_add.php">'.Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>
-			<a href="'.api_get_path(WEB_CODE_PATH).'session/session_list.php">'.Display::return_icon('session.png', get_lang('ListSession'), '', ICON_SIZE_MEDIUM).'</a>
-	 	  </div>';
-        ?>
-        <form method="POST" action="session_category_list.php" class="form-inline">
-            <div class="form-group">
-            <input class="form-control" type="text" name="keyword" value="<?php echo $keyword; ?>"/>
-            <button class="btn btn-default" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><i class="fa fa-search"></i> <?php echo get_lang('Search') ?></button>
-            <!-- <a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a> -->
-             </div>
-        </form>
-        <form method="post" action="<?php echo api_get_self(); ?>?action=delete&sort=<?php echo $sort; ?>" onsubmit="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
-    </div><br />
+        <div class="row">
+            <div class="col-md-6">
+              <?php
+                echo '<a href="'.api_get_path(WEB_CODE_PATH).'session/session_category_add.php">'.Display::return_icon('new_folder.png', get_lang('AddSessionCategory'), '', ICON_SIZE_MEDIUM).'</a>
+                      <a href="'.api_get_path(WEB_CODE_PATH).'session/session_list.php">'.Display::return_icon('session.png', get_lang('ListSession'), '', ICON_SIZE_MEDIUM).'</a>';
+            ?>  
+            </div>
+            <div class="col-md-6">
+                <div class="pull-right">
+                <form method="POST" action="session_category_list.php" class="form-inline">
+                    <div class="form-group">
+                    <input class="form-control" type="text" name="keyword" value="<?php echo $keyword; ?>"/>
+                    <button class="btn btn-default" type="submit" name="name" value="<?php echo get_lang('Search') ?>"><i class="fa fa-search"></i> <?php echo get_lang('Search') ?></button>
+                    <!-- <a href="session_list.php?search=advanced"><?php echo get_lang('AdvancedSearch'); ?></a> -->
+                    </div>
+                </form>
+                </div>    
+            </div>
+        </div>
+    <form method="post" action="<?php echo api_get_self(); ?>?action=delete&sort=<?php echo $sort; ?>" onsubmit="javascript:if(!confirm('<?php echo get_lang('ConfirmYourChoice'); ?>')) return false;">
+    </div>
     <div align="left">
         <?php
         if (count($Sessions) == 0 && isset($_POST['keyword'])) {
@@ -151,7 +157,7 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
             }
             ?>
         </div>
-        <br />
+        
         <table class="data_table" width="100%">
             <tr>
                 <th>&nbsp;</th>
@@ -226,13 +232,16 @@ if (isset($_GET['search']) && $_GET['search'] == 'advanced') {
             }
             ?>
         </div>
-        <br />
-        <a href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'true');return false;"><?php echo get_lang('SelectAll') ?></a>&nbsp;-&nbsp;
-        <a href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'false');return false;"><?php echo get_lang('UnSelectAll') ?></a>
-        <select name="action">
-            <option value="delete_off_session" selected="selected"><?php echo get_lang('DeleteSelectedSessionCategory'); ?></option>
-            <option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option>
-        </select>
+        <div class="btn-group">
+            <a class="btn btn-default" href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'true');return false;"><?php echo get_lang('SelectAll') ?></a>
+            <a class="btn btn-default" href="#" onclick="selectAll('idChecked',<?php echo $x; ?>,'false');return false;"><?php echo get_lang('UnSelectAll') ?></a>
+        </div>
+        <div class="list-category">
+            <select class="chzn-select" name="action">
+                <option value="delete_off_session" selected="selected"><?php echo get_lang('DeleteSelectedSessionCategory'); ?></option>
+                <option value="delete_on_session"><?php echo get_lang('DeleteSelectedFullSessionCategory'); ?></option>
+            </select>
+        </div>
         <button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('Ok') ?>"><?php echo get_lang('Ok') ?></button>
     <?php } ?>
     </table>
diff --git a/main/session/session_list.php b/main/session/session_list.php
index 19ba7edc77..4389c4e6ed 100644
--- a/main/session/session_list.php
+++ b/main/session/session_list.php
@@ -323,7 +323,10 @@ if (api_is_platform_admin()) {
     echo '</div>';
 }
 echo '</div>';
+echo '<div id="session-list" class="table-responsive">';
 echo Display::grid_html('sessions');
+echo '</div>';
+
 Display::display_footer();
 
 
diff --git a/main/user/user.php b/main/user/user.php
index f022d643ba..556fed3f7c 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -942,18 +942,13 @@ if (api_is_allowed_to_edit(null, true)) {
             $url = api_get_path(WEB_CODE_PATH).'user/subscribe_user.php?'.api_get_cidreq().'&type='.COURSEMANAGER;
             break;
     }
-
+    
+    echo '<div class="row">';
+    echo '<div class="col-md-6">';
     echo Display::url(
         Display::return_icon('add.png', get_lang('Add'), '', ICON_SIZE_MEDIUM),
         $url
     );
-
-    // Build search-form
-    $form = new FormValidator('search_user', 'get', '', '', null, FormValidator::LAYOUT_INLINE);
-    $form->addText('keyword', '', false);
-    $form->addButtonSearch(get_lang('SearchButton'));
-    $form->display();
-
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&type=csv">'.
         Display::return_icon('export_csv.png', get_lang('ExportAsCSV'),'',ICON_SIZE_MEDIUM).'</a> ';
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&type=xls">'.
@@ -968,14 +963,27 @@ if (api_is_allowed_to_edit(null, true)) {
 
     $actions .= '<a href="user.php?'.api_get_cidreq().'&action=export&type=pdf">'.
         Display::return_icon('pdf.png', get_lang('ExportToPDF'),'',ICON_SIZE_MEDIUM).'</a> ';
-
+    echo $actions;
+    
+    echo '</div>';
+    echo '<div class="col-md-6">';
+    echo '<div class="pull-right">';
+        // Build search-form
+        $form = new FormValidator('search_user', 'get', '', '', null, FormValidator::LAYOUT_INLINE);
+        $form->addText('keyword', '', false);
+        $form->addButtonSearch(get_lang('SearchButton'));
+        $form->display();
+    echo '</div>';    
+    echo '</div>';
+    echo '</div>';
+    
     $allowTutors = api_get_setting('allow_tutors_to_assign_students_to_session');
     if (api_is_allowed_to_edit() && $allowTutors == 'true') {
         $actions .= ' <a class="btn btn-default" href="session_list.php?'.api_get_cidreq().'">'.
             get_lang('Sessions').'</a>';
     }
 
-    echo $actions;
+   
 
     echo '</div>';
 }
diff --git a/main/work/work.lib.php b/main/work/work.lib.php
index b31e84dc56..4c58c9cf49 100755
--- a/main/work/work.lib.php
+++ b/main/work/work.lib.php
@@ -49,6 +49,8 @@ function display_action_links($id, $cur_dir_path, $action)
             $display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=settings&origin='.$origin.'&gradebook='.$gradebook.'">';
             $display_output .= Display::return_icon('settings.png', get_lang('EditToolOptions'),'',ICON_SIZE_MEDIUM).'</a>';
         }
+        $display_output .= '<a id="open-view-list" href="#">' . Display::return_icon('listwork.png', get_lang('viewStudents'),'',ICON_SIZE_MEDIUM) . '</a>';
+        
     }
 
     if (api_is_allowed_to_edit(null, true) && $origin != 'learnpath' && api_is_allowed_to_session_edit(false, true)) {
diff --git a/main/work/work.php b/main/work/work.php
index 5fb9f686fa..d6b22eb5c2 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -316,13 +316,13 @@ switch ($action) {
     case 'list':
         /*	Display list of student publications */
         if (!empty($my_folder_data['description'])) {
-            $content = '<p><div><strong>'.
-                get_lang('Description').':</strong><p>'.Security::remove_XSS($my_folder_data['description'], STUDENT).
-                '</p></div></p>';
+            $content = '<div>'.
+                get_lang('Description').':'.Security::remove_XSS($my_folder_data['description'], STUDENT).
+                '</div>';
         }
         if (api_is_allowed_to_edit() || api_is_coach()) {
             // Work list
-            $content .= '<div class="toolbar-works"><a id="open-view-list" class="btn btn-primary" href="#"><i class="fa fa-users"></i> Ver Estudiantes</a></div>';
+            
             $content .= '<div class="row">';
             $content .= '<div class="col-md-12">';
             $content .= '<div id="work-list" class="table-responsive">';