I made a lot of changes in the questionnaire/manage_survey.php file.
They are all finalized ONLY to write the code better.
Not a change in the html code expected. It is matter of re-ordering of the code.

Follow the list of proposed changes.
Attached is my final file.

@@ -29,7 +29,7 @@
}
if (!isset($c_obj)) {
if (! $c_obj = get_record("course", "id", $questionnaire->course))

{ - error(get_string('misconfigured', 'questionnaire')); + error(get_string('misconfigured', 'questionnaire')); }

}
}

@@ -333,16 +333,22 @@
'</a> -> case delete '.get_string('editingsurvey', 'questionnaire'));

/// Print the main part of the page

• echo '<form name="phpesp" method="post" action="manage_survey.php">';
• echo '<input type="hidden" name="course" value="'.$courseid.'" />';
• echo '<input type="hidden" name="instance" value="'.$instance.'" />';
• echo '<input type="hidden" name="sid" value="'.$sid.'" />';
• echo '<input type="hidden" name="section" value="'.$section.'" />';
• echo '<div class="headermain" align="center">Are you sure you want to delete survey: '.$surveyrec->name.'?<br /><br />';
• echo '<input type="submit" value="Yes" name="confirm" /> ';
• echo '<input type="submit" value="No" name="confirm" /> </div>';
• echo '</form>';
  -
  + ?>
  + <form name="phpesp" method="post" action="manage_survey.php">
  + <div>
  + <input type="hidden" name="course" value="<?= $courseid ?>" />
  + <input type="hidden" name="instance" value="<?= $instance ?>" />
  + <input type="hidden" name="sid" value="<?= $sid ?>" />
  + <input type="hidden" name="section" value="<?= $section ?>" />
  + </div>
  + <div class="headermain" align="center">
  + Are you sure you want to delete questionnaire: <?php $surveyrec->name ?>?
  + <br /><br />
  + <input type="submit" value="Yes" name="confirm" />
  + <input type="submit" value="No" name="confirm" />
  + </div>
  + </form>
  + <?php
  print_footer($c_obj);
  break;

Added for reason (1)
@@ -377,45 +383,50 @@
}

/// Print the main part of the page

• echo '<form name="phpesp" method="post" action="manage_survey.php">';
• echo '<input type="hidden" name="course" value="'.$courseid.'" />';
• echo '<input type="hidden" name="instance" value="'.$instance.'" />';
• echo '<input type="hidden" name="sid" value="'.$sid.'" />';
• echo '<input type="hidden" name="section" value="'.$section.'" />';
• echo '<input type="hidden" name="tab" value="general" />';
  -
• echo '<hr />';
• echo '<div align="center">';
• echo '<input type="submit" value="'.get_string('general', 'questionnaire').'" name="general" disabled="disabled" />';
• helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('editquestions', 'questionnaire').'" name="editquestions" />';
• helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('reorderquestions', 'questionnaire').'" name="reorderquestions" '.$disabled.' />';
• helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false);
• if ($cancancel) { - echo ' <input type="submit" value="'.get_string('return', 'questionnaire').'" name="cancelandreturn" /> '; - }
• echo '<input type="submit" value="'.get_string('saveandreturn', 'questionnaire').'" name="saveandreturn" '.$disabled.' />';
• helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false);
• echo '</div>';
• echo '<hr />';
  -
• $updated = true;
  -
• include 'general.inc';
  -
• echo '<hr />';
• echo '<div align="center">';
• echo '<input type="submit" value="'.get_string('general', 'questionnaire').'" name="general" disabled="disabled" /> ';
• echo '<input type="submit" value="'.get_string('editquestions', 'questionnaire').'" name="editquestions" /> ';
• echo '<input type="submit" value="'.get_string('reorderquestions', 'questionnaire').'" name="reorderquestions" '.$disabled.' />';
• if ($cancancel) { - echo '<input type="submit" value="'.get_string('return', 'questionnaire').'" name="cancelandreturn" /> '; - }
• echo ' <input type="submit" value="'.get_string('saveandreturn', 'questionnaire').'" name="saveandreturn" '.$disabled.' />';
• echo '</div>';
• echo '</form>';

