diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php
index abae788719..c8ce656e85 100644
--- a/main/exercice/exercice.php
+++ b/main/exercice/exercice.php
@@ -163,7 +163,7 @@ $htmlHeadXtra[] = '<script>
             });
         });*/
 
-     $(".data_table tbody").sortable({
+     /*$(".data_table tbody").sortable({
         cursor: "move", // works?
         update: function(event, ui) {
             var order = $(this).sortable("serialize") + "&a=update_exercise_list_order";
@@ -174,7 +174,7 @@ $htmlHeadXtra[] = '<script>
         axis: "y",
         placeholder: "ui-state-highlight", //defines the yellow highlight
         handle: ".moved", //only the class "moved"
-    });
+    });*/
 });
 </script>';
 
diff --git a/main/exercice/question.class.php b/main/exercice/question.class.php
index b4232532de..835b7344ba 100644
--- a/main/exercice/question.class.php
+++ b/main/exercice/question.class.php
@@ -11,8 +11,6 @@
  * Code
  */
 
-if(!class_exists('Question')):
-
 // Question types
 define('UNIQUE_ANSWER',                             1);
 define('MULTIPLE_ANSWER',                           2);
@@ -1209,35 +1207,49 @@ abstract class Question
 
 		// html editor
 		$editor_config = array('ToolbarSet' => 'TestQuestionDescription', 'Width' => '100%', 'Height' => '150');
