diff --git a/main/calendar/agenda.lib.php b/main/calendar/agenda.lib.php
index 4620d6417d..769fd49745 100644
--- a/main/calendar/agenda.lib.php
+++ b/main/calendar/agenda.lib.php
@@ -8,7 +8,7 @@ class Agenda {
 		$this->events				= array();
 		
 		$this->event_platform_color = 'red';//red
-		$this->event_course_color 	= '#6B8E23'; //green
+		$this->event_course_color 	= '#458B00'; //green
 		$this->event_group_color 	= '#A0522D'; //siena
 		$this->event_session_color 	= '#000080'; // blue
 		$this->event_personal_color = 'steel blue'; //steel blue
@@ -33,8 +33,7 @@ class Agenda {
 		$my_course_list = CourseManager::get_courses_list_by_user_id(api_get_user_id(), true);
 		foreach($my_course_list as $course_item) {			
 			$this->get_course_events($start, $end, $course_item);
-		}
-		
+		}		
 		
 		if (!empty($this->events)) {
 			return json_encode($this->events);
@@ -50,8 +49,7 @@ class Agenda {
 		//$table_agenda = Database::get_course_table ( TABLE_AGENDA );
 		switch($type) {
 			case 'personal':
-				$personal_event = $this->get_personal_event($id);
-				
+				$personal_event = $this->get_personal_event($id);				
 				if (!empty($personal_event)) {
 					$sql = "UPDATE $this->tbl_personal_agenda SET date = DATE_ADD(date,INTERVAL $delta MINUTE), enddate = DATE_ADD(enddate,INTERVAL $delta MINUTE) 
 							WHERE id=".intval($id);
diff --git a/main/exercice/admin.php b/main/exercice/admin.php
index 75e139e070..547c632fe5 100755
--- a/main/exercice/admin.php
+++ b/main/exercice/admin.php
@@ -195,7 +195,6 @@ if ($editQuestion || $newQuestion || $modifyQuestion || $modifyAnswers) {
 		if ($editQuestion) {
 			// question not found
 			if (!$objQuestion = Question::read($editQuestion)) {
-				//die(get_lang('QuestionNotFound'));
 				api_not_allowed();
 			}
 			// saves the object into the session
diff --git a/main/exercice/exercise_submit.php b/main/exercice/exercise_submit.php
index a451b1b40d..cd4bb4b7ec 100644
--- a/main/exercice/exercise_submit.php
+++ b/main/exercice/exercise_submit.php
@@ -521,7 +521,7 @@ if ($question_count != 0) {
 	    }
 	}
 } else {
-	$error = get_lang('QuestionNotFound');
+	$error = get_lang('ThereAreNoQuestionsForThisExercise');
 }
 
 if (!empty ($_GET['gradebook']) && $_GET['gradebook'] == 'view') {
diff --git a/main/inc/lib/group_portal_manager.lib.php b/main/inc/lib/group_portal_manager.lib.php
index 15692c2ded..84e59c372b 100755
--- a/main/inc/lib/group_portal_manager.lib.php
+++ b/main/inc/lib/group_portal_manager.lib.php
@@ -957,40 +957,11 @@ class GroupPortalManager {
 		}
 
 		if (!empty($links)) {
-			echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
+			//echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.cut($group_info['name'], GROUP_TITLE_LENGTH, true).'</span></div>';
+			//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
 			echo '<ul class="social-menu-groups">';
 			echo $links;
 			echo '</ul>';
 		}
-
-		
-		/*
-		// my other groups
-		if (count($groups_by_user) > 1) {
-			echo '<div align="center" class="social-menu-title"><span class="social-menu-text1">'.get_lang('MyOtherGroups').'</span></div>';
-			echo '<div align="center">';
-				$min_count_groups = 4;
-				$i = 1;
-				$more_link = false;
-				foreach($groups_by_user as $group) {
-					if ($group['id'] == $group_id) continue;
-					if ($i > $min_count_groups) {
-						$more_link = true;
-						break;
-					}
-					$picture = GroupPortalManager::get_picture_group($group['id'], $group['picture_uri'],80);
-					echo '<a href="groups.php?id='.$group['id'].'">';
-					echo '<img height="44" border="2" align="middle" width="44" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
-					echo '<div>'.cut($group['name'],50,true).'</div></a>';
-					$i++;
-				}
-				if ($more_link) {
-					//More link
-					echo '<div class="mygroups_more" style="margin-top:20px;"><a href="groups.php?view=mygroups">'.get_lang('SeeMore').'</a></div>';
-				}
-			echo '</div>';
-		}
-		*/
 	}
-}
-?>
+}
\ No newline at end of file
diff --git a/main/inc/lib/social.lib.php b/main/inc/lib/social.lib.php
index f4fab6b844..53a43ad208 100755
--- a/main/inc/lib/social.lib.php
+++ b/main/inc/lib/social.lib.php
@@ -628,11 +628,12 @@ class SocialManager extends UserManager {
 	  	}
 
 		if (!in_array($show, array('shared_profile', 'groups', 'group_edit', 'member_list','waiting_list','invite_friends'))) {
-			echo '<div align="center" class="social-menu-title">';
-			echo '<span class="social-menu-text1">'.get_lang('Menu').'</span>';
-			echo '</div>';
+			//echo Display::div(get_lang('Actions') ,array('class' => 'social_menu_option'));
+			/*echo '<div align="center" class="social-menu-title">';
+			echo '<span>'.get_lang('Optoi').'</span>';
+			echo '</div>';*/
 
-	        echo '<div><ul>';
+	        echo '<div class="social_menu_items"><ul>';
 	        	                	
             echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/home.php">'.Display::return_icon('home.png',get_lang('Home'),array('hspace'=>'6')).'<span class="'.($show=='home'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Home').'</span></a></li>';
             echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php?f=social">'.Display::return_icon('instant_message.png',get_lang('Messages'),array('hspace'=>'6')).'<span class="'.($show=='messages'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Messages').$count_unread_message.'</span></a></li>';
@@ -659,9 +660,8 @@ class SocialManager extends UserManager {
         }
 
         if ($show == 'shared_profile') {
-
-				echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
-	        	echo 	'<div>
+				//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('Menu').'</span></div>';
+	        	echo '<div class="social_menu_items">
 	                	<ul>';
 
     	  	// My own profile
@@ -745,8 +745,8 @@ class SocialManager extends UserManager {
 		    		}
 	    	  	}
 	    	  	if (!empty($announcements)) {
-			    	echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('ToolAnnouncement').'</span></div>';
-					echo '<div>';
+			    	//echo '<div align="center" class="social-menu-title" ><span class="social-menu-text1">'.get_lang('ToolAnnouncement').'</span></div>';
+					echo '<div class="social_menu_items">';
 					echo '<ul>';
 						foreach ($announcements as $announcement) {
 							echo $announcement;
diff --git a/main/social/home.php b/main/social/home.php
index 0435435494..4d15f890f4 100755
--- a/main/social/home.php
+++ b/main/social/home.php
@@ -79,7 +79,8 @@ echo '<div id="social-content">';
 	echo '</div>';
 	echo '<div id="social-content-right">';
 		echo '<div class="social-box-main1">';
-			echo '<div class="rounded_div" style="width:280px">';
+			echo '<div class="social_user_information" style="width:280px">';
+				echo '<div class="social-groups-home-title">'.get_lang('ContactInformation').'</div>';
 			
 			   // information current user		       
                echo '<div><p><strong>'.get_lang('Name').'</strong><br /><span class="social-groups-text4">'.api_get_person_name($user_info['firstname'], $user_info['lastname']).'</span></p></div>