diff --git a/main/admin/add_courses_to_session.php b/main/admin/add_courses_to_session.php
index 441a017db4..ce39e083de 100755
--- a/main/admin/add_courses_to_session.php
+++ b/main/admin/add_courses_to_session.php
@@ -190,98 +190,96 @@ unset($Courses);
             Display::display_normal_message($errorMsg); //main API
         }
         ?>
-
-        <table border="0" cellpadding="5" cellspacing="0" width="100%" align="center">
-            <tr>
-                <td width="45%" align="center"><b><?php echo get_lang('CourseListInPlatform') ?> :</b></td>
-
-                <td width="10%">&nbsp;</td>
-                <td align="center" width="45%"><b><?php echo get_lang('CourseListInSession') ?> :</b></td>
-            </tr>
-
-            <?php if($add_type == 'multiple') { ?>
-                <tr><td width="45%" align="center">
+        <div id="multiple-add-session" class="row">
+            <div class="col-md-5">
+                <label><?php echo get_lang('CourseListInPlatform') ?> :</label>
+                <?php
+                if (!($add_type == 'multiple')) {
+                    ?>
+                    <input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,'single')" class="form-control"/>
+                    <div id="ajax_list_courses_single"></div>
+                <?php
+                } else {
+                    ?>
+                    <div id="ajax_list_courses_multiple">
+                        <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" class="form-control"> <?php
+                            foreach($nosessionCourses as $enreg) {
+                                ?>
+                                <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>>
+                                    <?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
+                                </option>
+                            <?php
+                            }
+                            ?></select>
+                    </div>
+                <?php
+                }
+                unset($nosessionCourses);
+                ?>
+            </div>
+            <div class="col-md-2">
+                <?php if($add_type == 'multiple') { ?>
+                    <div class="code-course">
                         <?php echo get_lang('FirstLetterCourse'); ?> :
-                        <select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')">
+                        <br /><br />
+                        <select name="firstLetterCourse" onchange = "xajax_search_courses(this.value,'multiple')" class="form-control">
                             <option value="%">--</option>
                             <?php
                             echo Display :: get_alphabet_options();
                             echo Display :: get_numeric_options(0,9,'');
                             ?>
                         </select>
-                    </td>
-                    <td>&nbsp;</td></tr>
-            <?php } ?>
-
-            <tr>
-                <td width="45%" align="center">
-
-                    <?php
-                    if (!($add_type == 'multiple')) {
-                        ?>
-                        <input type="text" id="course_to_add" onkeyup="xajax_search_courses(this.value,'single')" />
-                        <div id="ajax_list_courses_single"></div>
-                    <?php
-                    } else {
-                        ?>
-                        <div id="ajax_list_courses_multiple">
-                            <select id="origin" name="NoSessionCoursesList[]" multiple="multiple" size="20" style="width:360px;"> <?php
-                                foreach($nosessionCourses as $enreg) {
-                                    ?>
-                                    <option value="<?php echo $enreg['code']; ?>" <?php echo 'title="'.htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES).'"'; if(in_array($enreg['code'],$CourseList)) echo 'selected="selected"'; ?>>
-                                        <?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
-                                    </option>
-                                <?php
-                                }
-                                ?></select>
-                        </div>
-                    <?php
-                    }
-                    unset($nosessionCourses);
+                    </div>
+                <?php } ?>
+                <div class="control-course">
+                    <br /><br />
+                <?php
+                if ($ajax_search) {
                     ?>
-                </td>
-                <td width="10%" valign="middle" align="center">
-                    <?php
-                    if ($ajax_search) {
-                        ?>
-                        <button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
+                    <button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))">
+                        <i class="fa fa-chevron-left"></i>
+                    </button>
+                    <br /><br />
+                <?php
+                } else {
+                    ?>
+                    <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
+                        <i class="fa fa-chevron-right"></i>
+                    </button>
+                    <br /><br />
+                    <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
+                        <i class="fa fa-chevron-left"></i>
+                    </button>
+                    <br /><br />
+                <?php
+                }
+                ?>
+                <?php
+                if (isset($_GET['add'])) {
+                    echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('NextStep').'</button>';
+                } else {
+                    echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeCoursesToSession').'</button>';
+                }
+                ?>
+                </div>
+            </div>
+            <div class="col-md-5">
+                <label><?php echo get_lang('CourseListInSession') ?> :</label>
+                <select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" class="form-control">
+
                     <?php