-		if(is_array($fck_config)){
+		if (is_array($fck_config)){
 			$editor_config = array_merge($editor_config, $fck_config);
 		}
 
-		if(!api_is_allowed_to_edit(null,true)) $editor_config['UserStatus'] = 'student';
+		if (!api_is_allowed_to_edit(null,true)) {
+            $editor_config['UserStatus'] = 'student';
+        }
 
 		$form->addElement('advanced_settings','
 			<a href="javascript://" onclick=" return show_media()"><span id="media_icon"><img style="vertical-align: middle;" src="../img/looknfeel.png" alt="" />&nbsp;'.get_lang('EnrichQuestion').'</span></a>
 		');
 
-		$form -> addElement ('html','<div class="HideFCKEditor" id="HiddenFCKquestionDescription" >');
+		$form->addElement ('html','<div class="HideFCKEditor" id="HiddenFCKquestionDescription" >');
 		$form->add_html_editor('questionDescription', get_lang('QuestionDescription'), false, false, $editor_config);
-		$form -> addElement ('html','</div>');
+		$form->addElement ('html','</div>');
+
+        // hidden values
+		$form->addElement('hidden', 'myid', intval($_REQUEST['myid']));
+
+        if ($this->type != MEDIA_QUESTION) {
 
-		// Advanced parameters
-		$form->addElement('advanced_settings','<a href="javascript:void(0)" onclick="visiblerDevisibler(\'id_advancedOption\')"><img id="id_advancedOptionImg" style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang("AdvancedParameters").'</a>');
+            // Advanced parameters
+            $form->addElement('advanced_settings','<a href="javascript:void(0)" onclick="visiblerDevisibler(\'id_advancedOption\')"><img id="id_advancedOptionImg" style="vertical-align:middle;" src="../img/div_show.gif" alt="" />&nbsp;'.get_lang("AdvancedParameters").'</a>');
 
-		$select_level = array (1=>1,2=>2,3=>3,4=>4,5=>5);
+            $form->addElement('html','<div id="id_advancedOption" style="display:none;">');
 
-        $form->addElement('html','<div id="id_advancedOption" style="display:none;">');
+            $select_level = Question::get_default_levels();
+            $form->addElement('select', 'questionLevel', get_lang('Difficulty'), $select_level);
 
-        $form->addElement('select', 'questionLevel',get_lang('Difficulty'), $select_level);
+            // Categories
+            //$category_list = Testcategory::getCategoriesIdAndName();
+            //$form->addElement('select', 'questionCategory', get_lang('Category'), $category_list, array('multiple' => 'multiple'));
 
-		// Categories
-		$tabCat = Testcategory::getCategoriesIdAndName();
-		$form->addElement('select', 'questionCategory', get_lang('Category'), $tabCat);
+            // Categories
+            $tabCat = Testcategory::getCategoriesIdAndName();
+            $form->addElement('select', 'questionCategory', get_lang('Category'), $tabCat);
 
-		// hidden values
-		$form->addElement('hidden','myid', intval($_REQUEST['myid']));
+            //Medias
+            $course_medias = Question::prepare_course_media_select(api_get_course_int_id());
+            $form->addElement('select', 'parent_id', get_lang('AttachToMedia'), $course_medias);
+
+            $form->addElement('html','</div>');
+        }
 
         if (!isset($_GET['fromExercise'])) {
             switch ($answerType) {
@@ -1262,7 +1274,6 @@ abstract class Question
             }
         }
 
-		$form->addElement('html','</div>');
 
 		// default values
 		$defaults = array();
@@ -1271,6 +1282,9 @@ abstract class Question
 		$defaults['questionLevel']          = $this -> level;
 		$defaults['questionCategory']       = $this->category;
 
+        //$defaults['questionCategory']       = $this->category_list;
+        //$defaults['parent_id']              = $this->parent_id;
+
         //Came from he question pool
         if (isset($_GET['fromExercise'])) {
             $form->setDefaults($defaults);
@@ -1291,15 +1305,21 @@ abstract class Question
 	 * @param FormValidator $form the formvalidator instance
 	 * @param Exercise $objExercise the Exercise instance
 	 */
-	function processCreation ($form, $objExercise) {
+	function processCreation ($form, $objExercise = null) {
+        //$this->updateParentId($form->getSubmitValue('parent_id'));
 		$this->updateTitle($form->getSubmitValue('questionName'));
 		$this->updateDescription($form->getSubmitValue('questionDescription'));
 		$this->updateLevel($form->getSubmitValue('questionLevel'));
 		$this->updateCategory($form->getSubmitValue('questionCategory'));
-		$this->save($objExercise -> id);
-		// modify the exercise
-		$objExercise->addToList($this -> id);
-		$objExercise->update_question_positions();
+
+          //Save normal question if NOT media
+        if ($this->type != MEDIA_QUESTION) {
+            $this->save($objExercise->id);
+
+            // modify the exercise
+            $objExercise->addToList($this->id);
+            $objExercise->update_question_positions();
+        }
 	}
 
 	/**
@@ -1441,6 +1461,10 @@ abstract class Question
         // display question category, if any
         $header = Testcategory::returnCategoryAndTitle($this->id);
 
+        if ($show_media) {
+            $header .= $this->show_media_content();
+        }
+
         $header .= Display::page_subheader2($counter_label.". ".$question_title);
         //$header .=  Display::div('<div class="rib rib-'.$class.'"><h3>'.$score_label.'</h3></div> <h4>'.($score['result']).' </h4><h5 class="'.$class.'">'.$score['result'].' </h5>', array('class'=>'ribbon'));
 	    $header .= Display::div('<div class="rib rib-'.$class.'"><h3>'.$score_label.'</h3></div> <h4>'.$score['result'].' </h4>', array('class'=>'ribbon'));
@@ -1556,13 +1580,13 @@ abstract class Question
     }
 
     static function get_default_levels() {
-        $select_level = array (
+        $select_level = array(
                 1=>1,
                 2=>2,
                 3=>3,
                 4=>4,
                 5=>5
-            );
+        );
         return $select_level;
     }
 
@@ -1577,5 +1601,4 @@ abstract class Question
         }
         return $html;
     }
-}
-endif;
+}
\ No newline at end of file
diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php
index 4ff22a1eab..4d8b84a78f 100644
--- a/main/inc/ajax/model.ajax.php
+++ b/main/inc/ajax/model.ajax.php
@@ -123,6 +123,7 @@ switch ($action) {
     case 'get_course_exercise_medias':
         $course_id = api_get_course_int_id();
         $count = Question::get_count_course_medias($course_id);
+        break;
 	case 'get_user_skill_ranking':
     	$skill = new Skill();
 	    $count = $skill->get_user_list_skill_ranking_count();
@@ -536,6 +537,9 @@ $allowed_actions = array('get_careers',
                          'get_grade_models',
                          'get_event_email_template',
                          'get_user_skill_ranking',
+                         //'get_extra_fields',
+                         //'get_extra_field_options',
+                         //'get_course_exercise_medias',
                          'get_user_course_report'
 );