• + ?>
  + <form name="phpesp" method="post" action="manage_survey.php">
  + <div>
  + <input type="hidden" name="course" value="<?= $courseid ?>" />
  + <input type="hidden" name="instance" value="<?= $instance ?>" />
  + <input type="hidden" name="sid" value="<?= $sid ?>" />
  + <input type="hidden" name="section" value="<?= $section ?>" />
  + <input type="hidden" name="tab" value="general" />
  + </div>
  + <hr />
  + <div>
  + <input type="submit" value="<?php print_string('general', 'questionnaire') ?>" name="general" disabled="disabled" />
  + <?php helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('editquestions', 'questionnaire') ?>" name="editquestions" />
  + <?php helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('reorderquestions', 'questionnaire') ?>" name="reorderquestions" <?= $disabled ?> />
  + <?php helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false);
  + if ($cancancel)

  { ?> +   + <input type="submit" value="<?php print_string('return', 'questionnaire') ?>" name="cancelandreturn" /> + <?php }

  ?>
  + <input type="submit" value="<?php print_string('saveandreturn', 'questionnaire') ?>" name="saveandreturn" <?= $disabled ?> />
  + <?php helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false); ?>
  + </div>
  + <hr />
  + <?php
  + $updated = true;
  +
  + include 'general.inc';
  + ?>
  + <hr />
  + <div>
  + <input type="submit" value="<?php print_string('general', 'questionnaire') ?>" name="general" disabled="disabled" />
  + <input type="submit" value="<?php print_string('editquestions', 'questionnaire') ?>" name="editquestions" />
  + <input type="submit" value="<?php print_string('reorderquestions', 'questionnaire') ?>" name="reorderquestions" <?= $disabled ?> />
  + <?php if ($cancancel)

  { ?> + <input type="submit" value="<?php print_string('return', 'questionnaire') ?>" name="cancelandreturn" /> + <?php }

  ?>
  + <input type="submit" value="<?php print_string('saveandreturn', 'questionnaire') ?>" name="saveandreturn" <?= $disabled ?> />
  + </div>
  + </form>
  + <?php
  /// Finish the page
  if ($questionnaire->usehtmleditor)

  { use_html_editor(); @@ -448,31 +459,39 @@ }

/// Print the main part of the page

• echo '<form name="phpesp" method="post" action="manage_survey.php">';
• echo '<input type="hidden" name="course" value="'.$courseid.'" />';
• echo '<input type="hidden" name="instance" value="'.$instance.'" />';
• echo '<input type="hidden" name="sid" value="'.$sid.'" />';
• echo '<input type="hidden" name="section" value="'.$section.'" />';
• echo '<input type="hidden" name="tab" value="questions" />';
• echo '<hr />';
• echo '<div align="center">';
• echo '<input type="submit" value="'.get_string('general', 'questionnaire').'" name="general" />';
• helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('editquestions', 'questionnaire').'" name="editquestions" disabled="disabled"/>';
• helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('reorderquestions', 'questionnaire').'" name="reorderquestions" '.$disabled.' />';
• helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false);
• echo '<input type="submit" value="'.get_string('saveandreturn', 'questionnaire').'" name="saveandreturn" '.$disabled.' />';
• helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false);
• echo '</div>';
• echo '<hr />';
• $SESSION->questionnaire_survey_id = $sid;
• include 'questions.inc';
• echo '<hr />';
• echo '</div>';
• echo '</form>';
  + ?>
  + <form name="phpesp" method="post" action="manage_survey.php">
  + <div>
  + <input type="hidden" name="course" value="<?= $courseid ?>" />
  + <input type="hidden" name="instance" value="<?= $instance ?>" />
  + <input type="hidden" name="sid" value="<?= $sid ?>" />
  + <input type="hidden" name="section" value="<?= $section ?>" />
  + <input type="hidden" name="tab" value="questions" />
  + </div>
  + <hr />
  + <div class="box generalbox boxaligncenter boxwidthwide">
  + <input type="submit" value="<?php print_string('general', 'questionnaire') ?>" name="general" />
  + <?php helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('editquestions', 'questionnaire') ?>" name="editquestions" disabled="disabled" />
  + <?php helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('reorderquestions', 'questionnaire') ?>" name="reorderquestions" <?= $disabled ?> />
  + <?php helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('saveandreturn', 'questionnaire') ?>" name="saveandreturn" <?= $disabled ?> />
  + <?php helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false); ?>
  + <hr />
  + <?php
  + $SESSION->questionnaire_survey_id = $sid;
  + include 'questions.inc';
  + ?>
  + </div>
  + <hr />
  + </form>

• /// Finish the page
  + <?php
  + /// Finish the page
  if ($questionnaire->usehtmleditor) { use_html_editor(); }

  @@ -499,58 +518,70 @@
  }

/// Print the main part of the page

• echo '<form method="post" name="phpesp" id="phpesp" action="manage_survey.php">';
• echo '<input type="hidden" name="course" value="'.$courseid.'" />';
• echo '<input type="hidden" name="instance" value="'.$instance.'" />';
• echo '<input type="hidden" name="sid" value="'.$sid.'" />';
• echo '<input type="hidden" name="section" value="'.$section.'" />';
• echo '<input type="hidden" name="tab" value="order" />';
  -
• echo '<hr />';
• echo '<div align="center">';
• echo '<input type="submit" value="'.get_string('general', 'questionnaire').'" name="general" />';
• helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('editquestions', 'questionnaire').'" name="editquestions" '.$disabled.' />';
• helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false);
• echo ' <input type="submit" value="'.get_string('reorderquestions', 'questionnaire').'" name="reorderquestions" disabled="disabled" />';
• helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false);
• if (!$disabled) { - button_to_popup_window('/mod/questionnaire/manage_survey.php?qact=preview&instance='.$instance.'&course='.$courseid. - '&sid='.$sid.'&section='.$section, '', get_string('preview_label', 'questionnaire'),0,0); - helpbutton("preview", get_string("preview_label", "questionnaire"), "questionnaire", true, false); - }
• echo '<input type="submit" value="'.get_string('saveandreturn', 'questionnaire').'" name="saveandreturn" '.$disabled.' />';
• helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false);
• echo '</div>';
• echo '<hr />';
  -