-                    } else {
+                    foreach($sessionCourses as $enreg) {
                         ?>
-                        <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
-                            <i class="fa fa-chevron-right"></i>
-                        </button>
-                        <br /><br />
-                        <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
-                            <i class="fa fa-chevron-left"></i>
-                        </button>
-                    <?php
-                    }
-                    ?>
-                    <br /><br /><br /><br /><br /><br />
+                        <option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>">
+                            <?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
+                        </option>
                     <?php
-                    if (isset($_GET['add'])) {
-                        echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('NextStep').'</button>';
-                    } else {
-                        echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeCoursesToSession').'</button>';
                     }
+                    unset($sessionCourses);
                     ?>
-                </td>
-                <td width="45%" align="center"><select id='destination' name="SessionCoursesList[]" multiple="multiple" size="20" style="width:360px;">
-
-                        <?php
-                        foreach($sessionCourses as $enreg) {
-                            ?>
-                            <option value="<?php echo $enreg['code']; ?>" title="<?php echo htmlspecialchars($enreg['title'].' ('.$enreg['visual_code'].')',ENT_QUOTES); ?>">
-                                <?php echo $enreg['title'].' ('.$enreg['visual_code'].')'; ?>
-                            </option>
-                        <?php
-                        }
-                        unset($sessionCourses);
-                        ?>
-                    </select></td>
-            </tr>
-        </table>
+                </select>
+            </div>
+        </div>
     </form>
     <script>
         function moveItem(origin , destination) {
diff --git a/main/admin/add_users_to_session.php b/main/admin/add_users_to_session.php
index 5430f84677..b453c830f8 100755
--- a/main/admin/add_users_to_session.php
+++ b/main/admin/add_users_to_session.php
@@ -621,17 +621,17 @@ if (!empty($errorMsg)) {
         <?php
             if ($ajax_search) {
             ?>
-              <button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
+              <button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination_users'))" >
                   <i class="fa fa-chevron-right"></i>
               </button>
             <?php
         } else {
             ?>
-                <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
+                <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))" onclick="moveItem(document.getElementById('origin_users'), document.getElementById('destination_users'))">
                     <i class="fa fa-chevron-right"></i>
                 </button>
                 <br /><br />
-                <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
+                <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))" onclick="moveItem(document.getElementById('destination_users'), document.getElementById('origin_users'))">
                     <i class="fa fa-chevron-left"></i>
                 </button>
               <?php
@@ -642,9 +642,9 @@ if (!empty($errorMsg)) {
         <br />
 		<?php
 		if (!empty($addProcess)) {
-			echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
+			echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('FinishSessionCreation').'</button>';
         } else {
-			echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
+			echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.get_lang('SubscribeUsersToSession').'</button>';
         }
 		?>
     </div>
diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php
index fd17e46824..1b2a28afed 100755
--- a/main/admin/configure_homepage.php
+++ b/main/admin/configure_homepage.php
@@ -1117,7 +1117,7 @@ switch ($action) {
 							<div><input type="text" id="login" size="15" value="" disabled="disabled" /></div>
 							<div><label><?php echo get_lang('UserPassword'); ?></label></div>
 							<div><input type="password" id="password" size="15" value="" disabled="disabled" /></div>
-							<div><button class="btn" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
+							<div><button class="btn btn-default" type="button" name="submitAuth" value="<?php echo get_lang('Ok'); ?>" disabled="disabled"><?php echo get_lang('Ok'); ?></button></div>
 						</form>
 					</div>
 
diff --git a/main/admin/course_export.php b/main/admin/course_export.php
index ffcebb9061..877ad9fcd8 100755
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
@@ -79,7 +79,7 @@ if (isset($_POST['formSent']) && $_POST['formSent']) {
 			fputs($fp, $add);
 		}
 		fclose($fp);
-		$msg = get_lang('CoursesListHasBeenExported').'<br/><a class="btn" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
+		$msg = get_lang('CoursesListHasBeenExported').'<br/><a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
 	} else {
 		$msg = get_lang('ThereAreNotSelectedCoursesOrCoursesListIsEmpty');
 	}
diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php
index e84f3e3bf9..bccf53f7f8 100755
--- a/main/admin/dashboard_add_users_to_user.php
+++ b/main/admin/dashboard_add_users_to_user.php
@@ -465,13 +465,13 @@ if(!empty($msg)) {
 
   <td width="10%" valign="middle" align="center">
   <?php if ($ajax_search) { ?>
-    <button class="btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
+    <button class="btn btn-primary" type="button" onclick="remove_item(document.getElementById('destination'))"></button>
   <?php } else { ?>
-    <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
+    <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))" onclick="moveItem(document.getElementById('origin'), document.getElementById('destination'))">
         <i class="fa fa-chevron-right"></i>
     </button>
     <br /><br />
-    <button class="btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
+    <button class="btn btn-primary" type="button" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))" onclick="moveItem(document.getElementById('destination'), document.getElementById('origin'))">
         <i class="fa fa-chevron-left"></i>
     </button>
   <?php
