diff --git a/main/course_description/add.php b/main/course_description/add.php
index cc044f953f..8c83e8328d 100755
--- a/main/course_description/add.php
+++ b/main/course_description/add.php
@@ -58,8 +58,8 @@ $form = new FormValidator(
     'index.php?action=add&'.api_get_cidreq()
 );
 $form->addElement('header', '', $header);
-$form->addElement('hidden', 'description_type',$description_type);
-$form->addElement('hidden', 'sec_token',$token);
+$form->addElement('hidden', 'description_type', $description_type);
+$form->addElement('hidden', 'sec_token', $token);
 $form->addText('title', get_lang('Title'), true, array('size'=>'width: 350px;'));
 $form->applyFilter('title','html_filter');
 $form->addHtmlEditor(
diff --git a/main/course_description/course_description_controller.php b/main/course_description/course_description_controller.php
index 3c1cf0a51b..354261e91b 100644
--- a/main/course_description/course_description_controller.php
+++ b/main/course_description/course_description_controller.php
@@ -87,7 +87,9 @@ class CourseDescriptionController
                     $id = $_POST['id'];
                     if (empty($id)) {
                         // If the ID was not provided, find the first matching description item given the item type
-                        $description = $course_description->get_data_by_description_type($description_type);
+                        $description = $course_description->get_data_by_description_type(
+                            $description_type
+                        );
                         if (count($description) > 0) {
                             $id = $description['id'];
                         }
@@ -107,12 +109,14 @@ class CourseDescriptionController
                         $affected_rows = $course_description->insert();
                     }
                     Security::clear_token();
-                }
 
-                if ($affected_rows) {
-                    $message['edit'] = true;
+                    Display::addFlash(
+                        Display::return_message(
+                            get_lang('CourseDescriptionUpdated')
+                        )
+                    );
                 }
-                $this->listing(false, $message);
+                $this->listing(false);
             } else {
                 $data['error'] = 1;
                 $data['default_description_titles'] = $course_description->get_default_description_title();
@@ -202,11 +206,14 @@ class CourseDescriptionController
                         $affected_rows = $course_description->insert(api_get_course_int_id());
                     }
                     Security::clear_token();
+
+                    Display::addFlash(
+                        Display::return_message(
+                            get_lang('CourseDescriptionUpdated')
+                        )
+                    );
                 }
-                if ($affected_rows) {
-                    $message['add'] = true;
-                }
-                $this->listing(false, $message);
+                $this->listing(false);
             } else {
                 $data['error'] = 1;
                 $data['default_description_titles'] = $course_description->get_default_description_title();
@@ -240,7 +247,7 @@ class CourseDescriptionController
     /**
      * It's used for destroy a course description,
      * render to listing view
-     * @param int description type
+     * @param int $id description type
      */
     public function destroy($id)
     {
@@ -249,11 +256,11 @@ class CourseDescriptionController
         $course_description->set_session_id($session_id);
         if (!empty($id)) {
             $course_description->set_id($id);
-            $affected_rows = $course_description->delete();
-        }
-        if ($affected_rows) {
-            $message['destroy'] = true;
+            $course_description->delete();
+            Display::addFlash(
+                Display::return_message(get_lang('CourseDescriptionDeleted'))
+            );
         }
-        $this->listing(false, $message);
+        $this->listing(false);
     }
 }
diff --git a/main/course_description/listing.php b/main/course_description/listing.php
index fca200c9e8..06b4831337 100755
--- a/main/course_description/listing.php
+++ b/main/course_description/listing.php
@@ -10,15 +10,6 @@
 // protect a course script
 api_protect_course_script(true);
 
-// display messages
-if ((isset($messages['edit']) && $messages['edit']) ||
-    (isset($messages['add']) && $messages['add'])
-) {
-	Display :: display_confirmation_message(get_lang('CourseDescriptionUpdated'));
-} else if (isset($messages['destroy']) && $messages['destroy']) {
-	Display :: display_confirmation_message(get_lang('CourseDescriptionDeleted'));
-}
-
 // display actions menu
 if (api_is_allowed_to_edit(null,true)) {
     $categories = array();
@@ -32,10 +23,12 @@ if (api_is_allowed_to_edit(null,true)) {
 	ksort($categories);
 	foreach ($categories as $id => $title) {
 		if ($i==ADD_BLOCK) {
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.
+                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
 			break;
 		} else {
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
+			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.
+                Display::return_icon($default_description_icon[$id], $title,'',ICON_SIZE_MEDIUM).'</a>';
 			$i++;
 		}
 	}
@@ -45,7 +38,12 @@ $history = isset($history) ? $history : null;
 
 // display course description list
 if ($history) {
-	echo '<div><table width="100%"><tr><td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td><td align="right"><a href="index.php?action=listing">'.Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'),array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
+	echo '<div>
+        <table width="100%">
+            <tr>
+                <td><h3>'.get_lang('ThematicAdvanceHistory').'</h3></td>
+                <td align="right"><a href="index.php?action=listing">'.
+                Display::return_icon('info.png',get_lang('BackToCourseDesriptionList'), array('style'=>'vertical-align:middle;'),ICON_SIZE_SMALL).' '.get_lang('BackToCourseDesriptionList').'</a></td></tr></table></div>';
 }
 
 $user_info = api_get_user_info();