diff --git a/main/blog/blog.php b/main/blog/blog.php
index 4046e6c856..140fbc5d29 100644
--- a/main/blog/blog.php
+++ b/main/blog/blog.php
@@ -302,44 +302,11 @@ Blog :: display_minimonthcalendar($month, $year, $blog_id);
 					<?php Blog::get_personal_task_list(); ?>
 				</td>
 			</tr>
-		</table>
-		<!--
-		<br />
-		<table width="100%">
-			<tr>
-				<td class="blog_menu_title"><?php echo get_lang('FavoriteBlogs') ?></td>
-			</tr>
-			<tr>
-				<td class="blog_menu">
-					<ul>
-						<li>Favorite 1</li>
-						<li>Favorite 2</li>
-						<li>Favorite 3</li>
-					</ul>
-				</td>
-			</tr>
-		</table>
-		<br />
-		<table width="100%">
-			<tr>
-				<td class="blog_menu_title"><?php echo get_lang('TopTen') ?></td>
-			</tr>
-			<tr>
-				<td class="blog_menu">
-					<ul>
-						<li>Blog 1</li>
-						<li>Blog 2</li>
-						<li>Blog 3</li>
-					</ul>
-				</td>
-			</tr>
-		</table>
-	-->
+		</table>		
 	</td>
 	<td valign="top" class="blog_right">
 		<?php
 
-
 if ($error)
 	Display :: display_error_message($message);
 