• $SESSION->questionnaire_survey_id = $sid;
• $SESSION->questionnaire_new_survey = false;
• include 'order.inc';
  -
• echo '<hr />';
• echo '<div align="center">';
• echo '<input type="submit" value="'.get_string('general', 'questionnaire').'" name="general" /> ';
• echo '<input type="submit" value="'.get_string('editquestions', 'questionnaire').'" name="editquestions" '.$disabled.' />';
• echo '<input type="submit" value="'.get_string('reorderquestions', 'questionnaire').'" name="reorderquestions" disabled="disabled" /> ';
• if (!$disabled) { - button_to_popup_window('/mod/questionnaire/manage_survey.php?qact=preview&instance='.$instance.'&course='.$courseid. - '&sid='.$sid.'&section='.$section, '', get_string('preview_label', 'questionnaire'),0,0); - }
• echo '<input type="submit" value="'.get_string('saveandreturn', 'questionnaire').'" name="saveandreturn" '.$disabled.' />';
• echo '</div>';
• echo '</form>';
• /// Finish the page
  + ?>
  + <form method="post" name="phpesp" id="phpesp" action="manage_survey.php">
  + <div>
  + <input type="hidden" name="course" value="<?= $courseid ?>" />
  + <input type="hidden" name="instance" value="<?= $instance ?>" />
  + <input type="hidden" name="sid" value="<?= $sid ?>" />
  + <input type="hidden" name="section" value="<?= $section ?>" />
  + <input type="hidden" name="tab" value="order" />
  + </div>
  + <hr />
  + <div class="box generalbox boxaligncenter boxwidthwide">
  + <input type="submit" value="<?php print_string('general', 'questionnaire') ?>" name="general" />
  + <?php helpbutton("general", get_string("general", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('editquestions', 'questionnaire') ?>" name="editquestions" <?= $disabled ?> />
  + <?php helpbutton("editquestions", get_string("editquestions", "questionnaire"), "questionnaire", true, false); ?>
  +  
  + <input type="submit" value="<?php print_string('reorderquestions', 'questionnaire') ?>" name="reorderquestions" disabled="disabled" />
  + <?php helpbutton("reorderquestions", get_string("reorderquestions", "questionnaire"), "questionnaire", true, false);
  + if (!$disabled) { + button_to_popup_window('/mod/questionnaire/manage_survey.php?qact=preview&instance='.$instance.'&course='.$courseid. + '&sid='.$sid.'&section='.$section, '', get_string('preview_label', 'questionnaire'),0,0); + helpbutton("preview", get_string("preview_label", "questionnaire"), "questionnaire", true, false); + }

  + ?>
  + <input type="submit" value="<?php print_string('saveandreturn', 'questionnaire') ?>" name="saveandreturn" <?= $disabled ?> />
  + <?php helpbutton("finish", get_string("saveandreturn", "questionnaire"), "questionnaire", true, false); ?>
  + <hr />
  +
  + <!-- Main part of the page -->
  + <?php
  + $SESSION->questionnaire_survey_id = $sid;
  + $SESSION->questionnaire_new_survey = false;
  + include 'order.inc';
  + ?>
  + <hr />
  + <!-- Last row of four buttons -->
  + <div>
  + <input type="submit" value="<?php print_string('general', 'questionnaire') ?>" name="general" />
  + <input type="submit" value="<?php print_string('editquestions', 'questionnaire') ?>" name="editquestions" <?= $disabled ?> />
  + <input type="submit" value="<?php print_string('reorderquestions', 'questionnaire') ?>" name="reorderquestions" disabled="disabled" />
  + <?php
  + if (!$disabled)

  { + button_to_popup_window('/mod/questionnaire/manage_survey.php?qact=preview&instance='.$instance.'&course='.$courseid. + '&sid='.$sid.'&section='.$section, '', get_string('preview_label', 'questionnaire'),0,0); + }

  + ?>
  + <input type="submit" value="<?php print_string('saveandreturn', 'questionnaire') ?>" name="saveandreturn" <?= $disabled ?> />
  + </div>
  + </div>
  + </form>
  +
  + <?php
  +/// Finish the page
  // html editor not needed on re-order questions page JR
  // if ($questionnaire->usehtmleditor)

  { // use_html_editor(); // }

  +
  print_footer($c_obj);
  break;

case 'unknown':

• default:
  + default:
  $message = get_string('unknownaction', 'questionnaire');
  if (empty($formdata)) {
  $message .= get_string('nodata', 'questionnaire');