diff --git a/main/css/blue_lagoon/default.css b/main/css/blue_lagoon/default.css
index 198a3b6009..837a7a2c61 100755
--- a/main/css/blue_lagoon/default.css
+++ b/main/css/blue_lagoon/default.css
@@ -2155,6 +2155,7 @@ span.radio {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/chamilo/default.css b/main/css/chamilo/default.css
index b8fe2189c1..db462815ba 100755
--- a/main/css/chamilo/default.css
+++ b/main/css/chamilo/default.css
@@ -2379,6 +2379,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/chamilo_green/default.css b/main/css/chamilo_green/default.css
index 8e20e4e648..85520ead31 100755
--- a/main/css/chamilo_green/default.css
+++ b/main/css/chamilo_green/default.css
@@ -2387,6 +2387,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/chamilo_red/default.css b/main/css/chamilo_red/default.css
index e3a7c22ac6..dc98c74acc 100755
--- a/main/css/chamilo_red/default.css
+++ b/main/css/chamilo_red/default.css
@@ -2383,6 +2383,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/cool_blue/default.css b/main/css/cool_blue/default.css
index 55ba4a69ba..3a2ebff493 100755
--- a/main/css/cool_blue/default.css
+++ b/main/css/cool_blue/default.css
@@ -2043,6 +2043,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/corporate/default.css b/main/css/corporate/default.css
index 52965f1486..b492a14cfd 100755
--- a/main/css/corporate/default.css
+++ b/main/css/corporate/default.css
@@ -1499,6 +1499,7 @@ span.radio {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/delicious_bordeaux/default.css b/main/css/delicious_bordeaux/default.css
index 5a7ad128a3..4f580dc9c7 100755
--- a/main/css/delicious_bordeaux/default.css
+++ b/main/css/delicious_bordeaux/default.css
@@ -2036,6 +2036,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/dokeos_blue/default.css b/main/css/dokeos_blue/default.css
index 86bfbb3912..a041a9b77a 100755
--- a/main/css/dokeos_blue/default.css
+++ b/main/css/dokeos_blue/default.css
@@ -2049,6 +2049,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/dokeos_classic/default.css b/main/css/dokeos_classic/default.css
index eacbb6b505..a6f949f7ce 100755
--- a/main/css/dokeos_classic/default.css
+++ b/main/css/dokeos_classic/default.css
@@ -2118,6 +2118,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/dokeos_classic_2D/default.css b/main/css/dokeos_classic_2D/default.css
index 5345fc9244..4ba49d6103 100755
--- a/main/css/dokeos_classic_2D/default.css
+++ b/main/css/dokeos_classic_2D/default.css
@@ -2152,6 +2152,7 @@ input.forms	{
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/empire_green/default.css b/main/css/empire_green/default.css
index 22a613160c..88c50d4f7e 100755
--- a/main/css/empire_green/default.css
+++ b/main/css/empire_green/default.css
@@ -2060,6 +2060,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/fruity_orange/default.css b/main/css/fruity_orange/default.css
index 79227a2c44..58f3b7eb9b 100755
--- a/main/css/fruity_orange/default.css
+++ b/main/css/fruity_orange/default.css
@@ -2060,6 +2060,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/medical/default.css b/main/css/medical/default.css
index 937acedbee..df7ec7a403 100755
--- a/main/css/medical/default.css
+++ b/main/css/medical/default.css
@@ -2077,6 +2077,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/public_admin/default.css b/main/css/public_admin/default.css
index e9c6267e67..24a7bf9860 100755
--- a/main/css/public_admin/default.css
+++ b/main/css/public_admin/default.css
@@ -2097,6 +2097,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/royal_purple/default.css b/main/css/royal_purple/default.css
index ed6003eaa3..f58d76901e 100755
--- a/main/css/royal_purple/default.css
+++ b/main/css/royal_purple/default.css
@@ -2056,6 +2056,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/silver_line/default.css b/main/css/silver_line/default.css
index a84eb53cf3..f4e3c5cc74 100755
--- a/main/css/silver_line/default.css
+++ b/main/css/silver_line/default.css
@@ -1764,6 +1764,7 @@ div.system_announcement {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/sober_brown/default.css b/main/css/sober_brown/default.css
index 0e83493bda..db3f380193 100755
--- a/main/css/sober_brown/default.css
+++ b/main/css/sober_brown/default.css
@@ -2116,6 +2116,7 @@ padding-top: 0px;	padding-right: 0px;	padding-bottom: 0px;	padding-left: 0px;}
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/steel_grey/default.css b/main/css/steel_grey/default.css
index 6cc29f8f1f..6ec86c1e5b 100755
--- a/main/css/steel_grey/default.css
+++ b/main/css/steel_grey/default.css
@@ -2061,6 +2061,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/css/tasty_olive/default.css b/main/css/tasty_olive/default.css
index 4382069dce..9061e0f2aa 100755
--- a/main/css/tasty_olive/default.css
+++ b/main/css/tasty_olive/default.css
@@ -2041,6 +2041,7 @@ div.comments {
 	float: left;
 	width: 25%;
 	text-align: left;
+	padding-top:8px;
 }
 .formw_result {
 	width: 75%;
diff --git a/main/gradebook/lib/fe/displaygradebook.php b/main/gradebook/lib/fe/displaygradebook.php
index b6cf260052..686267ccca 100755
--- a/main/gradebook/lib/fe/displaygradebook.php
+++ b/main/gradebook/lib/fe/displaygradebook.php
@@ -302,11 +302,9 @@ class DisplayGradebook
                  	$header .= '<td><a href="gradebook_edit_all.php?id_session='.intval($_SESSION['id_session']).'&amp;'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('statistics.gif', get_lang('EditAllWeights')).' ' . get_lang('EditAllWeights') . '</a>';
                 	$my_course_id=api_get_course_id();
                 	$my_file= substr($_SESSION['gradebook_dest'],0,5);
-                	if ($my_file!='index' || api_is_platform_admin()) {
-                		$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
-	            
-					}
+
 					if (api_is_allowed_to_edit(null, true)) {
+                		$header .= '<td style="vertical-align: top;"><a href="gradebook_scoring_system.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
 						$header .= '<td style="vertical-align: top;"><a href="gradebook_flatview.php?'.$my_api_cidreq.'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';		
 						$header .= '<td style="vertical-align: top;"><a href="../document/document.php?curdirpath=/certificates&'.$my_api_cidreq.'&origin=gradebook&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('certificate.png', get_lang('AttachCertificate')).' ' . get_lang('AttachCertificate') . '</a>';
 						$header .= '<td style="vertical-align: top;"><a href="gradebook_display_certificate.php?'.$my_api_cidreq.'&amp;cat_id='.(int)$_GET['selectcat'].'">'.Display::return_icon('gradebook_eval_not_empty.gif', get_lang('GradebookSeeListOfStudentsCertificates')).' ' . get_lang('GradebookSeeListOfStudentsCertificates') . '</a>';
@@ -344,8 +342,7 @@ class DisplayGradebook
 
 			if ($is_course_admin) {
 				$header .= '<a href="gradebook_flatview.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('stats_access.gif', get_lang('FlatView')).' '. get_lang('FlatView') . '</a>';
-				if ( api_is_platform_admin() /*$is_platform_admin || $is_course_admin*/)
-					$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
+				$header .= '<a href="gradebook_scoring_system.php?'.api_get_cidreq().'&selectcat=' . $catobj->get_id() .'">'.Display::return_icon('acces_tool.gif', get_lang('ScoreEdit')).' ' . get_lang('ScoreEdit') . '</a>';
 			} elseif (!(isset ($_GET['studentoverview']))) {
 				$header .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&studentoverview=&selectcat=' . $catobj->get_id() . '">'.Display::return_icon('view_list.gif', get_lang('FlatView')).' ' . get_lang('FlatView') . '</a>';
 			} else {
diff --git a/main/gradebook/lib/fe/evalform.class.php b/main/gradebook/lib/fe/evalform.class.php
index caff914c80..94ba060a39 100755
--- a/main/gradebook/lib/fe/evalform.class.php
+++ b/main/gradebook/lib/fe/evalform.class.php
@@ -120,14 +120,14 @@ class EvalForm extends FormValidator
 		$this->addElement('hidden', 'minvalue', 0);
 		$this->addElement('header','h1','<b>'.get_lang('EditResult').'</b>');
 		$renderer = $this->defaultRenderer();
-		$elementTemplateTwoLabel = '<div class="row"><ul style="list-style-type:none;">
+		$elementTemplateTwoLabel = '<div><div class="row"><ul style="list-style-type:none;">
 			<li><div class="label_result" >
 			<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
 			</div>
 			<div class="formw_result">
 			<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->	{element} / '.$this->evaluation_object->get_max().'
 			</div></li></ul>
-			</div>';
+			</div></div>';
 
 		$results_and_users = array();
 		foreach ($this->result_object as $result) {
@@ -192,14 +192,14 @@ class EvalForm extends FormValidator
 		$this->addElement('header','h1','<b>'.get_lang('AddResult').'</b>');
 
 		$renderer = $this->defaultRenderer();
-		$elementTemplateTwoLabel = '<div class="row">
-			<div class="label_result">
+		$elementTemplateTwoLabel = '<div><div class="row" ><ul style="list-style-type:none;">
+			<li><div class="label_result">
 			<!-- BEGIN required --><span class="form_required">*</span> <!-- END required -->{label}
 			</div>
 			<div class="formw_result">
 			<!-- BEGIN error --><span class="form_error">{error}</span><br /><!-- END error -->	{element} / '.$this->evaluation_object->get_max().'
-			</div>
-			</div>';
+			</div></li></ul>
+			</div></div>';
 		foreach ($tblusers as $user) {
 			//user_id, user.username, lastname, firstname
 			$this->add_textfield('score[' . $user[0] . ']',
diff --git a/main/img/nocertificate.png b/main/img/nocertificate.png
index 063746d702..5fdc9c6dd5 100755
Binary files a/main/img/nocertificate.png and b/main/img/nocertificate.png differ