@@ -376,16 +343,13 @@ if (isset ($_GET['task_id']) && is_numeric($_GET['task_id'])) {
 
 switch ($current_page) {
 	case 'new_post' :
-		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0))
-		{
+		if (api_is_allowed('BLOG_'.$blog_id, 'article_add', $user_task ? $task_id : 0)) {
 			// we show the form if
 			// 1. no post data
 			// 2. there is post data and the required field is empty
-			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title'])))
-			{
+			if (!$_POST OR (!empty($_POST) AND empty($_POST['post_title']))) {
 				// if there is post data there is certainly an error in the form
-				if ($_POST)
-				{
+				if ($_POST) {
 					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
 				}
 			Blog :: display_form_new_post($blog_id);
@@ -425,7 +389,7 @@ switch ($current_page) {
 				{
 					Display::display_error_message(get_lang('FormHasErrorsPleaseComplete'));
 				}
-			Blog :: display_form_edit_post($blog_id, Database::escape_string((int)$_GET['post_id']));
+                Blog :: display_form_edit_post($blog_id, Database::escape_string((int)$_GET['post_id']));
 			}
 			else
 			{
diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php
index 87e8c69ca6..2cb3fb19f3 100644
--- a/main/inc/lib/blog.lib.php
+++ b/main/inc/lib/blog.lib.php
@@ -1219,7 +1219,7 @@ class Blog {
 			echo '<div class="control-group">
 						<label class="control-label">
 							' . get_lang('AddAnAttachment') . '
-						</div>
+						</label>
 						<div class="controls">
 							<input type="file" name="user_upload"/>
 						</div>
@@ -1236,9 +1236,7 @@ class Blog {
 					</div>';
 
 			// submit
-			echo '<div class="control-group">
-						<label class="control-label">
-						</label>
+			echo '<div class="control-group">						
 						<div class="controls">
 								 <input type="hidden" name="action" value="" />
 								 <input type="hidden" name="new_post_submit" value="true" />
@@ -1298,15 +1296,14 @@ class Blog {
 			$oFCKeditor->ToolbarSet = 'Project';
 		}
 		$oFCKeditor->Value		= isset($_POST['post_full_text'])?stripslashes($_POST['post_full_text']):$blog_post_text;
-		echo '<div class="formw">';
+		echo '<div class="controls">';
 		echo $oFCKeditor->Create();
 		echo '</div>';
 
 		// submit
-		echo '	<div class="row">
-					<div class="label">
-					</div>
-					<div class="formw">
+		echo '	<div class="control-group">
+					
+					<div class="controls">
 							 <input type="hidden" name="action" value="" />
 							 <input type="hidden" name="edit_post_submit" value="true" />
 							 <input type="hidden" name="post_id" value="' . (int)$_GET['post_id'] . '" />
@@ -1475,31 +1472,31 @@ class Blog {
 		echo '<legend>'.get_lang('AddTask').'</legend>';
 
 		// task title
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('Title') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						<input name="task_name" type="text" size="70" />
 					</div>
 				</div>';
 
 		// task comment
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						' . get_lang('Description') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						<textarea name="task_description" cols="45"></textarea>
 					</div>
 				</div>';
 
 		// task management
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						' . get_lang('TaskManager') . '
-					</div>
-					<div class="formw">';
+					</label>
+					<div class="controls">';
 								echo "\t\t\t" . '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
 									echo "\t\t\t\t" . '<tr>' . "\n";
 										echo "\t\t\t\t\t" . '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
@@ -1521,11 +1518,11 @@ class Blog {
 
 
 		// task color
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						' . get_lang('Color') . '
-					</div>
-					<div class="formw">';
+					</label>
+					<div class="controls">';
 		echo '		   	<select name="task_color" id="color" style="width: 150px; background-color: #eeeeee" onchange="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value" onkeypress="document.getElementById(\'color\').style.backgroundColor=\'#\'+document.getElementById(\'color\').value">';
 								foreach ($colors as $color)
 								{
@@ -1537,10 +1534,8 @@ class Blog {
 				</div>';
 
 		// submit
-		echo '	<div class="row">
-					<div class="label">
-					</div>
-					<div class="formw">
+		echo '	<div class="control-group">					
+					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="new_task_submit" value="true" />
 						<button class="save" type="submit" name="Submit">' . get_lang('Save') . '</button>
@@ -1703,31 +1698,31 @@ class Blog {
 		echo '<legend>'.get_lang('AssignTask').'</legend>';
 
 		// user
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('SelectUser') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						'.$select_user_list.'
 					</div>
 				</div>';
 
 		// task
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('SelectTask') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						'.$select_task_list.'
 					</div>
 				</div>';
 
 		// date
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						<span class="form_required">*</span>' . get_lang('SelectTargetDate') . '
-					</div>
-					<div class="formw">';
+					</label>
+					<div class="controls">';
 		echo '			    <select name="task_day">';
 								for($i=1; $i<=31; $i++)
 								{
@@ -1769,10 +1764,10 @@ class Blog {
 				</div>';
 
 		// submit
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 					</div>
-					<div class="formw">
+					<div class="controls">
 							<input type="hidden" name="action" value="" />
 							<input type="hidden" name="assign_task_submit" value="true" />
 						<button class="save" type="submit" name="Submit">' . get_lang('Ok') . '</button>
@@ -2360,36 +2355,34 @@ class Blog {
 			$oFCKeditor->ToolbarSet = 'ProjectComment';
 		}
 		$oFCKeditor->Value		= isset($_POST['comment_text'])?stripslashes($_POST['comment_text']):'';
-		echo '<div class="formw">';
+		echo '<div class="controls">';
 		echo $oFCKeditor->Create() ;
 		echo '
 				</div>';
 
 		// attachment
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						' . get_lang('AddAnAttachment') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						<input type="file" name="user_upload"/>
 					</div>
 				</div>';
 
 		// attachment comment
-		echo '	<div class="row">
-					<div class="label">
+		echo '	<div class="control-group">
+					<label class="control-label">
 						' . get_lang('FileComment') . '
-					</div>
-					<div class="formw">
+					</label>
+					<div class="controls">
 						<textarea name="post_file_comment" cols="34" /></textarea>
 					</div>
 				</div>';
 
 		// attachment comment
-		echo '	<div class="row">
-					<div class="label">
-					</div>
-					<div class="formw">
+		echo '	<div class="control-group">					
+					<div class="controls">
 							 <input type="hidden" name="action" value="" />
 							 <input type="hidden" name="comment_parent_id" id="comment_parent_id" value="0" />';
 									if(isset($_GET['task_id']))
diff --git a/main/permissions/permissions_functions.inc.php b/main/permissions/permissions_functions.inc.php
index d41254d5de..761091f8bf 100644
--- a/main/permissions/permissions_functions.inc.php
+++ b/main/permissions/permissions_functions.inc.php
@@ -81,8 +81,8 @@ function store_one_permission($content, $action, $id, $tool,$permission) {
 	//}
 
 	// Which database are we using (depending on the $content parameter)
-	if($content=='user')
-	{
+    
+	if ($content=='user') {
 		$table=Database::get_course_table(TABLE_PERMISSION_USER);
 		$id_field = user_id;
 	}
@@ -101,8 +101,7 @@ function store_one_permission($content, $action, $id, $tool,$permission) {
 	if($action=='grant') {
 		$sql="INSERT INTO $table (c_id, $id_field,tool,action) VALUES ($course_id, '".Database::escape_string($id)."','".Database::escape_string($tool)."','".Database::escape_string($permission)."')";
 		$result=Database::query($sql);
-		if($result)
-		{
+		if($result) {
 			$result_message=get_lang('PermissionGranted');
 		}
 	}
diff --git a/main/permissions/roles.php b/main/permissions/roles.php
index 26ff53b669..208754b6da 100644
--- a/main/permissions/roles.php
+++ b/main/permissions/roles.php
@@ -12,9 +12,8 @@ require_once 'all_permissions.inc.php';
 $tool_name = get_lang('Roles'); // title of the page (should come from the language file)
 
 Display::display_header($tool_name);
-// ===================================================
 // 			ACTIONS
-// ===================================================
+
 
 // storing all the permission for a given role when the checkbox approach is used
 if ($_POST['StoreRolePermissions'])