diff --git a/main/gradebook/gradebook_flatview.php b/main/gradebook/gradebook_flatview.php
index cc53983b10..b5284b2b21 100755
--- a/main/gradebook/gradebook_flatview.php
+++ b/main/gradebook/gradebook_flatview.php
@@ -280,15 +280,11 @@ if (isset($_GET['isStudentView']) && $_GET['isStudentView'] == 'false') {
         $simple_search_form
     );
 
-    // main graph
+    // Table
     $flatviewtable->display();
-    // @todo this needs a fix
-    //$image_file = $flatviewtable->display_graph();
+
     //@todo load images with jquery
     echo '<div id="contentArea" style="text-align: center;" >';
-    if (!empty($image_file)) {
-        echo '<img src="'.$image_file.'">';
-    }
     $flatviewtable->display_graph_by_resource();
     echo '</div>';
 }
diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php
index c4f8fadce4..ddaa1ce429 100755
--- a/main/gradebook/lib/fe/linkaddeditform.class.php
+++ b/main/gradebook/lib/fe/linkaddeditform.class.php
@@ -67,7 +67,13 @@ class LinkAddEditForm extends FormValidator
 		if (count($category_object) == 1) {
 			$this->addElement('hidden', 'select_gradebook', $category_object[0]->get_id());
 		} else {
-			$select_gradebook = $this->addElement('select', 'select_gradebook', get_lang('SelectGradebook'), array(), array('id' => 'hide_category_id'));
+			$select_gradebook = $this->addElement(
+				'select',
+				'select_gradebook',
+				get_lang('SelectGradebook'),
+				array(),
+				array('id' => 'hide_category_id')
+			);
 			$this->addRule('select_gradebook', get_lang('ThisFieldIsRequired'), 'nonzero');
 
 			$default_weight = 0;
diff --git a/main/gradebook/lib/flatview_data_generator.class.php b/main/gradebook/lib/flatview_data_generator.class.php
index 710cc6c3b2..c2c39ff36a 100755
--- a/main/gradebook/lib/flatview_data_generator.class.php
+++ b/main/gradebook/lib/flatview_data_generator.class.php
@@ -438,7 +438,8 @@ class FlatViewDataGenerator
                     }
 
                     if (!isset($this->params['only_total_category']) ||
-                        (isset($this->params['only_total_category']) && $this->params['only_total_category'] == false)
+                        (isset($this->params['only_total_category']) &&
+                        $this->params['only_total_category'] == false)
                     ) {
                         if (!$show_all) {
                             $row[] = $temp_score.' ';
@@ -533,7 +534,7 @@ class FlatViewDataGenerator
 
         $evaluationsAdded = array();
 
-        for ($count = 0; ($count < $items_count) && ($items_start + $count < count($this->evals_links)); $count++) {
+        for ($count = 0; $count < $items_count && ($items_start + $count < count($this->evals_links)); $count++) {
             /** @var AbstractLink $item */
             $item = $this->evals_links[$count + $items_start];
 
@@ -591,14 +592,14 @@ class FlatViewDataGenerator
             ) {
                 if (!$show_all) {
                     if (in_array($item->get_type(), array(
-                            LINK_EXERCISE,
-                            LINK_DROPBOX,
-                            LINK_STUDENTPUBLICATION,
-                            LINK_LEARNPATH,
-                            LINK_FORUM_THREAD,
-                            LINK_ATTENDANCE,
-                            LINK_SURVEY,
-                            LINK_HOTPOTATOES)
+                        LINK_EXERCISE,
+                        LINK_DROPBOX,
+                        LINK_STUDENTPUBLICATION,
+                        LINK_LEARNPATH,
+                        LINK_FORUM_THREAD,
+                        LINK_ATTENDANCE,
+                        LINK_SURVEY,
+                        LINK_HOTPOTATOES)
                     )
                     ) {
                         if (!empty($score[0])) {