diff --git a/mod/feedback/lang/en/feedback.php b/mod/feedback/lang/en/feedback.php
index 2e27645f277..8231929c6fa 100644
--- a/mod/feedback/lang/en/feedback.php
+++ b/mod/feedback/lang/en/feedback.php
@@ -26,7 +26,7 @@ $string['add_item'] = 'Add question to activity';
 $string['add_items'] = 'Add question to activity';
 $string['add_pagebreak'] = 'Add a page break';
 $string['adjustment'] = 'Adjustment';
-$string['after_submit'] = 'After submitting';
+$string['after_submit'] = 'After submission';
 $string['allowfullanonymous'] = 'Allow full anonymous';
 $string['analysis'] = 'Analysis';
 $string['anonymous'] = 'Anonymous';
@@ -34,7 +34,7 @@ $string['anonymous_edit'] = 'Record user names';
 $string['anonymous_entries'] = 'Anonymous entries';
 $string['anonymous_user'] = 'Anonymous user';
 $string['append_new_items'] = 'Append new items';
-$string['autonumbering'] = 'Automated numbers';
+$string['autonumbering'] = 'Auto number questions';
 $string['autonumbering_help'] = 'Enables or disables automated numbers for each question';
 $string['average'] = 'Average';
 $string['bold'] = 'Bold';
@@ -105,7 +105,7 @@ $string['entries_saved'] = 'Your answers have been saved. Thank you.';
 $string['export_questions'] = 'Export questions';
 $string['export_to_excel'] = 'Export to Excel';
 $string['feedback:addinstance'] = 'Add a new feedback';
-$string['feedbackclose'] = 'Close the feedback at';
+$string['feedbackclose'] = 'Available to';
 $string['feedbackcloses'] = 'Feedback closes';
 $string['feedback:complete'] = 'Complete a feedback';
 $string['feedback:createprivatetemplate'] = 'Create private template';
@@ -116,9 +116,8 @@ $string['feedback:edititems'] = 'Edit items';
 $string['feedback_is_not_for_anonymous'] = 'feedback is not for anonymous';
 $string['feedback_is_not_open'] = 'The feedback is not open';
 $string['feedback:mapcourse'] = 'Map courses to global feedbacks';
-$string['feedbackopen'] = 'Open the feedback at';
+$string['feedbackopen'] = 'Available from';
 $string['feedbackopens'] = 'Feedback opens';
-$string['feedback_options'] = 'Feedback options';
 $string['feedback:receivemail'] = 'Receive email notification';
 $string['feedback:view'] = 'View a feedback';
 $string['feedback:viewanalysepage'] = 'View the analysis page after submit';
@@ -183,7 +182,7 @@ $string['multichoice'] = 'Multiple choice';
 $string['multichoicerated'] = 'Multiple choice (rated)';
 $string['multichoicetype'] = 'Multiple choice type';
 $string['multichoice_values'] = 'Multiple choice values';
-$string['multiple_submit'] = 'Multiple submissions';
+$string['multiple_submit'] = 'Allow multiple submissions';
 $string['multiplesubmit'] = 'Multiple submissions';
 $string['multiplesubmit_help'] = 'If enabled for anonymous surveys, users can submit feedback an unlimited number of times.';
 $string['name'] = 'Name';
@@ -211,7 +210,7 @@ $string['only_one_captcha_allowed'] = 'Only one captcha is allowed in a feedback
 $string['overview'] = 'Overview';
 $string['page'] = 'Page';
 $string['page-mod-feedback-x'] = 'Any feedback module page';
-$string['page_after_submit'] = 'Page after submit';
+$string['page_after_submit'] = 'Completion message';
 $string['pagebreak'] = 'Page break';
 $string['parameters_missing'] = 'Parameters missing from';
 $string['picture'] = 'Picture';
@@ -225,6 +224,7 @@ $string['preview_help'] = 'In the preview you can change the order of questions.
 $string['previous_page'] = 'Previous page';
 $string['public'] = 'Public';
 $string['question'] = 'Question';
