diff --git a/home/home_top.html b/home/home_top.html
index 0a4566c03d..e364fdbf0d 100755
--- a/home/home_top.html
+++ b/home/home_top.html
@@ -1,2 +1,2 @@
 <br/>
-<img src="{rel_path}home/large_dokeos_logo.gif" alt="Dokeos logo" />
\ No newline at end of file
+<!-- <img src="{rel_path}home/large_dokeos_logo.gif" alt="Dokeos logo" /> -->
\ No newline at end of file
diff --git a/main/admin/settings.php b/main/admin/settings.php
index 6852a6e4dd..a7162d7281 100755
--- a/main/admin/settings.php
+++ b/main/admin/settings.php
@@ -283,6 +283,12 @@ if (!empty($_GET['category']) && !in_array($_GET['category'], array('Plugins', '
 	if ($form->validate())
 	{
 		$values = $form->exportValues();
+		
+		// set true for allow_message_tool variable if social tool is actived 
+		if ($values['allow_social_tool'] == 'true') {
+			$values['allow_message_tool'] = 'true';
+		}		
+		
 		// the first step is to set all the variables that have type=checkbox of the category
 		// to false as the checkbox that is unchecked is not in the $_POST data and can
 		// therefore not be set to false.
@@ -1165,7 +1171,6 @@ function add_edit_template()
 		if ($check) {
 			// exporting the values
 			$values = $form->exportValues();
-
 			// upload the file
 			if (!empty($_FILES['template_image']['name']))
 			{
diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php
index 68776aee75..5c471629d8 100755
--- a/main/announcements/announcements.php
+++ b/main/announcements/announcements.php
@@ -208,6 +208,15 @@ if ((empty($originalresource) || ($originalresource!=='no')) and (!empty($action
 */
 
 $htmlHeadXtra[] = to_javascript();
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#emailTitle").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
 
 /*
 -----------------------------------------------------------
diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php
index a7b1faf1a6..4d18901ec8 100755
--- a/main/calendar/agenda.inc.php
+++ b/main/calendar/agenda.inc.php
@@ -29,6 +29,23 @@ $DaysLong = api_get_week_days_long();
 // Defining the months of the year to allow translation of the months
 $MonthsLong = api_get_months_long();
 
+/*
+-----------------------------------------------------------
+	Javascript
+-----------------------------------------------------------
+*/
+
+$htmlHeadXtra[] = to_javascript();
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
 /*
 ==============================================================================
 		FUNCTIONS
@@ -2842,7 +2859,7 @@ function show_add_form($id = '')
 					</div>
 					<div class="formw">
 	<div id="err_title" style="display:none;color:red"></div>
-						<input type="text" size="60" name="title" value="';
+						<input type="text" id="title" size="60" name="title" value="';
 						if (isset($title)) echo $title;
 	echo				'" />
 					</div>
diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 2a5b6ab8ef..5f7a61959a 100755
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -387,7 +387,7 @@ default.css (línea 362)
 }
 .menusection {
 	width: auto;
-	margin: 24px 6px 0 6px;
+	margin: 24px 2px 0 0px;
 	padding-left: 10px;
 	border: 1px dotted #ddd;	
 	background-color: #FFF;
@@ -2283,13 +2283,26 @@ span.radio {
 	margin-left:20px;
 }
 /* styles from the my.profile.php file */
+
+#social_widget  {
+	border:1px dotted #ccc;
+	float:left;	
+	padding:1px;
+	padding-bottom:10px;
+	margin-bottom:10px;
+	margin-left:0px;
+	margin-right:0px;
+	width:215px;	
+}
+
+#social_widget_image {
+	float:left;
+}
 .message-content {
 	float:right;
-	margin:0px 10px;
 	background:#FFF;
-	border:1px dotted #ccc;
-	padding: 0px 10px 0 10px;
-	width:120px; 
+	padding: 10px 0 0 5px;	
+	width:125px; 
 	position:relative;
 }
 .message-content .message-delete {
@@ -3422,12 +3435,13 @@ a.read {
 	-webkit-border-radius: 10px; border: 1px solid #e1e1e0;
 	-opera-border-radius: 10px; border: 1px solid #e1e1e0;
 	
-	width:280px;
+	width:240px;
 	margin-top:20px;
 	margin-right:10px;
 	margin-bottom:40px;
+	
 	padding-left:10px;
-	padding-right:20px;
+	padding-right:10px;
 	padding-top:5px;
 	float: right;
 	min-height: 150px;
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index c30d6022e0..6553fcb028 100644
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -45,21 +45,19 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* End hide from IE5-mac */
 
 #main {
+/*
 	-moz-border-image:url(images/bg-main.png) 5 5 5 5;
 	-webkit-border-image:url(images/bg-main.png) 5 5 5 5;
 	-o-border-image:url(images/bg-main.png) 5 5 5 5;
 	-xv-border-image:url(images/bg-main.png) 5 5 5 5;
-	border:5px solid #f6f6f6;
+*/
+	border:2px solid #ddd;
 	position: relative; /* to avoid the IE peekabo bug*/
 	margin: 0px auto;
 	width: 90%;
 	min-height: 320px;
-	padding-top:10px;
-	padding-bottom:10px;
-	padding-left:10px;
-	padding-right:10px;
+	padding:12px;
 	overflow:hidden;
-
 }
 .item {
 	-moz-border-radius-bottomleft:5px;
@@ -78,11 +76,12 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 |
 */
 .maincontent {
-	float: left;
-	width: 68%;
-	padding: 0 20px 0 20px;
+	width: 65%;
+	float: left;	
+	 padding: 0 20px 0 20px; 
+	//padding: 0px;
 	min-height: 333px;
-	margin-top:30px;
+	margin-top:8px;
 	margin-bottom:30px;
 }
 /*
@@ -358,15 +357,17 @@ input[text] {
 #header3 {
 	background-image:url(images/bg-header4.png);
 	background-repeat:repeat-x;
-	width:92%;
+	width:90%;
 	margin-left:auto;
 	margin-right:auto;
 	font-size: 1.0em;
 	color: #006;
 	border-bottom: 2px solid #0daee4;
-	height:36px;
+	
 	overflow:hidden;
 	margin-bottom: 1px;
+	padding: 0px 10px 0px 20px;
+	height:36px;
 }
 
 #header3 a:hover {
@@ -374,6 +375,9 @@ input[text] {
 
 }
 
+#header3 li {
+float:left; /* important for ieX*/
+}
 #header3 li a span:hover {
 	color:#fffc00;
 }
@@ -394,8 +398,8 @@ input[text] {
 	cursor:pointer;
 	float:left;
 	height:25px;
-	padding-left:9px;
-	padding-right:1px;
+	padding-left:9px;	
+	padding-right:2px;
 	text-decoration:none;
 }
 
@@ -492,8 +496,7 @@ margin-top:0;
 	background-image:url(images/bg-header4.png);
 	background-repeat:repeat-x;
 	color: #009;
-	padding: 4px;
-	padding-left: 20px;
+	padding: 4px 10px 4px 20px;	
 	clear:right;
 	height:14px;
 }
@@ -575,8 +578,8 @@ margin-top:0;
 	padding-left: 12px;
 }
 .menusection {	
-	margin: 20px 5px 0 6px;
-	padding-left: 10px;
+	margin: 20px 0px 0 6px;
+	padding-left: 3px;
 	width: auto;
 }
 .menusectioncaption {
@@ -2426,13 +2429,26 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	margin-left:20px;
 }
 /* styles from the my.profile.php file */
+
+#social_widget  {
+	border:1px dotted #ccc;
+	float:left;	
+	padding:1px;
+	padding-bottom:10px;
+	margin-bottom:10px;
+	margin-left:0px;
+	margin-right:0px;
+	width:215px;	
+}
+
+#social_widget_image {
+	float:left;
+}
 .message-content {
 	float:right;
-	margin:0px 10px;
 	background:#FFF;
-	border:1px dotted #ccc;
-	padding: 0px 10px 0 10px;
-	width:132px; 
+	padding: 10px 0 0 5px;	
+	width:125px; 
 	position:relative;
 }
 .message-content .message-delete {
@@ -3869,7 +3885,7 @@ a.read {
 	-webkit-border-radius: 10px; border: 1px solid #e1e1e0;
 	-opera-border-radius: 10px; border: 1px solid #e1e1e0;
 	
-	width:280px;
+	width:218px;
 	margin-top:20px;
 	margin-right:10px;
 	margin-bottom:40px;
diff --git a/main/document/create_document.php b/main/document/create_document.php
index e437a08984..be996a1e0a 100755
--- a/main/document/create_document.php
+++ b/main/document/create_document.php
@@ -45,7 +45,7 @@ $language_file = 'document';
 include ('../inc/global.inc.php');
 $_SESSION['whereami'] = 'document/create';
 $this_section = SECTION_COURSES;
-
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[]='<script>
 
 function InnerDialogLoaded()
@@ -182,8 +182,14 @@ function InnerDialogLoaded()
 		{
 			document.getElementById(\'title_edited\').value = "true";
 		}
-	}
-
+	} 
+			
+	function setFocus(){
+	$("#title").focus();
+		}
+	$(window).load(function () {
+	  setFocus();
+		});
 </script>';
 
 require_once api_get_path(LIBRARY_PATH).'fileUpload.lib.php';
diff --git a/main/document/upload.php b/main/document/upload.php
index 1660f4a207..a711470652 100755
--- a/main/document/upload.php
+++ b/main/document/upload.php
@@ -93,6 +93,13 @@ function advanced_parameters() {
 			document.getElementById(\'img_plus_and_minus\').innerHTML=\'&nbsp;<img style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang('AdvancedParameters').'\';
 			}
 	}
+			
+function setFocus(){
+	$("#title").focus();
+	}
+	$(window).load(function () {
+ 	 setFocus();
+	});
 </script>';
 
 /**
@@ -548,7 +555,7 @@ $form->addElement('file','user_upload',get_lang('File'),'id="user_upload" size="
 
 if(api_get_setting('use_document_title')=='true')
 {
-	$form->addElement('text','title',get_lang('Title'),'size="20" style="width:300px;"');
+	$form->addElement('text','title',get_lang('Title'),array('size'=>'20','style' => 'width:300px','id' => 'title'));
 	$form->addElement('textarea','comment',get_lang('Comment'),'wrap="virtual" style="width:300px;"');
 }
 //Advanced parameters
diff --git a/main/dropbox/dropbox_functions.inc.php b/main/dropbox/dropbox_functions.inc.php
index 45b8bff405..7158b10888 100755
--- a/main/dropbox/dropbox_functions.inc.php
+++ b/main/dropbox/dropbox_functions.inc.php
@@ -5,6 +5,23 @@
 * functions in the init files also but I have moved them over
 * to one file 		-- Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
+include('../inc/global.inc.php');
+/*
+-----------------------------------------------------------
+	Javascript
+-----------------------------------------------------------
+*/
+
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
 /**
 * This function is a wrapper function for the multiple actions feature.
 * @return	Mixed	If there is a problem, return a string message, otherwise nothing
@@ -485,7 +502,7 @@ function display_addcategory_form($category_name='', $id='',$action)
 	{
 		echo '<span class="form_error">'.get_lang('CategoryAlreadyExistsEditIt').'<span><br />';
 	}
-	echo '			<input type="text" name="category_name" value="'.Security::remove_XSS($category_name).'" />
+	echo '			<input type="text" id="title" name="category_name" value="'.Security::remove_XSS($category_name).'" />
 				</div>
 			</div>';
 
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index ce80b5fbba..3273057a5e 100755
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -7,6 +7,7 @@
 * 	@author Olivier Brouckaert
 * 	@version $Id: exercise.class.php 22046 2009-07-14 01:45:19Z ivantcholakov $
 */
+include ('../inc/global.inc.php');
 
 define('ALL_ON_ONE_PAGE',1);
 define('ONE_PER_PAGE',2);
@@ -14,6 +15,16 @@ define('EXERCISE_FEEDBACK_TYPE_END',0);
 define('EXERCISE_FEEDBACK_TYPE_DIRECT',1);
 define('EXERCISE_FEEDBACK_TYPE_EXAM',2);
 
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
 if(!class_exists('Exercise')):
 
 class Exercise
@@ -906,7 +917,7 @@ class Exercise
 		}
 		$form->addElement('header', '', $form_title);
 		// title
-		$form -> addElement('text', 'exerciseTitle', get_lang('ExerciseName'),'class="input_titles"');
+		$form -> addElement('text', 'exerciseTitle', get_lang('ExerciseName'),'class="input_titles" id="title"');
 		//$form->applyFilter('exerciseTitle','html_filter');
 
 		$form -> addElement('html','<div class="row">
diff --git a/main/forum/forumfunction.inc.php b/main/forum/forumfunction.inc.php
index 82f2cd3654..230aba38b6 100755
--- a/main/forum/forumfunction.inc.php
+++ b/main/forum/forumfunction.inc.php
@@ -66,12 +66,31 @@
  * 							-- Patrick Cool <patrick.cool@UGent.be>
  **************************************************************************
 */
+require_once '../inc/global.inc.php';
 require_once(api_get_path(LIBRARY_PATH).'mail.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
 require_once(api_get_path(INCLUDE_PATH).'/conf/mail.conf.php');
 require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
 require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
 get_notifications_of_user();
+
+/*
+-----------------------------------------------------------
+	Javascript
+-----------------------------------------------------------
+*/
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
+
+
 /**
 * This function handles all the forum and forumcategories actions. This is a wrapper for the
 * forum and forum categories. All this code code could go into the section where this function is
@@ -152,7 +171,7 @@ function show_add_forumcategory_form($inputvalues=array()) {
 
 	// settting the form elements
 	$form->addElement('header', '', get_lang('AddForumCategory'));
-	$form->addElement('text', 'forum_category_title', get_lang('Title'),'class="input_titles"');
+	$form->addElement('text', 'forum_category_title', get_lang('Title'),'class="input_titles" id="title"');
 	//$form->applyFilter('forum_category_title', 'html_filter');
 	$form->addElement('html_editor', 'forum_category_comment', get_lang('Comment'), null, array('ToolbarSet' => 'Forum', 'Width' => '98%', 'Height' => '200'));
 	//$form->applyFilter('forum_category_comment', 'html_filter');
@@ -206,7 +225,7 @@ function show_add_forum_form($inputvalues=array()) {
 		$form->addElement('hidden', 'forum_id', $my_forum_id);
 	}
 	// The title of the forum
-	$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles"');
+	$form->addElement('text', 'forum_title', get_lang('Title'),'class="input_titles" id="title"');
 	//$form->applyFilter('forum_title', 'html_filter');
 	// The comment of the forum
 	$form->addElement('html_editor', 'forum_comment', get_lang('Comment'), null, array('ToolbarSet' => 'Forum', 'Width' => '98%', 'Height' => '200'));
@@ -1847,7 +1866,7 @@ function store_thread($values) {
 			$message.=get_lang('ReturnTo').' <a href="viewforum.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&gidReq='.$_SESSION['toolgroup'].'&origin='.$origin.'">'.get_lang('Forum').'</a><br />';
 		} else {
 			$message.=get_lang('ReturnTo').' <a href="viewforum.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&gidReq='.$_SESSION['toolgroup'].'&origin='.$origin.'">'.get_lang('Forum').'</a><br />';
-			$message.=get_lang('ReturnTo').' <a href="viewthread.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&origin='.$origin.'&amp;gradebook='.$gradebook.'&amp;thread='.$last_thread_id.'">'.get_lang('Message').'</a>';
+			$message.=get_lang('ReturnTo').' <a href="viewthread.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&gidReq='.$_SESSION['toolgroup'].'&origin='.$origin.'&amp;gradebook='.$gradebook.'&amp;thread='.$last_thread_id.'">'.get_lang('Message').'</a>';
 		}
 		$reply_info['new_post_id'] = $last_post_id;
 		$my_post_notification=isset($values['post_notification']) ? $values['post_notification'] : null;
@@ -2302,9 +2321,9 @@ function store_reply($values) {
 		if ($current_forum['approval_direct_post']=='1' AND !api_is_allowed_to_edit(null,true)) {
 			$message.='<br />'.get_lang('MessageHasToBeApproved').'<br />';
 		}
-
-		$message.='<br />'.get_lang('ReturnTo').' <a href="viewforum.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&origin='.$origin.'">'.get_lang('Forum').'</a><br />';
-		$message.=get_lang('ReturnTo').' <a href="viewthread.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&amp;thread='.$values['thread_id'].'&origin='.$origin.'&amp;gradebook='.$gradebook.'">'.get_lang('Message').'</a>';
+				
+		$message.='<br />'.get_lang('ReturnTo').' <a href="viewforum.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&amp;gidReq='.$_SESSION['toolgroup'].'&origin='.$origin.'">'.get_lang('Forum').'</a><br />';
+		$message.=get_lang('ReturnTo').' <a href="viewthread.php?'.api_get_cidreq().'&forum='.$values['forum_id'].'&amp;thread='.$values['thread_id'].'&amp;gidReq='.$_SESSION['toolgroup'].'&origin='.$origin.'&amp;gradebook='.$gradebook.'">'.get_lang('Message').'</a>';
 
 		// setting the notification correctly
 		$my_post_notification=isset($values['post_notification']) ? $values['post_notification'] :null;
@@ -3204,7 +3223,7 @@ function forum_search() {
 
 	// settting the form elements
 	$form->addElement('header', '', get_lang('ForumSearch'));
-	$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles"');
+	$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="title"');
 	$form->applyFilter('search_term', 'html_filter');
 	$form->addElement('static', 'search_information', '', get_lang('ForumSearchInformation')/*, $dissertation[$_GET['opleidingsonderdeelcode']]['code']*/);
 	$form->addElement('style_submit_button', null, get_lang('Search'), 'class="search"');
diff --git a/main/glossary/index.php b/main/glossary/index.php
index 00359263de..4159d0e28c 100755
--- a/main/glossary/index.php
+++ b/main/glossary/index.php
@@ -23,7 +23,15 @@ require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php'
 
 // additional javascript
 $htmlHeadXtra[] = javascript_glossary();
-
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#glossary_title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
 // setting the tool constants
 $tool = TOOL_GLOSSARY;
 
@@ -58,7 +66,7 @@ if (api_is_allowed_to_edit(null,true)) {
 		$form = new FormValidator('glossary','post', api_get_self().'?action='.Security::remove_XSS($_GET['action']));
 		// settting the form elements
 		$form->addElement('header', '', get_lang('TermAddNew'));
-		$form->addElement('text', 'glossary_title', get_lang('TermName'), array('size'=>'95'));
+		$form->addElement('text', 'glossary_title', get_lang('TermName'), array('size'=>'95', 'id'=>'glossary_title'));
 		//$form->applyFilter('glossary_title', 'html_filter');
 		$form->addElement('html_editor', 'glossary_comment', get_lang('TermDefinition'), null, array('ToolbarSet' => 'Glossary', 'Width' => '100%', 'Height' => '300'));
 		$form->addElement('style_submit_button', 'SubmitGlossary', get_lang('TermAddButton'), 'class="save"');
diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php
index b2539cc2e2..8d0299b09a 100755
--- a/main/gradebook/lib/fe/evalform.class.php
+++ b/main/gradebook/lib/fe/evalform.class.php
@@ -32,6 +32,18 @@ require_once (api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.ph
  * @author Stijn Konings
  * @package dokeos.gradebook
  */
+
+ $htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+ 
+ 
 class EvalForm extends FormValidator
 {
 	const TYPE_ADD= 1;
@@ -313,7 +325,8 @@ class EvalForm extends FormValidator
 		$this->addElement('hidden', 'hid_course_code');
 		$this->add_textfield('name', get_lang('EvaluationName'), true, array (
 			'size' => '54',
-			'maxlength' => '50'
+			'maxlength' => '50',
+			'id' => 'title'
 		));
 		$this->add_textfield('weight', get_lang('Weight'), true, array (
 			'size' => '4',
diff --git a/main/group/group_creation.php b/main/group/group_creation.php
index 4f7bbcd924..6d8e243baf 100755
--- a/main/group/group_creation.php
+++ b/main/group/group_creation.php
@@ -282,7 +282,7 @@ EOT;
 		$form->addGroup($group_el, 'group_'.$group_number, null, '</td><td>', false);
 	}
 	$defaults['action'] = 'create_groups';
-	$defaults['number_of_groups'] = $_POST['number_of_groups'];
+	$defaults['number_of_groups'] = intval($_POST['number_of_groups']);
 	$form->setDefaults($defaults);
 	$form->addElement('style_submit_button', 'submit', get_lang('CreateGroup'), 'class="save"');
 	$form->display();
diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php
index aa9e2791a9..486bbade73 100755
--- a/main/inc/global_error_message.inc.php
+++ b/main/inc/global_error_message.inc.php
@@ -12,7 +12,7 @@
  */
 
 $Organisation = '<a href="http://www.dokeos.com" target="_blank">Dokeos Homepage</a>';
-$PoweredBy = 'Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; 2009';
+$PoweredBy = 'Platform <a href="http://www.dokeos.com" target="_blank"> Dokeos </a> &copy; '.date('Y');
 
 /**
  * English language variables.
diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 6da9b63355..65f3e38e4f 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -863,7 +863,7 @@ class GroupPortalManager
 	 */
 	public static function show_group_column_information($group_id, $user_id, $show = '') {
 		
-		global $relation_group_title;
+		global $relation_group_title, $my_group_role;
 		
 		$group_info 	= GroupPortalManager::get_group_data($group_id); 
 		$picture		= GroupPortalManager::get_picture_group($group_id, $group_info['picture_uri'],160,'medium_');
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 669a494802..8677e93e81 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -827,6 +827,8 @@ class MessageManager
 	 * @param int group id
 	 */
 	public static function display_messages_for_group($group_id) {
+				
+		global $my_group_role;
 						
 		$rows = self::get_messages_by_group($group_id);						
 		$rows = self::calculate_children($rows);
@@ -884,10 +886,12 @@ class MessageManager
 								$html .= '<a name="topic_'.$topic['id'].'"></a>';
 								$html.= '<div style="margin-bottom:10px">';
 									$html.= '<div id="message-reply-link" style="margin-right:10px">
-											<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';								
-									if ($topic['user_sender_id'] == $current_user_id) {
+											<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
+																			
+									if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $topic['user_sender_id'] == $current_user_id) {
 										$html.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$topic['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($_GET['items_page_nr']).'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
-									}								
+									}
+																	
 									$html.=	'</div>';
 									$html.= '<br />';											
 									$html.= '<div class="message-group-author">'.get_lang('From').'&nbsp;<a href="'.api_get_path(WEB_PATH).'main/social/profile.php?u='.$topic['user_sender_id'].'">'.$name.'&nbsp;</a></div>';		
@@ -913,7 +917,8 @@ class MessageManager
 								$html_items.= '<div id="message-reply-link">';
 
 								$html_items.=	'<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.api_get_user_id().'&group_id='.$group_id.'&message_id='.$item['id'].'&action=reply_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Reply').'">'.Display :: return_icon('forumthread_new.gif', get_lang('Reply')).'</a>';
-								if ($item['user_sender_id'] == $current_user_id) {
+								
+								if (($my_group_role == GROUP_USER_PERMISSION_ADMIN || $my_group_role == GROUP_USER_PERMISSION_MODERATOR) || $item['user_sender_id'] == $current_user_id) {
 									$html_items.= '&nbsp;&nbsp;<a href="'.api_get_path(WEB_CODE_PATH).'social/message_for_group_form.inc.php?view_panel=1&height=390&width=610&&user_friend='.$current_user_id.'&group_id='.$group_id.'&message_id='.$item['id'].'&action=edit_message_group&anchor_topic=topic_'.$topic['id'].'&topics_page_nr='.intval($_GET['topics_page_nr']).'&items_page_nr='.intval($items_page_nr).'&topic_id='.$topic['id'].'" class="thickbox" title="'.get_lang('Edit').'">'.Display :: return_icon('edit.gif', get_lang('Edit')).'</a>';
 								} 	
 								$html_items.= '</div>';
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 43aff2198d..9a11a3b72f 100755
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -12,6 +12,20 @@
  * Defines the learnpath parent class
  * @package dokeos.learnpath
  */
+ 
+// including the global file
+require_once '../inc/global.inc.php';
+
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#idTitle").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
 class learnpath {
 
 	var $attempt = 0; //the number for the current ID view
diff --git a/main/newscorm/lp_add.php b/main/newscorm/lp_add.php
index 2efcbae8a9..f5d1dc655d 100755
--- a/main/newscorm/lp_add.php
+++ b/main/newscorm/lp_add.php
@@ -65,6 +65,15 @@ $currentstyle = api_get_setting('stylesheets');
 //$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'css/'.$currentstyle.'/learnpath.css"/>';
 //$htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="learnpath.css" />'; //will be a merged with original learnpath.css
 $htmlHeadXtra[] = '<link rel="stylesheet" type="text/css" href="dtree.css" />'; //will be moved
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#idTitle").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
 /*
 -----------------------------------------------------------
 	Constants and variables
diff --git a/main/notebook/index.php b/main/notebook/index.php
index 981396a022..e04d22a5be 100755
--- a/main/notebook/index.php
+++ b/main/notebook/index.php
@@ -26,6 +26,16 @@ require_once api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php';
 
 // additional javascript
 $htmlHeadXtra[] = javascript_notebook();
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#notetitle").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
+
 
 // setting the tool constants
 $tool = TOOL_NOTEBOOK;
@@ -70,7 +80,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'addnote')
 	$form = new FormValidator('note','post', api_get_self().'?action='.Security::remove_XSS($_GET['action']));
 	// settting the form elements
 	$form->addElement('header', '', get_lang('NoteAddNew'));
-	$form->addElement('text', 'note_title', get_lang('NoteTitle'),array('size'=>'95'));
+	$form->addElement('text', 'note_title', get_lang('NoteTitle'),array('size'=>'95', 'id'=> 'notetitle'));
 	//$form->applyFilter('note_title', 'html_filter');
 	$form->addElement('html_editor', 'note_comment', get_lang('NoteComment'), null, api_is_allowed_to_edit()
 		? array('ToolbarSet' => 'Notebook', 'Width' => '100%', 'Height' => '300')
diff --git a/main/social/groups.php b/main/social/groups.php
index 68bed59d14..ba0f227f78 100755
--- a/main/social/groups.php
+++ b/main/social/groups.php
@@ -184,7 +184,7 @@ if (isset($_POST['token']) && $_POST['token'] === $_SESSION['sec_token']) {
 // getting group information
 $group_id	= intval($_GET['id']);
 $relation_group_title = '';
-
+$my_group_role = 0;
 if ($group_id != 0 ) {	
 	$user_leave_message = false;
 	$user_added_group_message = false;
diff --git a/main/survey/create_new_survey.php b/main/survey/create_new_survey.php
index de284267a6..7e14b856f7 100755
--- a/main/survey/create_new_survey.php
+++ b/main/survey/create_new_survey.php
@@ -34,21 +34,9 @@
 $language_file = 'survey';
 
 // including the global dokeos file
-require_once ('../inc/global.inc.php');
-$this_section=SECTION_COURSES;
-
-$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
+require_once '../inc/global.inc.php';
 
-		function advanced_parameters() {
-			if(document.getElementById(\'options\').style.display == \'none\') {
-					document.getElementById(\'options\').style.display = \'block\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
-			} else {
-					document.getElementById(\'options\').style.display = \'none\';
-					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
-			}
-		}
-	</script>';
+$this_section=SECTION_COURSES;
 
 // including additional libraries
 /** @todo check if these are all needed */
@@ -63,6 +51,26 @@ require_once (api_get_path(LIBRARY_PATH)."/groupmanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH)."/usermanager.lib.php");
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
+		function advanced_parameters() {
+			if(document.getElementById(\'options\').style.display == \'none\') {
+					document.getElementById(\'options\').style.display = \'block\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_hide.gif',get_lang('Hide'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
+			} else {
+					document.getElementById(\'options\').style.display = \'none\';
+					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
+			}
+		} 
+				
+		function setFocus(){
+		$("#SurveyCode").focus();
+		}
+		$(window).load(function () {
+		  setFocus();
+		});		
+	</script>';
+
 // Database table definitions
 $table_survey 				= Database :: get_course_table(TABLE_SURVEY);
 $table_user 				= Database :: get_main_table(TABLE_MAIN_USER);
@@ -147,7 +155,7 @@ if ($_GET['action'] == 'edit' AND isset($survey_id) AND is_numeric($survey_id))
 	$form->addElement('hidden', 'survey_id');
 }
 
-$survey_code = $form->addElement('text', 'survey_code', get_lang('SurveyCode'), array('size' => '20','maxlength'=>'20'));
+$survey_code = $form->addElement('text', 'survey_code', get_lang('SurveyCode'), array('size' => '20','maxlength'=>'20', 'id'=>'SurveyCode'));
 //$form->applyFilter('survey_code', 'html_filter');
 
 if ($_GET['action'] == 'edit') {
diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php
index f8f2418f88..269e58dcda 100755
--- a/main/survey/survey.lib.php
+++ b/main/survey/survey.lib.php
@@ -30,7 +30,20 @@
 * 	@todo use consistent naming for the functions (save vs store for instance)
 */
 $config['survey']['debug'] = false;
+//require_once '../inc/global.inc.php';
 require_once(api_get_path(LIBRARY_PATH).'usermanager.lib.php');
+
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
+		function setFocus(){
+		$("#keyword_title").focus();
+		}
+		$(window).load(function () {
+		  setFocus();
+		});		
+	</script>';
+
+
 class survey_manager
 {
 	/******************************************************************************************************
@@ -4383,7 +4396,7 @@ class SurveyUtil {
 						'.get_lang('Title').'
 					</div>
 					<div class="formw">
-						<input type="text" name="keyword_title"/>
+						<input type="text" id="keyword_title" name="keyword_title"/>
 					</div>
 				</div>';
 		echo '	<div class="row">
diff --git a/main/survey/survey_list.php b/main/survey/survey_list.php
index 8bfc40aa66..3fc3f267a1 100755
--- a/main/survey/survey_list.php
+++ b/main/survey/survey_list.php
@@ -39,7 +39,7 @@ if (!isset ($_GET['cidReq'])){
     $cidReset = true;
 }
 // including the global dokeos file
-require ('../inc/global.inc.php');
+require_once '../inc/global.inc.php';
 $this_section=SECTION_COURSES;
 
 // including additional libraries
diff --git a/main/user/userInfo.php b/main/user/userInfo.php
index 57c0d73266..a8b3334b61 100755
--- a/main/user/userInfo.php
+++ b/main/user/userInfo.php
@@ -501,7 +501,7 @@ elseif ($displayMode == "viewContentList") // default display
 
 				"<tr align=\"center\" bgcolor=\"#E6E6E6\">\n",
 				"<td align=\"left\">",get_lang('Name'),"</td>\n",
-				"<td width=\"100px\" align=\"left\">",get_lang('Description'),"</td>\n",
+				"<td width=\"20%\" align=\"left\">",get_lang('Description'),"</td>\n",
 				//"<td>",get_lang('Tutor'),"</td>\n",
 				"<td>",get_lang('CourseManager'),"</td>\n",
 				($allowedToEditDef?"<td>".get_lang('Edit')."</td>\n":""),
@@ -515,6 +515,7 @@ elseif ($displayMode == "viewContentList") // default display
 
 				//DISPLAY TABLE CONTENT
 
+
 				// deprecated feature
 				if ($mainUserInfo['tutor_id'] == 1)
 				{
@@ -522,7 +523,7 @@ elseif ($displayMode == "viewContentList") // default display
 				}
 				else
 				{
-					echo "<td> - </td>\n";
+					//echo "<td> - </td>\n";
 				}
 
 				if ($mainUserInfo['status'] == 1)
diff --git a/main/wiki/index.php b/main/wiki/index.php
index c2f2e8e6e1..94e69155f7 100755
--- a/main/wiki/index.php
+++ b/main/wiki/index.php
@@ -64,6 +64,7 @@ require_once 'wiki.inc.php';
 $htmlHeadXtra[] ='<link rel="stylesheet" type="text/css" href="'.api_get_path(WEB_CODE_PATH).'wiki/css/default.css"/>';
 
 // javascript for advanced parameters menu
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
 $htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
 function advanced_parameters() {
 	if(document.getElementById(\'options\').style.display == \'none\') {
@@ -74,6 +75,13 @@ function advanced_parameters() {
 					document.getElementById(\'plus_minus\').innerHTML=\'&nbsp;'.Display::return_icon('div_show.gif',get_lang('Show'),array('style'=>'vertical-align:middle')).'&nbsp;'.get_lang('AdvancedParameters').'\';
 	}
 }
+function setFocus(){
+	$("#search_term").focus();
+	}
+	$(window).load(function () {
+	  setFocus();
+	});				
+		
 </script>';
 
 
@@ -1032,7 +1040,7 @@ if ($_GET['action']=='searchpages')
 
 	// settting the form elements
 
-	$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles"');
+	$form->addElement('text', 'search_term', get_lang('SearchTerm'),'class="input_titles" id="search_term"');
 	$form->addElement('checkbox', 'search_content', null, get_lang('AlsoSearchContent'));
 	$form->addElement('style_submit_button', 'SubmitWikiSearch', get_lang('Search'), 'class="search"');
 
diff --git a/main/wiki/wiki.inc.php b/main/wiki/wiki.inc.php
index fa1cb503e1..56474165b8 100755
--- a/main/wiki/wiki.inc.php
+++ b/main/wiki/wiki.inc.php
@@ -32,6 +32,16 @@
 * 	@package dokeos.wiki
 */
 
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript" language="javascript">
+		function setFocus(){
+		$("#title").focus();
+		}
+		$(window).load(function () {
+		  setFocus();
+		});		
+	</script>';
+
 /*
 ==============================================================================
 FUNCTIONS FOR WIKI
@@ -598,7 +608,7 @@ return true;
 	//form
 	echo '<form name="form1" method="post" onsubmit="return CheckSend()" action="'.api_get_self().'?cidReq='.$_course[id].'&action=showpage&amp;title='.$page.'&group_id='.Security::remove_XSS($_GET['group_id']).'">';
 	echo '<div id="wikititle">';
-	echo  '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" name="title" value="'.urldecode($_GET['title']).'" size="40">';
+	echo  '<span class="form_required">*</span> '.get_lang(Title).': <input type="text" id="title" name="title" value="'.urldecode($_GET['title']).'" size="40">';
 
 	if(api_is_allowed_to_edit(false,true) || api_is_platform_admin())
 	{
diff --git a/main/work/work.php b/main/work/work.php
index 7d103a245e..83fb36b649 100755
--- a/main/work/work.php
+++ b/main/work/work.php
@@ -69,7 +69,7 @@ $language_file = array (
 	'document',
 	'admin'
 );
-require("../inc/global.inc.php");
+require_once '../inc/global.inc.php';
 // @todo why is this needed?
 //session
 if (isset ($_GET['id_session'])) {
@@ -95,7 +95,17 @@ require_once(api_get_path(LIBRARY_PATH).'text.lib.php');
 $this_section = SECTION_COURSES;
 $ctok = $_SESSION['sec_token'];
 $stok = Security::get_token();
+
 $htmlHeadXtra[] = to_javascript_work();
+$htmlHeadXtra[] = '<script src="'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.js" type="text/javascript" language="javascript"></script>'; //jQuery
+$htmlHeadXtra[] = '<script type="text/javascript">
+function setFocus(){
+$("#title").focus();
+}
+$(window).load(function () {
+  setFocus();
+});
+</script>';
 
 /*
 -----------------------------------------------------------
@@ -1394,7 +1404,7 @@ function draw_date_picker($prefix,$default='') {
 								</div>
 								<div class="formw">
 									<div id="msg_error1" style="display:none;color:red"></div>
-									<input type="text" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>
+									<input type="text" id="title" name="new_dir" onfocus="document.getElementById(\'msg_error1\').style.display=\'none\';"/>
 								</div>
 							</div>';
 		//$new_folder_text .= '<button type="button" name="create_dir" class="add" onClick="validate();" value="' . get_lang('Ok') . '"/>'.get_lang('CreateDirectory').'</button>';
diff --git a/user_portal.php b/user_portal.php
index 21044e5752..d2b9b28bde 100644
--- a/user_portal.php
+++ b/user_portal.php
@@ -1224,12 +1224,15 @@ if ($show_menu) {
 		}		
 		$img_array = UserManager::get_picture_user(api_get_user_id(), $img_array['file'], 92, USER_IMAGE_SIZE_MEDIUM, ' width="90" height="90" ');
 		
-		echo '<div id="social_widget" style="">';
-		if ($no_image == false)
-			echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
-		else 
-			echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
-			
+		echo '<div id="social_widget" >';
+		
+			echo '<div id="social_widget_image">';
+				if ($no_image == false)
+					echo '<a href="'.api_get_path(WEB_PATH).'main/social/profile.php"><img src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
+				else 
+					echo '<a href="'.api_get_path(WEB_PATH).'main/auth/profile.php"><img title="'.get_lang('EditProfile').'" src="'.$img_array['file'].'" '.$img_array['style'].' border="1"></a>';
+			echo '</div>';	
+					
 		require_once api_get_path(LIBRARY_PATH).'message.lib.php';
 		require_once api_get_path(LIBRARY_PATH).'social.lib.php';
 		require_once api_get_path(LIBRARY_PATH).'group_portal_manager.lib.php';
@@ -1247,9 +1250,8 @@ if ($show_menu) {
 		$cant_msg  = '';
 		if ($number_of_new_messages > 0)
 			$cant_msg = ' ('.$number_of_new_messages.')';
-			
-		echo '<div class="message-content">
-				<h2 class="message-title">'.get_lang('Messages').'</h2>
+				//<h2 class="message-title">'.get_lang('Messages').'</h2>
+		echo '<div class="message-content">			
 				<p>';
 				$link = '';
 				if (api_get_setting('show_tabs', 'social') == 'true') {
@@ -1264,10 +1266,9 @@ if ($show_menu) {
 			
 		echo '</p>';
 				
-		echo '</div>';
-	
+		echo '</div>';	
 		
-		echo '</div><br />';
+		echo '</div><div class="clear"></div>';
 				
 	
 	}