diff --git a/main/group/group_edit.php b/main/group/group_edit.php
index 03ba484dfd..00e42734a6 100644
--- a/main/group/group_edit.php
+++ b/main/group/group_edit.php
@@ -211,12 +211,11 @@ if (isset($_SESSION['id_session'])) {
 	$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'],true,$_SESSION['id_session']);
 	$complete_user_list2 = CourseManager :: get_coach_list_from_course_code($_course['id'],$_SESSION['id_session']);
 	$complete_user_list = array_merge($complete_user_list,$complete_user_list2);
+	usort($complete_user_list, 'sort_users');
 } else {
-	$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id']);
+	$complete_user_list = CourseManager :: get_user_list_from_course_code($_course['id'],false, '','',api_get_setting('user_order_by'));
 }
 
-usort($complete_user_list, 'sort_users');
-
 
 $possible_users = array ();
 foreach ($complete_user_list as $index => $user) {
@@ -324,7 +323,10 @@ if ($referer != 'group_space.php' && $referer != 'group.php') {
 	$referer = 'group.php';
 }
 if (isset($_POST['group_members'])) {
-	if (count($_POST['group_members'])<=$defaults['max_member']) {
+	// if it has been specified that there is a limit (contradictionary this is max_member_no_limit = 1) then we have to check if the limit 
+	// has been exceeded or not
+	if($_POST['max_member_no_limit'] == 1){
+		if (count($_POST['group_members'])<=$defaults['max_member'] AND $defaults['max_member_no_limit']) {
 		//
 	} else {
 				header('Location:group_edit.php?show_message='.get_lang('GroupTooMuchMembers'));
diff --git a/main/group/group_overview.php b/main/group/group_overview.php
index 9d27438eaa..15fc41a31f 100644
--- a/main/group/group_overview.php
+++ b/main/group/group_overview.php
@@ -68,7 +68,7 @@ if( isset($_GET['action']))
 			$data = array();
 			foreach($groups as $index => $group)
 			{
-				$users = GroupManager::get_users($group['id']);
+				$users = GroupManager::get_users($group['id'],api_get_setting('user_order_by'));
 				foreach($users as $index => $user)
 				{
 					$row = array();
@@ -136,7 +136,7 @@ foreach($categories as $index => $category)
 		echo '<li>';
 		echo stripslashes($group['name']);
 		echo '<ul>';
-		$users = GroupManager::get_users($group['id']);
+		$users = GroupManager::get_users($group['id'],api_get_setting('user_order_by'));
 		foreach($users as $index => $user)
 		{
 			$user_info = api_get_user_info($user);
diff --git a/main/inc/lib/asciimath/filter.php b/main/inc/lib/asciimath/filter.php
index 6efb1b798d..f7e3cbaabd 100644
--- a/main/inc/lib/asciimath/filter.php
+++ b/main/inc/lib/asciimath/filter.php
@@ -1,4 +1,4 @@
-<?PHP
+<?php
 /////////////////////////////////////////////////////////////////////////////
 //                                                                         //
 // NOTICE OF COPYRIGHT                                                     //
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php
index 45466797cd..05dce5849d 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/editor.php
@@ -140,16 +140,16 @@ body {
 					&nbsp;<input type="file" name="upload" id="upload"/>
 					<input type="hidden" name="dir" id="dir" value="<?php echo dirname($clean_img)?>" />
 					&nbsp;
-<? if (count($IMConfig['maxWidth']) > 1){ ?>
+<?php if (count($IMConfig['maxWidth']) > 1){ ?>
 					<label for="uploadSize" style="white-space: nowrap;">Upload Size</label>
 					<select name="uploadSize" id="uploadSize">
-	<? for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?>
-						<option value="<?=$i?>"><?=$IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
-	<? } ?>
+	<?php for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?>
+						<option value="<?php echo $i?>"><?php echo $IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
+	<?php } ?>
 				<span style="padding-left: 5px;">
 					(max width x height dimensions)
 				</span>
-<? } ?>
+<?php } ?>
 				</form>
 			</td>
 			<td>
diff --git a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php
index cf26395271..66bf3222f1 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ImageManager/manager.php
@@ -222,7 +222,7 @@ body {
 					<td>
 						<select name="uploadSize" id="uploadSize">
 						<?php for ($i = 0; $i < count($IMConfig['maxWidth']); $i++){ ?>
-								<option value="<?=$i?>"><?=$IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
+								<option value="<?php echo $i; ?>"><?php echo $IMConfig['maxWidth'][$i] . " x " . $IMConfig['maxHeight'][$i]?></option>
 						<?php } ?>
 						</select>
 					</td>
diff --git a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php
index 457f68186b..0633aba169 100644
--- a/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php
+++ b/main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_paste.php
@@ -1,4 +1,4 @@
-<?
+<?php
 		include_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . "inc" . DIRECTORY_SEPARATOR . "config.php");
 		$error = '';
 		$fileMoved = array();
diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 5816d933c1..4019b0e894 100644
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -768,11 +768,22 @@ class GroupManager {
 	 * Get all users from a given group
 	 * @param int $group_id The group
 	 */
-	public static function get_users ($group_id) {
+	public static function get_users ($group_id, $order_by='', $direction='ASC') {
+		// Database table definition
 		$group_user_table = Database :: get_course_table(TABLE_GROUP_USER);
-		$group_id = Database::escape_string($group_id);
-		$sql = "SELECT user_id FROM $group_user_table WHERE group_id = $group_id";
-		$res = Database::query($sql,__FILE__,__LINE__);
+		$table_user = Database::get_main_table(TABLE_MAIN_USER);
+
+		if (!empty($order_by) AND in_array($order_by, array('lastname', 'firstname', 'username', 'email', 'official_code'))){
+				$order_by_sql = 'ORDER BY user.'.$order_by.' '.$direction;
+			} else {
+				$order_by_sql = '';
+			}		
+		
+		$sql = "SELECT user.user_id FROM $group_user_table group_rel_user, $table_user user
+					WHERE group_rel_user.group_id = '".Database::escape_string($group_id)."'
+					AND group_rel_user.user_id = user.user_id
+					$order_by_sql";
+		$res = api_sql_query($sql,__FILE__,__LINE__);
 		$users = array ();
 		while ($obj = Database::fetch_object($res)) {
 			$users[] = $obj->user_id;
diff --git a/main/messaging/email_editor.php b/main/messaging/email_editor.php
index 8602696a19..b662308388 100644
--- a/main/messaging/email_editor.php
+++ b/main/messaging/email_editor.php
@@ -105,8 +105,7 @@ Display::display_header(get_lang('SendEmail'));
 </form>
 </table>
 
-<?
-
+<?php
 /* Footer */
 Display::display_footer();
-?>
+?>
\ No newline at end of file
diff --git a/main/newscorm/lp_view.php b/main/newscorm/lp_view.php
index 9fd484ba5c..eb242940cf 100644
--- a/main/newscorm/lp_view.php
+++ b/main/newscorm/lp_view.php
@@ -318,7 +318,7 @@ if($_SESSION['oLP']->mode == 'fullscreen') {
 	<!-- end media player layaout -->
 
 	<!-- toc layout -->
-	<div id="toc_id" name="toc_name"  style="padding:0;margin-top:20px;height:60%;width:100%">
+	<div id="toc_id" name="toc_name"  style="overflow: auto; padding:0;margin-top:20px;height:60%;width:100%">
 		<div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?>
 			<!-- log message layout -->
 	
@@ -393,6 +393,8 @@ window.onload = function() {
 	rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
 	document.body.style.overflow = 'hidden';
 	updateContentHeight();
+		viewportheight = window.innerHeight
+		document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
 }
 
 window.onresize = updateContentHeight;
@@ -508,7 +510,7 @@ window.onresize = updateContentHeight;
 		<!-- end media player layaout -->
 
 		<!-- toc layout -->
-		<div id="toc_id" name="toc_name"  style="padding:0;margin-top:20px;height:60%;width:100%">
+		<div id="toc_id" name="toc_name"  style="overflow: auto; padding:0;margin-top:20px;height:60%;width:100%">
 			<div id="learning_path_toc" style="font-size:9pt;margin:0;"><?php echo $_SESSION['oLP']->get_html_toc(); ?>
 	
     	<?php if (!empty($_SESSION['oLP']->scorm_debug)) { //only show log  ?>
@@ -580,8 +582,10 @@ window.onload = function() {
 	initialRightZoneHeight = document.getElementById('learning_path_right_zone').offsetHeight;
 	docHeight = document.body.clientHeight;
 	leftZoneHeightOccupied = docHeight - initialLeftZoneHeight;
-	rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
+rightZoneHeightOccupied = docHeight - initialRightZoneHeight;
 	document.body.style.overflow = 'hidden';
+	viewportheight = window.innerHeight
+	document.getElementById('toc_id').style.height = viewportheight - 200 + "px";
 	updateContentHeight();
 }
 
diff --git a/main/user/subscribe_user.php b/main/user/subscribe_user.php
index 242cf96e8a..49a683a487 100644
--- a/main/user/subscribe_user.php
+++ b/main/user/subscribe_user.php
@@ -35,21 +35,23 @@
 */
 // name of the language file that needs to be included
 $language_file = array('registration','admin');
-
-// including the global Dokeos file
-include ('../inc/global.inc.php');
-
+
+// including the global Dokeos file
+include ('../inc/global.inc.php');
+
 // the section (for the tabs)
 $this_section = SECTION_COURSES;
+
 // access restriction
 if (!api_is_allowed_to_edit()) {
 	 api_not_allowed(true);
 }
+
 // including additional libraries
-require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
-require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php');
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
+require_once (api_get_path(LIBRARY_PATH).'course.lib.php');
+require_once (api_get_path(LIBRARY_PATH).'sortabletable.class.php');
+require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
+require_once (api_get_path(LIBRARY_PATH).'usermanager.lib.php');
 
 /*
 ==============================================================================
@@ -199,7 +201,7 @@ function get_number_of_users() {
 	$user_table = Database :: get_main_table(TABLE_MAIN_USER);
 	$course_user_table = Database :: get_main_table(TABLE_MAIN_COURSE_USER);
 	$table_user_field_values 	= Database::get_main_table(TABLE_MAIN_USER_FIELD_VALUES);
-	
+	
 	if (isset($_REQUEST['type']) && $_REQUEST['type']=='teacher') {
 		$sql = "SELECT 	u.user_id
 						FROM $user_table u
@@ -228,7 +230,7 @@ function get_number_of_users() {
 						LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
 						
 		// we change the SQL when we have a filter
-		if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
+		if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
 			$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
 			$sql .=	"
 				LEFT JOIN $table_user_field_values field_values 
@@ -262,7 +264,7 @@ function get_number_of_users() {
 	}
 
 	// when there is a keyword then we are searching and we have to change the SQL statement
-	if (isset ($_REQUEST['keyword'])) {
+	if (isset ($_GET['keyword']) AND !empty($_GET['keyword'])) {
 		$keyword = Database::escape_string($_REQUEST['keyword']);
 		$sql .= " AND (firstname LIKE '%".$keyword."%' OR lastname LIKE '%".$keyword."%'   OR email LIKE '%".$keyword."%'  OR username LIKE '%".$keyword."%'  OR official_code LIKE '%".$keyword."%')";
 		
@@ -333,7 +335,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 					LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
 
 			// applying the filter of the additional user profile fields 	
-			if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
+			if (isset($_GET['subscribe_user_filter_value']) !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
 				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
 				$sql .=	"
 					LEFT JOIN $table_user_field_values field_values 
@@ -341,8 +343,8 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 					WHERE cu.user_id IS NULL
 						AND field_values.field_id = '".Database::escape_string($field_identification[0])."' 
 						AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
-			} else {	
-				$sql .=	"WHERE cu.user_id IS NULL";
+			} else {	
+				$sql .=	"WHERE cu.user_id IS NULL";
 			}
 		} else {
 		// adding a teacher NOT through a session
@@ -361,7 +363,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
 				
 				// applying the filter of the additional user profile fields 	
-				if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
+				if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
 					$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
 					$sql .=	"
 						LEFT JOIN $table_user_field_values field_values 
@@ -374,8 +376,8 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 				}
 				//showing only the courses of the current Dokeos access_url_id
 				global $_configuration;
-				
-				// adding a teacher NOT trough a session on a portal with multiple URLs
+				
+				// adding a teacher NOT trough a session on a portal with multiple URLs
 				if ($_configuration['multiple_access_urls']==true) {
 					$url_access_id = api_get_current_access_url_id();
 					if ($url_access_id !=-1) {
@@ -399,7 +401,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 
 
 					// applying the filter of the additional user profile fields 	
-					if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
+					if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
 						$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
 						$sql .=	"
 							LEFT JOIN $table_user_field_values field_values 
@@ -414,7 +416,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 			}
 		}
 	} else {
-		// adding a student
+		// adding a student
 		if (!empty($_SESSION["id_session"])) {
 			$sql = "SELECT
 					u.user_id AS col0,
@@ -428,20 +430,20 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 					u.active 	AS col5,
 					u.user_id   AS col6
 				FROM $user_table u
-				LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
-				
-			// applying the filter of the additional user profile fields 	
-			if (isset($_GET['subscribe_user_filter_value'])){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
-					LEFT JOIN $table_user_field_values field_values 
-						ON field_values.user_id = u.user_id 
-					WHERE cu.user_id IS NULL
-						AND field_values.field_id = '".Database::escape_string($field_identification[0])."' 
-						AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL";
-			}
+				LEFT JOIN $tbl_session_rel_course_user cu on u.user_id = cu.id_user and course_code='".$_SESSION['_course']['id']."'";
+				
+			// applying the filter of the additional user profile fields 	
+			if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
+				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+				$sql .=	"
+					LEFT JOIN $table_user_field_values field_values 
+						ON field_values.user_id = u.user_id 
+					WHERE cu.user_id IS NULL
+						AND field_values.field_id = '".Database::escape_string($field_identification[0])."' 
+						AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
+			} else	{
+				$sql .=	"WHERE cu.user_id IS NULL";
+			}
 		} else {
 		$sql = "SELECT
 					u.user_id AS col0,
@@ -455,20 +457,20 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 					u.active 	AS col5,
 					u.user_id   AS col6
 				FROM $user_table u
-				LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
-				
-			// applying the filter of the additional user profile fields 	
-			if (isset($_GET['subscribe_user_filter_value'])){
-				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
-				$sql .=	"
-					LEFT JOIN $table_user_field_values field_values 
-						ON field_values.user_id = u.user_id 
-					WHERE cu.user_id IS NULL
-						AND field_values.field_id = '".Database::escape_string($field_identification[0])."' 
-						AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
-			} else	{
-				$sql .=	"WHERE cu.user_id IS NULL";
-			}
+				LEFT JOIN $course_user_table cu on u.user_id = cu.user_id and course_code='".$_SESSION['_course']['id']."'";
+				
+			// applying the filter of the additional user profile fields 	
+			if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value'])){
+				$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
+				$sql .=	"
+					LEFT JOIN $table_user_field_values field_values 
+						ON field_values.user_id = u.user_id 
+					WHERE cu.user_id IS NULL
+						AND field_values.field_id = '".Database::escape_string($field_identification[0])."' 
+						AND field_values.field_value = '".Database::escape_string($field_identification[1])."'";
+			} else	{
+				$sql .=	"WHERE cu.user_id IS NULL";
+			}
 
 			//showing only the courses of the current Dokeos access_url_id
 			global $_configuration;
@@ -495,7 +497,7 @@ function get_user_data($from, $number_of_items, $column, $direction) {
 
 
 					// applying the filter of the additional user profile fields 	
-					if (isset($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
+					if (isset($_GET['subscribe_user_filter_value']) AND !empty($_GET['subscribe_user_filter_value']) AND api_get_setting('ProfilingFilterAddingUsers') == 'true'){
 						$field_identification = explode('*',$_GET['subscribe_user_filter_value']);
 						$sql .=	"
 							LEFT JOIN $table_user_field_values field_values 
@@ -615,7 +617,7 @@ $sort_by_first_name = api_sort_by_first_name();
 echo '<div class="actions">';
 
 $actions .= '<a href="user.php">'.Display::return_icon('members.gif',get_lang('BackToUserList')).' '.get_lang('BackToUserList').'</a>';
-if ($_POST['keyword'])
+if ($_GET['keyword'] AND !empty($_GET['keyword']))
 {
 	$actions .= '<a href="subscribe_user.php?type='.Security::remove_XSS($_GET['type']).'">'.Display::return_icon('clean_group.gif').' '.get_lang('ClearSearchResults').'</a>';
 }
@@ -627,7 +629,7 @@ if (api_get_setting('ProfilingFilterAddingUsers') == 'true') {
 	display_extra_profile_fields_filter();
 }
 
-$form = new FormValidator('search_user', 'POST',api_get_self().'?type='.$_REQUEST['type'],'',null,false);
+$form = new FormValidator('search_user', 'GET',api_get_self().'?type='.$_REQUEST['type'],'',null,false);
 $renderer = & $form->defaultRenderer();
 $renderer->setElementTemplate('<span>{element}</span> ');
 $form->add_textfield('keyword', '', false);
@@ -762,10 +764,4 @@ function display_extra_profile_fields_filter()
 	echo   '<button type="submit" name="submit_filter" id="submit_filter" value="" class="search">'.get_lang('Filter').'</button>';
 	echo '</form>';
 
-}
-
-function debug($var) {
-	echo '<pre>';
-	print_r($var);
-	echo '</pre>';
 }
\ No newline at end of file