+$string['questionandsubmission'] = 'Question and submission settings';
 $string['questions'] = 'Questions';
 $string['radio'] = 'Multiple choice - single answer';
 $string['radiobutton'] = 'Multiple choice - single answer allowed (radio buttons)';
@@ -254,7 +254,7 @@ $string['send_message'] = 'send message';
 $string['separator_decimal'] = '.';
 $string['separator_thousand'] = ',';
 $string['show_all'] = 'Show all';
-$string['show_analysepage_after_submit'] = 'Show analysis page after submit';
+$string['show_analysepage_after_submit'] = 'Show analysis page';
 $string['show_entries'] = 'Show responses';
 $string['show_entry'] = 'Show response';
 $string['show_nonrespondents'] = 'Show non-respondents';
@@ -286,7 +286,7 @@ $string['typemissing'] = 'missing value "type"';
 $string['update_item'] = 'Save changes to question';
 $string['url_for_continue'] = 'URL for continue-button';
 $string['url_for_continue_help'] = 'By default after a feedback is submitted the target of the continue button is the course page. You can define here another target URL for this continue button.';
-$string['url_for_continue_button'] = 'URL for continue button';
+$string['url_for_continue_button'] = 'Link to next activity';
 $string['use_one_line_for_each_value'] = '<br />Use one line for each answer!';
 $string['use_this_template'] = 'Use this template';
 $string['using_templates'] = 'Use a template';
diff --git a/mod/feedback/mod_form.php b/mod/feedback/mod_form.php
index 6256de76c10..cd4b679c8f0 100644
--- a/mod/feedback/mod_form.php
+++ b/mod/feedback/mod_form.php
@@ -48,7 +48,7 @@ class mod_feedback_mod_form extends moodleform_mod {
         $this->add_intro_editor(true, get_string('description', 'feedback'));
 
         //-------------------------------------------------------------------------------
-        $mform->addElement('header', 'timinghdr', get_string('timing', 'form'));
+        $mform->addElement('header', 'timinghdr', get_string('availability'));
 
         $enableopengroup = array();
         $enableopengroup[] =& $mform->createElement('checkbox',
@@ -81,7 +81,7 @@ class mod_feedback_mod_form extends moodleform_mod {
         $mform->disabledIf('enableclosegroup', 'closeenable', 'notchecked');
 
         //-------------------------------------------------------------------------------
-        $mform->addElement('header', 'feedbackhdr', get_string('feedback_options', 'feedback'));
+        $mform->addElement('header', 'feedbackhdr', get_string('questionandsubmission', 'feedback'));
 
         $options=array();
         $options[1]  = get_string('anonymous', 'feedback');
@@ -91,16 +91,6 @@ class mod_feedback_mod_form extends moodleform_mod {
                            get_string('anonymous_edit', 'feedback'),
                            $options);
 
-        $mform->addElement('selectyesno',
-                           'publish_stats',
-                           get_string('show_analysepage_after_submit', 'feedback'));
-
-        $mform->addElement('selectyesno',
-                           'email_notification',
-                           get_string('email_notification', 'feedback'));
-
-        $mform->addHelpButton('email_notification', 'emailnotification', 'feedback');
-
         // check if there is existing responses to this feedback
         if (is_numeric($this->_instance) AND
                     $this->_instance AND
@@ -130,12 +120,18 @@ class mod_feedback_mod_form extends moodleform_mod {
 
             $mform->addHelpButton('multiple_submit', 'multiplesubmit', 'feedback');
         }
+
+        $mform->addElement('selectyesno', 'email_notification', get_string('email_notification', 'feedback'));
+        $mform->addHelpButton('email_notification', 'emailnotification', 'feedback');
+
         $mform->addElement('selectyesno', 'autonumbering', get_string('autonumbering', 'feedback'));
         $mform->addHelpButton('autonumbering', 'autonumbering', 'feedback');
 
         //-------------------------------------------------------------------------------
         $mform->addElement('header', 'aftersubmithdr', get_string('after_submit', 'feedback'));
 
+        $mform->addElement('selectyesno', 'publish_stats', get_string('show_analysepage_after_submit', 'feedback'));
+
         $mform->addElement('editor',
                            'page_after_submit_editor',
                            get_string("page_after_submit", "feedback"),