@@ -479,7 +479,7 @@ if(!empty($msg)) {
   ?>
 	<br /><br /><br /><br />
 	<?php
-		echo '<button class="btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
+		echo '<button class="btn btn-success" type="button" value="" onclick="valide()" >'.$tool_name.'</button>';
 	?>
   </td>
   <td width="45%" align="center">
diff --git a/main/admin/session_course_edit.php b/main/admin/session_course_edit.php
index b561f2af02..0928712c8b 100755
--- a/main/admin/session_course_edit.php
+++ b/main/admin/session_course_edit.php
@@ -115,53 +115,53 @@ Display::display_header($tool_name);
 $tool_name = get_lang('ModifySessionCourse');
 api_display_tool_title($tool_name);
 ?>
+<div class="session-course-edit">
+
 <form method="post" action="<?php echo api_get_self(); ?>?id_session=<?php echo $id_session; ?>&course_code=<?php echo urlencode($course_code); ?>&page=<?php echo Security::remove_XSS($_GET['page']) ?>" style="margin:0px;">
 <input type="hidden" name="formSent" value="1">
-<table border="0" cellpadding="5" cellspacing="0" width="600px">
-<?php
-if(!empty($errorMsg)) {
-?>
-<tr>
-  <td colspan="2">
-<?php
-	Display::display_normal_message($errorMsg);
-?>
-  </td>
-</tr>
-<?php
-}
-?>
 
-<tr>
-  <td width="25%" valign = "top"><?php echo get_lang("CoachName") ?>&nbsp;&nbsp;</td>
-  <td width="70%">
-    <select name="id_coach[]" style="width:450px;" multiple="multiple" size="7">
-	    <option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
-	    <option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>>
-            <?php echo get_lang('None') ?>
-        </option>
-<?php
-foreach($coaches as $enreg) {
-?>
-<option value="<?php echo $enreg['user_id']; ?>" <?php if(((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>>
-    <?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
-</option>
-<?php
-}
-unset($coaches);
-?>
-  </select>
-    </td>
-</tr>
-<tr>
-  <td>&nbsp;</td>
-  <td>
-      <button class="save" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>">
-          <?php echo get_lang('AssignCoach') ?>
-      </button>
-</td>
-</tr>
-</table>
+<div class="row">
+    <div class="col-md-12">
+        <div class="title"></div>
+        <?php
+            if(!empty($errorMsg)) {
+                Display::display_normal_message($errorMsg);
+            }
+        ?>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-2">
+        <?php echo get_lang("CoachName") ?>
+    </div>
+    <div class="col-md-8">
+
+        <select name="id_coach[]" class="form-control">
+            <option value="0">----- <?php echo get_lang("Choose") ?> -----</option>
+            <option value="0" <?php if(count($arr_infos) == 0) echo 'selected="selected"'; ?>>
+                <?php echo get_lang('None') ?>
+            </option>
+            <?php
+            foreach($coaches as $enreg) {
+                ?>
+                <option value="<?php echo $enreg['user_id']; ?>" <?php if(((is_array($arr_infos) && in_array($enreg['user_id'], $arr_infos)))) echo 'selected="selected"'; ?>>
+                    <?php echo api_get_person_name($enreg['firstname'], $enreg['lastname']).' ('.$enreg['username'].')'; ?>
+                </option>
+            <?php
+            }
+            unset($coaches);
+            ?>
+        </select>
+        <div class="control">
+        <button class="btn btn-success" type="submit" name="name" value="<?php echo get_lang('AssignCoach') ?>">
+            <i class="fa fa-plus"></i>
+            <?php echo get_lang('AssignCoach') ?>
+        </button>
+        </div>
+    </div>
+    <div class="col-md-2"></div>
+</div>
 </form>
+</div>
 <?php
 Display::display_footer();
diff --git a/main/admin/session_export.php b/main/admin/session_export.php
index a318f7af5f..b2c6ee91ed 100755
--- a/main/admin/session_export.php
+++ b/main/admin/session_export.php
@@ -241,7 +241,7 @@ if ($_POST['formSent']) {
 			fputs($fp,"</Sessions>\n");
 		fclose($fp);
 
-		$errorMsg=get_lang('UserListHasBeenExported').'<br/><a class="btn" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
+		$errorMsg=get_lang('UserListHasBeenExported').'<br/><a class="btn btn-default" href="'.$archiveURL.$archiveFile.'">'.get_lang('ClickHereToDownloadTheFile').'</a>';
 	}
 }
 
diff --git a/main/admin/special_exports.php b/main/admin/special_exports.php
index ee6fd20892..0256de4ad5 100755
--- a/main/admin/special_exports.php
+++ b/main/admin/special_exports.php
@@ -127,7 +127,7 @@ if ((isset ($_POST['action']) && $_POST['action'] == 'course_select_form') || (i
 
 if ($export && $name) {
 	Display::display_confirmation_message(get_lang('BackupCreated'));
-	echo '<br /><a class="btn" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
+	echo '<br /><a class="btn btn-default" href="'.api_get_path(WEB_CODE_PATH).'course_info/download.php?archive='.urlencode($name).'&session=true">'.get_lang('Download').'</a>';
 } else {
 	// Display forms especial export
 	if (isset ($_POST['backup_option']) && $_POST['backup_option'] == 'select_items') {
diff --git a/main/css/base.css b/main/css/base.css
index ed7fb27810..c09ee6e2a7 100755
--- a/main/css/base.css
+++ b/main/css/base.css
@@ -5606,6 +5606,13 @@ ul.holder li.bit-box a.closebutton{
 #control-bottom.well{
   margin-bottom: 0;
 }
+.session-course-edit .control{
+  padding-top: 2em;
+  padding-bottom: 2em;
+}
+#multiple-add-session .control-course{
+  text-align: center;
+}
 /* CSS Responsive */
 @media (min-width: 1025px) and (max-width: 1200px) {
 .sidebar-scorm{
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index fbb6beba29..22afe11aaa 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -2862,7 +2862,7 @@ function api_display_tool_title($title_element) {
         unset ($title_element);
         $title_element['mainTitle'] = $tit;
     }
-    echo '<h2>';
+    echo '<h3>';
     if (!empty($title_element['supraTitle'])) {
         echo '<small>'.$title_element['supraTitle'].'</small><br />';
     }
@@ -2872,7 +2872,7 @@ function api_display_tool_title($title_element) {
     if (!empty($title_element['subTitle'])) {
         echo '<br /><small>'.$title_element['subTitle'].'</small>';
     }
-    echo '</h2>';
+    echo '</h3>';
 }
 
 /**
diff --git a/plugin/advanced_subscription/views/admin_view.tpl b/plugin/advanced_subscription/views/admin_view.tpl
index f6f7648ff7..b3d3111523 100644
--- a/plugin/advanced_subscription/views/admin_view.tpl
+++ b/plugin/advanced_subscription/views/admin_view.tpl
@@ -1,6 +1,6 @@
 <form id="form_advanced_subscription_admin" class="form-search" method="post" action="/plugin/advanced_subscription/src/admin_view.php" name="form_advanced_subscription_admin">
     <div class="row">
-        <div class="span6">
+        <div class="col-md-6">
             <p class="text-title-select">{{ 'SelectASession' | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
             <select id="session-select" name="s">
                 <option value="0">
@@ -19,7 +19,7 @@
             <p>{{ session.target }}</p>
 
         </div>
-        <div class="span6">
+        <div class="col-md-6">
             <p class="separate-badge">
                 <span class="badge badge-dis">{{ session.vacancies }}</span>
                 {{ "Vacancies" | get_plugin_lang('AdvancedSubscriptionPlugin') }}</p>
@@ -31,7 +31,7 @@
         </div>
     </div>
     <div class="row">
-        <div class="span12">
+        <div class="col-md-12">
             <div class="student-list-table">
                 <table id="student_table" class="table table-striped">
                     <tbody>