diff --git a/mod/quiz/editlib.php b/mod/quiz/editlib.php
index e7b300e6075..7b5aa07f887 100644
--- a/mod/quiz/editlib.php
+++ b/mod/quiz/editlib.php
@@ -458,7 +458,11 @@ function quiz_print_question_list($quiz, $pageurl, $allowdelete=true,
             ?>
         <input type="submit" class="pointssubmitbutton" value="<?php echo $strsave; ?>" />
     </fieldset>
-
+<?php if(strcmp($question->qtype,'random')===0){
+    echo '<a href="'.$questionurl->out().'" class="configurerandomquestion">'.get_string("configurerandomquestion","quiz").'</a>';
+}
+            
+?>
 </div>
 </form>
 
@@ -958,9 +962,6 @@ function quiz_print_randomquestion_reordertool(&$question, &$pageurl, &$quiz){
 
     echo $reordercheckboxlabel;
     print_question_icon($question);
-    $editstring= "<a title=\"$stredit\" href=\"".$url.
-            "\"><img src=\"$CFG->pixpath/t/edit.gif\" alt=\"".
-            get_string("edit")."\" /> </a>";
     $questioncount=$DB->count_records_select('question',
             "category IN ($category->id) AND parent = '0' ");
     $randomquestionlistsize=3;
@@ -980,7 +981,7 @@ function quiz_print_randomquestion_reordertool(&$question, &$pageurl, &$quiz){
             $category->contextid)).
             '">-->'.$reordercheckboxlabel.$category->name.
             $reordercheckboxlabelclose.'<!--</a>-->';
-    echo '<span class="questionpreview">'.$editstring;
+    echo '<span class="questionpreview">';
     echo quiz_question_preview_button($quiz, $question,false);
     
     echo '</span>';
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index e638425a337..3e28096716b 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -4652,15 +4652,10 @@ table.quizreviewsummary td.cell {
 #mod-quiz-edit div.question div.content .questionname,
 #categoryquestions .questionname{
     white-space:nowrap;
-    text-overflow:ellipsis;
     overflow:hidden;
     zoom:1;
     position:relative;
     max-width:20%;
-    /*ie-only:*/
-    text-overflow:ellipsis;
-    /*opera-only*/
-    -o-text-overflow:ellipsis;
 }
 #mod-quiz-edit div.question div.content .singlequestion .questionname,
 #mod-quiz-edit div.question div.content .singlequestion .questiontext{
@@ -4819,6 +4814,7 @@ table.quizreviewsummary td.cell {
     padding-right:0.2em;
     clear:both;
     margin:0.5em;
+    margin-top:0.8em;
 }
 
 
@@ -4850,7 +4846,8 @@ table.quizreviewsummary td.cell {
 }
 
 #mod-quiz-edit .editq div.question div.content .randomquestioncategory{
-        position:relative;
+    margin-top:0.4em;
+    position:relative;
     display:inline-block;
     
 }