diff --git a/main/exercice/exercice_submit.php b/main/exercice/exercice_submit.php
index 76ac452519..3cc17de356 100644
--- a/main/exercice/exercice_submit.php
+++ b/main/exercice/exercice_submit.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercice_submit.php 20089 2009-04-24 21:12:54Z cvargas1 $
+<?php // $Id: exercice_submit.php 20200 2009-04-29 22:14:55Z cvargas1 $
 
 /*
 ==============================================================================
@@ -42,7 +42,7 @@
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
 * 	@author Julio Montoya multiple fill in blank option added
-* 	@version $Id: exercice_submit.php 20089 2009-04-24 21:12:54Z cvargas1 $
+* 	@version $Id: exercice_submit.php 20200 2009-04-29 22:14:55Z cvargas1 $
 */
 
 
@@ -1044,7 +1044,7 @@ else
 	echo "	  	
 		 <!-- <button type='submit' name='buttonCancel' class='cancel'>".get_lang('Cancel')."</button>
 	   &nbsp;&nbsp; //--><br />";
-		$submit_btn="<button class=\"save\" type='submit' name='submit'>";
+		$submit_btn="<button class='next' type='submit' name='submit'>";
 		//	$submit_btn.=get_lang('ValidateAnswer'); 
 		if ($objExercise->selectFeedbackType()==1 && $_SESSION['objExercise']->selectType()==2) {				
 			$submit_btn='';
@@ -1066,11 +1066,11 @@ else
 		} else {
 			if ($exerciseType == 1 || $nbrQuestions == $questionNum)
 			{
-				$submit_btn.=get_lang('ValidateAnswer'); 
+				$submit_btn.=get_lang('ValidateAnswer');
 			}
 			else
 			{
-				$submit_btn.=get_lang('NextQuestion').' &gt;';
+				$submit_btn.=get_lang('NextQuestion');
 			}
 			$submit_btn.= "</button>"; 
 		}	
diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php
index 692427dd32..276b0d967f 100644
--- a/main/exercice/exercise.class.php
+++ b/main/exercice/exercise.class.php
@@ -25,7 +25,7 @@
 *	Exercise class: This class allows to instantiate an object of type Exercise
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert
-* 	@version $Id: exercise.class.php 20159 2009-04-28 20:22:40Z juliomontoya $
+* 	@version $Id: exercise.class.php 20200 2009-04-29 22:14:55Z cvargas1 $
 */
 
 
@@ -905,8 +905,8 @@ class Exercise
 			//	$form -> addElement('select', 'exerciseFeedbackType',get_lang('FeedbackType'),$feedback_option,'onchange="javascript:feedbackselection()"');
 				// test type
 				$radios = array();
-				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('QuestionsPerPageOne'),'1');
-				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('QuestionsPerPageAll'),'2');
+				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('QuestionsPerPageOne'),'2');
+				$radios[] = FormValidator :: createElement ('radio', 'exerciseType', null, get_lang('QuestionsPerPageAll'),'1');
 				$form -> addGroup($radios, null, get_lang('QuestionsPerPage'));							
 			} else {
 				// if is Directfeedback but has not questions we can allow to modify the question type
diff --git a/main/exercice/exercise.lib.php b/main/exercice/exercise.lib.php
index 82a789f110..d6ffba07e2 100644
--- a/main/exercice/exercise.lib.php
+++ b/main/exercice/exercise.lib.php
@@ -1,4 +1,4 @@
-<?php // $Id: exercise.lib.php 20143 2009-04-28 00:39:27Z iflorespaz $
+<?php // $Id: exercise.lib.php 20200 2009-04-29 22:14:55Z cvargas1 $
  
 /*
 ==============================================================================
@@ -29,7 +29,7 @@
 * 	shows a question and its answers
 *	@package dokeos.exercise
 * 	@author Olivier Brouckaert <oli.brouckaert@skynet.be>
-* 	@version $Id: exercise.lib.php 20143 2009-04-28 00:39:27Z iflorespaz $
+* 	@version $Id: exercise.lib.php 20200 2009-04-29 22:14:55Z cvargas1 $
 */
 
 /**
@@ -287,7 +287,7 @@ function showQuestion($questionId, $onlyAnswers=false, $origin=false,$current_it
 		$objAnswerTmp=new Answer($questionId);
 		$nbrAnswers=$objAnswerTmp->selectNbrAnswers();
 
-		$answer_list = '<div style="padding: 10px; margin-left: 0px; border: 1px solid #4271b5; height: 481px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
+		$answer_list = '<div style="padding: 10px; margin-left: 0px; border: 1px solid #A4A4A4; height: 481px; width: 200px;"><b>'.get_lang('HotspotZones').'</b><ol>';
 		for($answerId=1;$answerId <= $nbrAnswers;$answerId++)
 		{
 			$answer_list .= '<li>'.$objAnswerTmp->selectAnswer($answerId).'</li>';
diff --git a/main/plugin/hotspot/hotspot_user.swf b/main/plugin/hotspot/hotspot_user.swf
index 9a2740437a..5c7b4bdf85 100644
Binary files a/main/plugin/hotspot/hotspot_user.swf and b/main/plugin/hotspot/hotspot_user.swf differ