From 7b665733fe226f3e922bdf6795fb45ff09de1135 Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Tue, 21 Jul 2026 21:16:33 -0500
Subject: [PATCH 1/3] Add the capability to format `.html.ep` files with
 prettier.

This uses the `@openwebwork/prettier-plugin-mojolicious-html-template`
package to do so. That package is a `prettier` plugin that formats HTML
with `prettier` and uses `perltidy` to format Perl content inside the
Mojolicious template regions.

The `@openwebwork/prettier-plugin-mojolicious-html-template` project
repository is housed at https://github.com/openwebwork/prettier-plugin-mojolicious-html-template.
I am giving ownership of the repository to webwork, because the project
was developed with the usage of Claude code, and that usage was funded
by the webwork project.
---
 .github/workflows/check-formats.yml | 19 +++++++------------
 .prettierrc                         |  3 ++-
 htdocs/package-lock.json            | 14 ++++++++++++++
 htdocs/package.json                 | 10 ++++++++--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/check-formats.yml b/.github/workflows/check-formats.yml
index 863b02d988..da689d89a1 100644
--- a/.github/workflows/check-formats.yml
+++ b/.github/workflows/check-formats.yml
@@ -12,16 +12,17 @@ on:
 
 jobs:
   perltidy:
-    name: Check Perl file formatting with perltidy
+    name: Check file formatting with perltidy and prettier
     runs-on: ubuntu-24.04
-    container:
-      image: perl:5.38
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
       - name: Install dependencies
-        run: cpanm -n Perl::Tidy@20260204
-      - name: Run perltidy
+        run: |
+          sudo apt-get update && sudo apt-get install -y libmojolicious-perl cpanminus
+          sudo cpanm -n Perl::Tidy@20260204
+
+      - name: Check Perl file formatting with perltidy
         shell: bash
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE"
@@ -42,17 +43,11 @@ jobs:
               git diff --exit-code
           fi
 
-  prettier:
-    name: Check JavaScript, style, and HTML file formatting with prettier
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
       - name: Install Node
         uses: actions/setup-node@v6
         with:
           node-version: '24'
       - name: Install Dependencies
         run: cd htdocs && npm ci --ignore-scripts
-      - name: Check formatting with prettier
+      - name: Check JavaScript, style, and HTML file formatting with prettier
         run: cd htdocs && npm run prettier-check
diff --git a/.prettierrc b/.prettierrc
index b21dab0657..0737ccf48d 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -4,5 +4,6 @@
 	"printWidth": 120,
 	"semi": true,
 	"singleQuote": true,
-	"trailingComma": "none"
+	"trailingComma": "none",
+	"plugins": ["@openwebwork/prettier-plugin-mojolicious-html-template"]
 }
diff --git a/htdocs/package-lock.json b/htdocs/package-lock.json
index 03f9cfd6eb..4dcc44f2c3 100644
--- a/htdocs/package-lock.json
+++ b/htdocs/package-lock.json
@@ -21,6 +21,7 @@
 				"sortablejs": "^1.15.7"
 			},
 			"devDependencies": {
+				"@openwebwork/prettier-plugin-mojolicious-html-template": "^0.0.1",
 				"autoprefixer": "^10.5.4",
 				"chokidar": "^5.0.0",
 				"cssnano": "^8.0.2",
@@ -368,6 +369,19 @@
 				"thememirror": "^2.0.1"
 			}
 		},
+		"node_modules/@openwebwork/prettier-plugin-mojolicious-html-template": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/@openwebwork/prettier-plugin-mojolicious-html-template/-/prettier-plugin-mojolicious-html-template-0.0.1.tgz",
+			"integrity": "sha512-kEcmwN3bYiA+K9c0bH5My9YNoGcWZLdRTlLmQ6VUxinjDq/QSAZsJnkeZySv2UAvGR7DUA7xUYO5sF8ZaHEuvg==",
+			"dev": true,
+			"license": "LGPL-3.0-or-later",
+			"dependencies": {
+				"@lezer/lr": "^1.4.10"
+			},
+			"peerDependencies": {
+				"prettier": "^3.9.4"
+			}
+		},
 		"node_modules/@parcel/watcher": {
 			"version": "2.6.0",
 			"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.6.0.tgz",
diff --git a/htdocs/package.json b/htdocs/package.json
index 411ac35517..c5bfbdf34a 100644
--- a/htdocs/package.json
+++ b/htdocs/package.json
@@ -5,8 +5,8 @@
 	"scripts": {
 		"generate-assets": "node generate-assets",
 		"prepare": "npm run generate-assets",
-		"prettier-format": "prettier --ignore-path=../.gitignore --write \"**/*.{js,css,scss,html}\" \"../**/*.dist.yml\"",
-		"prettier-check": "prettier --ignore-path=../.gitignore --check \"**/*.{js,css,scss,html}\" \"../**/*.dist.yml\""
+		"prettier-format": "prettier --ignore-path=../.gitignore --write \"**/*.{js,css,scss,html}\" \"../**/*.dist.yml\" \"../templates/**/*.html.ep\"",
+		"prettier-check": "prettier --ignore-path=../.gitignore --check \"**/*.{js,css,scss,html}\" \"../**/*.dist.yml\" \"../templates/**/*.html.ep\""
 	},
 	"repository": {
 		"type": "git",
@@ -27,6 +27,7 @@
 		"sortablejs": "^1.15.7"
 	},
 	"devDependencies": {
+		"@openwebwork/prettier-plugin-mojolicious-html-template": "^0.0.1",
 		"autoprefixer": "^10.5.4",
 		"chokidar": "^5.0.0",
 		"cssnano": "^8.0.2",
@@ -51,5 +52,10 @@
 	"allowScripts": {
 		"@parcel/watcher": false,
 		"iframe-resizer": false
+	},
+	"overrides": {
+		"@awmottaz/prettier-plugin-void-html": {
+			"prettier": "^3.9.5"
+		}
 	}
 }

From 2c9697c9299c68d23d434753aed2c0fa67cd3b5b Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Wed, 22 Jul 2026 06:07:58 -0500
Subject: [PATCH 2/3] Apply prettier to all `.html.ep` files.

---
 .../cheevoMessage.html.ep                     |   9 +-
 .../Achievements/achievement_badges.html.ep   |  19 +-
 .../Achievements/achievement_items.html.ep    |  15 +-
 .../Achievements/cheevobigbox.html.ep         |   8 +-
 .../AchievementsLeaderboard.html.ep           |  12 +-
 .../ContentGenerator/Base/admin_links.html.ep |   9 +-
 .../Base/error_output.html.ep                 |   8 +-
 .../Base/feedback_macro_email.html.ep         |   3 +-
 .../Base/feedback_macro_form.html.ep          |  19 +-
 templates/ContentGenerator/Base/links.html.ep |  47 +-
 .../Base/login_status.html.ep                 |   7 +-
 .../ContentGenerator/Base/set_status.html.ep  |  33 +-
 .../Base/warning_output.html.ep               |  18 +-
 .../ContentGenerator/CourseAdmin.html.ep      |   8 +-
 .../CourseAdmin/add_course_form.html.ep       | 243 +++++-----
 .../archive_course_confirm.html.ep            |  57 +--
 .../CourseAdmin/archive_course_form.html.ep   |  32 +-
 .../copy_otp_secrets_confirm.html.ep          |  10 +-
 .../CourseAdmin/delete_course_form.html.ep    |  32 +-
 .../CourseAdmin/edit_location_form.html.ep    |  38 +-
 .../hide_inactive_course_form.html.ep         |  32 +-
 .../CourseAdmin/manage_location_form.html.ep  |  60 ++-
 .../manage_lti_course_map_form.html.ep        |  48 +-
 .../manage_otp_secrets_form.html.ep           | 153 ++++---
 .../CourseAdmin/registration_form.html.ep     |  39 +-
 .../CourseAdmin/rename_course_confirm.html.ep |  53 +--
 .../rename_course_confirm_short.html.ep       |   9 +-
 .../CourseAdmin/rename_course_form.html.ep    |  35 +-
 .../reset_otp_secrets_confirm.html.ep         |   2 +-
 .../unarchive_course_confirm.html.ep          |  10 +-
 .../CourseAdmin/unarchive_course_form.html.ep |  34 +-
 .../upgrade_course_confirm.html.ep            |  24 +-
 .../CourseAdmin/upgrade_course_form.html.ep   |  15 +-
 .../ContentGenerator/EquationDisplay.html.ep  |   8 +-
 templates/ContentGenerator/Feedback.html.ep   |  38 +-
 .../Feedback/feedback_email.html.ep           | 127 ++++--
 .../ContentGenerator/ForgotPassword.html.ep   |  22 +-
 .../ContentGenerator/GatewayQuiz.html.ep      | 206 +++++----
 .../ContentGenerator/GatewayQuiz/nav.html.ep  |  69 ++-
 .../Grades/grade_items.html.ep                |   1 -
 .../Grades/problem_table.html.ep              |   4 +-
 .../Grades/student_grades.html.ep             |  20 +-
 templates/ContentGenerator/Hardcopy.html.ep   |  13 +-
 .../ContentGenerator/Hardcopy/form.html.ep    |  42 +-
 templates/ContentGenerator/Home.html.ep       |   6 +-
 .../Instructor/AchievementEditor.html.ep      |  27 +-
 .../AchievementEditor/save_as_form.html.ep    |  45 +-
 .../Instructor/AchievementList.html.ep        |  30 +-
 .../AchievementList/assign_form.html.ep       |  16 +-
 .../AchievementList/create_form.html.ep       |  14 +-
 .../AchievementList/default_table.html.ep     |  38 +-
 .../AchievementList/delete_form.html.ep       |  12 +-
 .../AchievementList/edit_form.html.ep         |   8 +-
 .../AchievementList/edit_table.html.ep        |  20 +-
 .../AchievementList/edit_table_row.html.ep    |  10 +-
 .../AchievementList/export_form.html.ep       |   8 +-
 .../AchievementList/export_table.html.ep      |  23 +-
 .../AchievementList/filter_form.html.ep       |  25 +-
 .../AchievementList/import_form.html.ep       |  23 +-
 .../AchievementList/score_form.html.ep        |   8 +-
 .../AchievementNotificationEditor.html.ep     |  30 +-
 .../existing_form.html.ep                     |  20 +-
 .../save_as_form.html.ep                      |   8 +-
 .../Instructor/AchievementUserEditor.html.ep  |  39 +-
 .../Instructor/AddUsers.html.ep               | 108 +++--
 .../Instructor/Assigner.html.ep               |  17 +-
 .../Instructor/Config.html.ep                 |  20 +-
 .../Instructor/Config/config_help.html.ep     |  13 +-
 .../Instructor/FileManager.html.ep            |   8 +-
 .../Instructor/FileManager/archive.html.ep    |  29 +-
 .../Instructor/FileManager/refresh.html.ep    |  23 +-
 .../FileManager/refresh_edit.html.ep          |   8 +-
 .../Instructor/FileManager/view.html.ep       |   4 +-
 .../ContentGenerator/Instructor/Index.html.ep |  98 ++--
 .../Instructor/JobManager.html.ep             | 135 +++---
 .../Instructor/JobManager/delete_form.html.ep |  15 +-
 .../Instructor/JobManager/filter_form.html.ep |  33 +-
 .../Instructor/JobManager/sort_button.html.ep |  21 +-
 .../Instructor/JobManager/sort_form.html.ep   |  98 ++--
 .../Instructor/LTIUpdate.html.ep              |  34 +-
 .../Instructor/PGProblemEditor.html.ep        | 165 ++++---
 .../PGProblemEditor/add_problem_form.html.ep  |  32 +-
 .../code_maintenance_form.html.ep             |  62 ++-
 .../PGProblemEditor/file_chooser.html.ep      |  51 ++-
 .../PGProblemEditor/hardcopy_form.html.ep     |  31 +-
 .../PGProblemEditor/pg_critic.html.ep         |  30 +-
 .../PGProblemEditor/revert_form.html.ep       |  65 +--
 .../PGProblemEditor/save_as_form.html.ep      | 120 +++--
 .../PGProblemEditor/save_form.html.ep         |   5 +-
 .../PGProblemEditor/view_form.html.ep         |  28 +-
 .../Instructor/ProblemGrader.html.ep          | 156 ++++---
 .../Instructor/ProblemGrader/siblings.html.ep |   3 +-
 .../Instructor/ProblemSetDetail.html.ep       | 293 ++++++------
 .../ProblemSetDetail/attempts_row.html.ep     |   6 +-
 .../ProblemSetDetail/ip_locations_row.html.ep |  25 +-
 ...tricted_login_proctor_password_row.html.ep |  25 +-
 .../Instructor/ProblemSetList.html.ep         |  56 ++-
 .../ProblemSetList/create_form.html.ep        |  20 +-
 .../ProblemSetList/delete_form.html.ep        |  15 +-
 .../ProblemSetList/edit_form.html.ep          |   6 +-
 .../ProblemSetList/export_form.html.ep        |  11 +-
 .../ProblemSetList/filter_form.html.ep        |  19 +-
 .../ProblemSetList/import_form.html.ep        |  90 ++--
 .../ProblemSetList/lms_date_sync_form.html.ep |  26 +-
 .../ProblemSetList/publish_form.html.ep       |  26 +-
 .../ProblemSetList/score_form.html.ep         |  11 +-
 .../ProblemSetList/set_list_field.html.ep     |  24 +-
 .../ProblemSetList/set_list_row.html.ep       | 136 +++---
 .../ProblemSetList/set_list_table.html.ep     |  53 ++-
 .../ProblemSetList/sort_button.html.ep        |  14 +-
 .../ProblemSetList/sort_form.html.ep          |  64 ++-
 .../Instructor/Scoring.html.ep                |  31 +-
 .../Instructor/SendMail/main_form.html.ep     | 158 +++++--
 .../Instructor/SetMaker.html.ep               |  32 +-
 .../SetMaker/browse_course_sets_panel.html.ep |  11 +-
 .../SetMaker/browse_library_panel.html.ep     |   9 +-
 .../browse_library_panel_advanced.html.ep     |  98 ++--
 .../browse_library_panel_simple.html.ep       |  48 +-
 .../SetMaker/browse_local_panel.html.ep       |  33 +-
 .../SetMaker/browse_setdef_panel.html.ep      |   3 +-
 .../Instructor/SetMaker/problem_row.html.ep   | 307 ++++++++-----
 .../Instructor/SetMaker/top_row.html.ep       |  51 ++-
 .../SetMaker/view_problems_line.html.ep       |  28 +-
 .../ShowAnswers/instructor-selectors.html.ep  |  26 +-
 .../ShowAnswers/past-answers-table.html.ep    |  27 +-
 .../ContentGenerator/Instructor/Stats.html.ep |   2 +-
 .../Instructor/Stats/problem_menu.html.ep     |  17 +-
 .../Instructor/Stats/problem_stats.html.ep    | 111 +++--
 .../Instructor/Stats/set_stats.html.ep        | 110 +++--
 .../Instructor/Stats/siblings.html.ep         |  13 +-
 .../Stats/siblings_set_list.html.ep           |   3 +-
 .../Stats/student_filter_menu.html.ep         |  11 +-
 .../Instructor/StudentProgress/index.html.ep  |   6 +-
 .../StudentProgress/set_progress.html.ep      |  86 ++--
 .../StudentProgress/siblings.html.ep          |  10 +-
 .../StudentProgress/student_progress.html.ep  |   2 +-
 .../StudentProgress/student_stats.html.ep     |  17 +-
 .../Instructor/UserDetail.html.ep             |  37 +-
 .../UserDetail/set_date_table.html.ep         |  59 ++-
 .../Instructor/UserDetail/set_row.html.ep     |  14 +-
 .../Instructor/UserList.html.ep               |  42 +-
 .../Instructor/UserList/add_form.html.ep      |   9 +-
 .../Instructor/UserList/delete_form.html.ep   |  15 +-
 .../Instructor/UserList/edit_form.html.ep     |   6 +-
 .../Instructor/UserList/export_form.html.ep   |  32 +-
 .../Instructor/UserList/filter_form.html.ep   |  31 +-
 .../Instructor/UserList/import_form.html.ep   |  43 +-
 .../UserList/reset_2fa_form.html.ep           |  19 +-
 .../Instructor/UserList/sort_button.html.ep   |  21 +-
 .../Instructor/UserList/sort_form.html.ep     |  84 ++--
 .../Instructor/UserList/user_list.html.ep     |  74 +--
 .../UserList/user_list_field.html.ep          |  52 ++-
 .../Instructor/UserList/user_row.html.ep      |  30 +-
 .../Instructor/UsersAssignedToSet.html.ep     |  23 +-
 .../LTI/content_item_course_selection.html.ep |  62 +--
 .../LTI/content_item_selection.html.ep        | 115 ++---
 .../LTI/content_item_selection_error.html.ep  |  52 ++-
 .../LTI/self_posting_form.html.ep             |  11 +-
 templates/ContentGenerator/Login.html.ep      |  52 ++-
 .../ContentGenerator/LoginProctor.html.ep     |  30 +-
 templates/ContentGenerator/Logout.html.ep     |  16 +-
 templates/ContentGenerator/Options.html.ep    | 129 ++++--
 templates/ContentGenerator/Problem.html.ep    |  26 +-
 .../Problem/checkboxes.html.ep                |  25 +-
 .../Problem/instructor_buttons.html.ep        |   3 +-
 .../ContentGenerator/Problem/messages.html.ep |  11 +-
 .../ContentGenerator/Problem/siblings.html.ep |  62 ++-
 .../Problem/submit_buttons.html.ep            | 102 +++--
 templates/ContentGenerator/ProblemSet.html.ep |   6 +-
 .../ProblemSet/auxiliary_tools.html.ep        |  79 ++--
 .../ContentGenerator/ProblemSet/info.html.ep  |   7 +-
 .../ProblemSet/problem_list.html.ep           |  23 +-
 .../ProblemSet/problem_list_row.html.ep       |  24 +-
 .../ProblemSet/version_list.html.ep           |  97 ++--
 .../ContentGenerator/ProblemSets.html.ep      |  24 +-
 .../ContentGenerator/ProblemSets/info.html.ep |   7 +-
 .../ProblemSets/set_list_row.html.ep          |  86 ++--
 .../ContentGenerator/ResetPassword.html.ep    |  65 ++-
 .../SampleProblemViewer.html.ep               | 200 ++++----
 .../sample_problem.html.ep                    | 214 +++++----
 .../SampleProblemViewer/viewer.html.ep        | 304 +++++++------
 .../ShowMeAnother/messages.html.ep            |  17 +-
 .../TwoFactorAuthentication.html.ep           |  32 +-
 templates/HTML/CodeMirrorEditor/js.html.ep    |   5 +-
 .../scrollingRecordList.html.ep               |  44 +-
 .../HTML/SingleProblemGrader/grader.html.ep   | 224 ++++-----
 templates/HTML/StudentNav/student_nav.html.ep |  55 ++-
 templates/HelpFiles/Achievements.html.ep      |   4 +-
 .../HelpFiles/AchievementsLeaderboard.html.ep |   6 +-
 templates/HelpFiles/AdminAddCourse.html.ep    |  41 +-
 .../HelpFiles/AdminArchiveCourse.html.ep      |   6 +-
 templates/HelpFiles/AdminDeleteCourse.html.ep |   2 +-
 templates/HelpFiles/AdminHideCourses.html.ep  |   8 +-
 .../HelpFiles/AdminManageLTICourseMap.html.ep |  18 +-
 .../HelpFiles/AdminManageLocations.html.ep    |  14 +-
 .../HelpFiles/AdminManageOTPSecrets.html.ep   |  12 +-
 templates/HelpFiles/AdminRenameCourse.html.ep |   4 +-
 .../HelpFiles/AdminUnarchiveCourse.html.ep    |  12 +-
 .../HelpFiles/AdminUpgradeCourses.html.ep     |   6 +-
 templates/HelpFiles/Grades.html.ep            |  19 +-
 templates/HelpFiles/Hardcopy.html.ep          |  40 +-
 .../InstructorAchievementEditor.html.ep       |  48 +-
 .../InstructorAchievementList.html.ep         |  65 +--
 ...uctorAchievementNotificationEditor.html.ep |  19 +-
 .../InstructorAchievementUserEditor.html.ep   |  10 +-
 .../HelpFiles/InstructorAddUsers.html.ep      |  14 +-
 .../HelpFiles/InstructorAssigner.html.ep      |  14 +-
 templates/HelpFiles/InstructorConfig.html.ep  |   6 +-
 .../HelpFiles/InstructorFileManager.html.ep   |  86 ++--
 templates/HelpFiles/InstructorIndex.html.ep   |  26 +-
 .../HelpFiles/InstructorJobManager.html.ep    |  34 +-
 .../HelpFiles/InstructorLTIUpdate.html.ep     |  10 +-
 .../InstructorPGProblemEditor.html.ep         | 170 +++----
 .../HelpFiles/InstructorProblemGrader.html.ep |  14 +-
 .../InstructorProblemSetDetail.html.ep        |  60 +--
 .../InstructorProblemSetList.html.ep          |  49 +-
 templates/HelpFiles/InstructorScoring.html.ep |  70 +--
 .../HelpFiles/InstructorSendMail.html.ep      |  55 +--
 .../HelpFiles/InstructorSetMaker.html.ep      |  32 +-
 .../HelpFiles/InstructorShowAnswers.html.ep   |  14 +-
 templates/HelpFiles/InstructorStats.html.ep   |   6 +-
 .../InstructorStudentProgress.html.ep         |  12 +-
 .../HelpFiles/InstructorUserDetail.html.ep    |  26 +-
 .../HelpFiles/InstructorUserList.html.ep      | 164 +++----
 .../InstructorUsersAssignedToSet.html.ep      |   4 +-
 templates/HelpFiles/Levels.html.ep            |  20 +-
 templates/HelpFiles/Options.html.ep           |  39 +-
 templates/HelpFiles/ProblemSets.html.ep       |  12 +-
 templates/HelpFiles/admin_links.html.ep       |  10 +-
 templates/HelpFiles/instructor_links.html.ep  |  39 +-
 templates/RPCRenderFormats/default.html.ep    | 337 +++++++-------
 templates/RPCRenderFormats/ptx.html.ep        |   4 +-
 templates/exception.html.ep                   |   4 +-
 templates/exception_default.html.ep           | 230 +++++-----
 templates/exception_min.html.ep               |  54 ++-
 templates/layouts/help_macro.html.ep          |  13 +-
 templates/layouts/pod_viewer.html.ep          | 109 +++--
 templates/layouts/system.html.ep              | 428 ++++++++++--------
 238 files changed, 6379 insertions(+), 4603 deletions(-)

diff --git a/templates/AchievementEvaluator/cheevoMessage.html.ep b/templates/AchievementEvaluator/cheevoMessage.html.ep
index a602a82f90..5f795567a0 100644
--- a/templates/AchievementEvaluator/cheevoMessage.html.ep
+++ b/templates/AchievementEvaluator/cheevoMessage.html.ep
@@ -1,10 +1,9 @@
-<div class="cheevo-toast toast hide" role ="alert" aria-live="polite" aria-atomic="true">
+<div class="cheevo-toast toast hide" role="alert" aria-live="polite" aria-atomic="true">
 	<div class="toast-body d-flex align-items-center">
-		<%= image $ce->{server_root_url} . (
-				$achievement->{icon}
+		<%= image $ce->{server_root_url}
+			. ($achievement->{icon}
 				? "$ce->{courseURLs}{achievements}/$achievement->{icon}"
-				: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png"
-			),
+				: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png"),
 			alt => 'Achievement Icon' =%>
 		<div class="cheevopopuptext">
 			% if ($achievement->category eq 'level') {
diff --git a/templates/ContentGenerator/Achievements/achievement_badges.html.ep b/templates/ContentGenerator/Achievements/achievement_badges.html.ep
index a831caa071..f73728fa33 100644
--- a/templates/ContentGenerator/Achievements/achievement_badges.html.ep
+++ b/templates/ContentGenerator/Achievements/achievement_badges.html.ep
@@ -9,15 +9,18 @@
 		% }
 		% $previousCategory = $achievement->category;
 		%
-		% my $userAchievement = $userAchievements->{$achievement->achievement_id};
-		<div class="d-flex justify-content-start align-items-center mb-3 mx-4 <%=
-			$userAchievement->earned ? 'unlocked' : 'locked' %>">
+		% my $userAchievement = $userAchievements->{ $achievement->achievement_id };
+		<div
+			class="d-flex justify-content-start align-items-center mb-3 mx-4 <%=
+				$userAchievement->earned ? 'unlocked' : 'locked'
+			%>"
+		>
 			<div>
 				<%= image $achievement->{icon}
 					? "$ce->{courseURLs}{achievements}/$achievement->{icon}"
 					: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png",
 					width => 50,
-					alt => $userAchievement->earned ? 'Achievement Earned' : 'Achievement Unearned' =%>
+					alt   => $userAchievement->earned ? 'Achievement Earned' : 'Achievement Unearned' =%>
 			</div>
 			<div class="ms-3">
 				<h3 class="fs-5 mb-1 fw-bold"><%= $achievement->name %></h3>
@@ -27,8 +30,12 @@
 				% if ($achievement->max_counter && !$userAchievement->earned) {
 					% my $percentage = int(100 * ($userAchievement->counter || 0) / $achievement->max_counter);
 					% $percentage = 100 if $percentage > 100;
-					<div class="cheevoouterbar mt-1" title="<%= maketext('[_1]% Complete', $percentage) %>"
-						aria-label="<%= maketext('[_1]% Complete', $percentage) %>" role="figure">
+					<div
+						class="cheevoouterbar mt-1"
+						title="<%= maketext('[_1]% Complete', $percentage) %>"
+						aria-label="<%= maketext('[_1]% Complete', $percentage) %>"
+						role="figure"
+					>
 						<div class="cheevoinnerbar" style="width:<%= $percentage %>%;"></div>
 					</div>
 				% }
diff --git a/templates/ContentGenerator/Achievements/achievement_items.html.ep b/templates/ContentGenerator/Achievements/achievement_items.html.ep
index 98c8d230e3..dab53effa6 100644
--- a/templates/ContentGenerator/Achievements/achievement_items.html.ep
+++ b/templates/ContentGenerator/Achievements/achievement_items.html.ep
@@ -7,16 +7,15 @@
 		<%= maketext(
 			'Achievement rewards can be used to modify assignments. To use a reward, go to the assignment you '
 				. 'wish to apply the reward to, then click the "Use Achievement Reward" button. You currently have '
-				. 'access to the following rewards:'
-		) %>
+				. 'access to the following rewards:') %>
 	</p>
 	<dl class="mx-4">
-	% for my $item (@{ $c->{achievementItems} }) {
-		<dt>
-			<%= $item->remaining_title($c) %>
-		</dt>
-		<dd class="ms-3 mb-2"><%= maketext(@{ $item->description }) %></dd>
-	% }
+		% for my $item (@{ $c->{achievementItems} }) {
+			<dt>
+				<%= $item->remaining_title($c) %>
+			</dt>
+			<dd class="ms-3 mb-2"><%= maketext(@{ $item->description }) %></dd>
+		% }
 	</dl>
 % } else {
 	<p><%= maketext(q{You don't have any rewards!}) %></p>
diff --git a/templates/ContentGenerator/Achievements/cheevobigbox.html.ep b/templates/ContentGenerator/Achievements/cheevobigbox.html.ep
index ac8bf99d69..ffcbc5b94f 100644
--- a/templates/ContentGenerator/Achievements/cheevobigbox.html.ep
+++ b/templates/ContentGenerator/Achievements/cheevobigbox.html.ep
@@ -8,8 +8,12 @@
 		<div>
 			<h1><%= $achievement->name %></h1>
 			% if ($c->{globalData}->next_level_points) {
-				<div class="levelouterbar" title="<%= maketext('[_1]% Complete', $level_percentage) %>"
-					aria-label="<%= maketext('[_1]% Complete', $level_percentage) %>" role="figure">
+				<div
+					class="levelouterbar"
+					title="<%= maketext('[_1]% Complete', $level_percentage) %>"
+					aria-label="<%= maketext('[_1]% Complete', $level_percentage) %>"
+					role="figure"
+				>
 					<div class="levelinnerbar" style="width:<%= $level_percentage %>%"></div>
 				</div>
 				<div><strong><%= maketext('Level Progress:') %></strong> <%= "$level_progress/$level_goal" %></div>
diff --git a/templates/ContentGenerator/AchievementsLeaderboard.html.ep b/templates/ContentGenerator/AchievementsLeaderboard.html.ep
index a2ede47d6e..9a4511de34 100644
--- a/templates/ContentGenerator/AchievementsLeaderboard.html.ep
+++ b/templates/ContentGenerator/AchievementsLeaderboard.html.ep
@@ -49,9 +49,15 @@
 				% }
 				<td>
 					% for my $badge (@$badges) {
-						<button class="btn btn-sm btn-link help-popup p-0" type="button" tabindex="0"
-							data-bs-placement="top" data-bs-toggle="popover" data-bs-html="true"
-							data-bs-content="<strong><%= $badge->{name} %></strong><br><%= $badge->{description} %>">
+						<button
+							class="btn btn-sm btn-link help-popup p-0"
+							type="button"
+							tabindex="0"
+							data-bs-placement="top"
+							data-bs-toggle="popover"
+							data-bs-html="true"
+							data-bs-content="<strong><%= $badge->{name} %></strong><br><%= $badge->{description} %>"
+						>
 							<%= image $badge->{icon}
 								? "$ce->{courseURLs}{achievements}/$badge->{icon}"
 								: "$ce->{webworkURLs}{htdocs}/images/defaulticon.png",
diff --git a/templates/ContentGenerator/Base/admin_links.html.ep b/templates/ContentGenerator/Base/admin_links.html.ep
index 21882d103b..29ba88b506 100644
--- a/templates/ContentGenerator/Base/admin_links.html.ep
+++ b/templates/ContentGenerator/Base/admin_links.html.ep
@@ -45,10 +45,8 @@
 		% }
 		<li class="list-group-item nav-item"><%= $makelink->('instructor_job_manager') %></li>
 		<li class="list-group-item nav-item">
-			<%= $makelink->(
-				'instructor_file_manager',
-				systemlink_params => { pwd => '.', unpack => 0, autodelete => 0 }
-			) %>
+			<%= $makelink->('instructor_file_manager',
+				systemlink_params => { pwd => '.', unpack => 0, autodelete => 0 }) %>
 		</li>
 		<li class="list-group-item nav-item">
 			<%= $c->helpMacro('admin_links', { label => maketext('Help'), class => 'nav-link' }) =%>
@@ -56,7 +54,8 @@
 		% if ($ce->{webworkURLs}{webwork2BugReporter} && $authz->hasPermissions($userID, 'report_bugs')) {
 			<li class="list-group-item nav-item">
 				<%= link_to maketext('Report bugs') => $ce->{webworkURLs}{webwork2BugReporter},
-					target => 'bug_report', class => 'nav-link' =%>
+					target                          => 'bug_report',
+					class                           => 'nav-link' =%>
 			</li>
 		% }
 	% }
diff --git a/templates/ContentGenerator/Base/error_output.html.ep b/templates/ContentGenerator/Base/error_output.html.ep
index 5533a7f94d..da2d934863 100644
--- a/templates/ContentGenerator/Base/error_output.html.ep
+++ b/templates/ContentGenerator/Base/error_output.html.ep
@@ -4,11 +4,9 @@
 	<h2><%= maketext('WeBWorK Error') %></h2>
 % }
 <p>
-	<%= maketext(
-		'WeBWorK has encountered a software error. If you are a student, report this error message to your '
-		. 'instructor to have it corrected. If you are a instructor, please consult the error output below for '
-		. 'more information.'
-		) %>
+	<%= maketext('WeBWorK has encountered a software error. If you are a student, report this error message to your '
+			. 'instructor to have it corrected. If you are a instructor, please consult the error output below for '
+			. 'more information.') %>
 </p>
 <h3><%= maketext('Error messages') %></h3>
 <div class="error-output"><%== $error %></div>
diff --git a/templates/ContentGenerator/Base/feedback_macro_email.html.ep b/templates/ContentGenerator/Base/feedback_macro_email.html.ep
index 2c9d5a8b7a..a687b87393 100644
--- a/templates/ContentGenerator/Base/feedback_macro_email.html.ep
+++ b/templates/ContentGenerator/Base/feedback_macro_email.html.ep
@@ -7,5 +7,6 @@
 		<%= hidden_field $key => $value =%>
 	% }
 	<%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'),
-		name => 'feedbackForm', class => 'btn btn-primary' =%>
+		name  => 'feedbackForm',
+		class => 'btn btn-primary' =%>
 % end
diff --git a/templates/ContentGenerator/Base/feedback_macro_form.html.ep b/templates/ContentGenerator/Base/feedback_macro_form.html.ep
index 2913422897..cce07b35ec 100644
--- a/templates/ContentGenerator/Base/feedback_macro_form.html.ep
+++ b/templates/ContentGenerator/Base/feedback_macro_form.html.ep
@@ -8,12 +8,16 @@
 	% while (my ($key, $value) = each %$params) {
 		% if ($key eq 'pg_object') {
 			<%= hidden_field $key => encode_base64(
-			 	Encode::encode(
-			 		'UTF-8',
-			 		$value->{body_text}
-			 			. ($value->{result}{msg} ? tag('p', tag('b', 'Note: ') . tag('i', $value->{result}{msg})) : '')
-			 	),
-			 	''
+				Encode::encode(
+					'UTF-8',
+					$value->{body_text}
+						. (
+							$value->{result}{msg}
+							? tag('p', tag('b', 'Note: ') . tag('i', $value->{result}{msg}))
+							: ''
+						)
+				),
+				''
 			) =%>
 		% } else {
 			<%= hidden_field $key => $value =%>
@@ -21,5 +25,6 @@
 	% }
 	%
 	<%= submit_button maketext($ce->{feedback_button_name}) || maketext('Email instructor'),
-		name  => 'feedbackForm', class => 'btn btn-primary' =%>
+		name  => 'feedbackForm',
+		class => 'btn btn-primary' =%>
 <% end =%>
diff --git a/templates/ContentGenerator/Base/links.html.ep b/templates/ContentGenerator/Base/links.html.ep
index 171206b58b..75bcd13a57 100644
--- a/templates/ContentGenerator/Base/links.html.ep
+++ b/templates/ContentGenerator/Base/links.html.ep
@@ -31,21 +31,21 @@
 								'proctored_gateway_quiz',
 								text       => $prettySetID,
 								captures   => { setID => $setID },
-								link_attrs => { dir => 'ltr' }
+								link_attrs => { dir   => 'ltr' }
 							) %>
 						% } elsif ($setRecord->assignment_type =~ /gateway/ && $setID =~ /,v(\d)+$/) {
 							<%= $makelink->(
 								'gateway_quiz',
 								text       => $prettySetID,
 								captures   => { setID => $setID },
-								link_attrs => { dir => 'ltr' }
+								link_attrs => { dir   => 'ltr' }
 							) %>
 						% } else {
 							<%= $makelink->(
 								'problem_list',
 								text       => $prettySetID,
 								captures   => { setID => $setID },
-								link_attrs => { dir => 'ltr' }
+								link_attrs => { dir   => 'ltr' }
 							) %>
 						% }
 					</li>
@@ -105,7 +105,7 @@
 									'instructor_user_detail',
 									text       => $urlUserID,
 									captures   => { userID => $urlUserID },
-									link_attrs => { dir => 'ltr' }
+									link_attrs => { dir    => 'ltr' }
 								); %>
 							</li>
 						% }
@@ -115,7 +115,7 @@
 									'instructor_user_detail',
 									text       => $eUserID,
 									captures   => { userID => $eUserID },
-									link_attrs => { dir => 'ltr' }
+									link_attrs => { dir    => 'ltr' }
 								); %>
 							</li>
 						% }
@@ -133,7 +133,7 @@
 								'instructor_set_detail',
 								text       => $prettySetID,
 								captures   => { setID => $setID },
-								link_attrs => { dir => 'ltr' }
+								link_attrs => { dir   => 'ltr' }
 							); %>
 						</li>
 					</ul>
@@ -175,9 +175,12 @@
 							<%= $makelink->(
 								'instructor_problem_editor_withset_withproblem',
 								text => param('file_type') eq 'set_header'
-									? b(maketext('[_1]: Set Header',      $c->tag('span', dir => 'ltr', $prettySetID)))
-									: b(maketext('[_1]: Hardcopy Header', $c->tag('span', dir => 'ltr', $prettySetID))),
-								captures          => { setID => $setID, problemID => 0 },
+								? b(maketext('[_1]: Set Header', $c->tag('span', dir => 'ltr', $prettySetID)))
+								: b(maketext(
+									'[_1]: Hardcopy Header',
+									$c->tag('span', dir => 'ltr', $prettySetID)
+								)),
+								captures          => { setID     => $setID, problemID => 0 },
 								systemlink_params => { file_type => param('file_type') },
 								target            => 'WW_Editor'
 							) %>
@@ -209,8 +212,8 @@
 									file_type      => 'hardcopy_theme',
 									hardcopy_theme => param('hardcopy_theme')
 								},
-								active            => 1,
-								target            => 'WW_Editor'
+								active => 1,
+								target => 'WW_Editor'
 							) %>
 						</li>
 					</ul>
@@ -251,16 +254,17 @@
 				% }
 			</li>
 			% # Student Progress
-			<li class="list-group-item nav-item"><%= $makelink->('instructor_progress') %>
+			<li class="list-group-item nav-item">
+				<%= $makelink->('instructor_progress') %>
 				% if ($userID ne $eUserID || defined $setID || defined $urlUserID) {
 					<ul class="nav flex-column">
 						% if (defined $urlUserID) {
 							<li class="nav-item">
 								<%= $makelink->(
 									'instructor_user_progress',
-									text     => $urlUserID,
-									captures => { userID => $urlUserID },
-									link_attrs => { dir => 'ltr' }
+									text       => $urlUserID,
+									captures   => { userID => $urlUserID },
+									link_attrs => { dir    => 'ltr' }
 								) %>
 							</li>
 						% }
@@ -268,10 +272,9 @@
 							<li class="nav-item">
 								<%= $makelink->(
 									'instructor_user_progress',
-									text     => $eUserID,
-									captures => { userID => $eUserID },
-									active   => current_route eq 'instructor_user_progress'
-										&& !defined $urlUserID,
+									text       => $eUserID,
+									captures   => { userID => $eUserID },
+									active     => current_route eq 'instructor_user_progress' && !defined $urlUserID,
 									link_attrs => { dir => 'ltr' }
 								) %>
 							</li>
@@ -344,15 +347,15 @@
 			% }
 			% # Instructor links help
 			<li class="list-group-item nav-item">
-				<%= $c->helpMacro('instructor_links',
-					{ label => maketext('Help'), class => 'nav-link' }) %>
+				<%= $c->helpMacro('instructor_links', { label => maketext('Help'), class => 'nav-link' }) %>
 			</li>
 		% }
 		%
 		% if ($ce->{webworkURLs}{webwork2BugReporter} && $authz->hasPermissions($userID, 'report_bugs')) {
 			<li class="list-group-item nav-item">
 				<%= link_to maketext('Report bugs') => $ce->{webworkURLs}{webwork2BugReporter},
-					target => 'bug_report', class => 'nav-link' =%>
+					target                          => 'bug_report',
+					class                           => 'nav-link' =%>
 			</li>
 		% }
 	% }
diff --git a/templates/ContentGenerator/Base/login_status.html.ep b/templates/ContentGenerator/Base/login_status.html.ep
index aca49ad3ca..98a06d50e0 100644
--- a/templates/ContentGenerator/Base/login_status.html.ep
+++ b/templates/ContentGenerator/Base/login_status.html.ep
@@ -9,7 +9,7 @@
 	<div class="d-flex justify-content-end align-items-center">
 		<%= maketext('Logged in as [_1].', $userName) %>
 		<%= link_to $c->systemLink(url_for 'logout'), class => 'btn btn-light btn-sm ms-2', begin %>
-		<%= maketext('Log Out') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true"></i>
+			<%= maketext('Log Out') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true"></i>
 		<% end %>
 	</div>
 	%
@@ -27,8 +27,9 @@
 		<div class="d-flex justify-content-end align-items-center">
 			<%= maketext('Acting as [_1].', $effectiveUserName) %>
 			<%= link_to $c->systemLink(url_for, params => { effectiveUser => $userID }),
-				class => 'btn btn-light btn-sm ms-2', begin %>
-			<%= maketext('Stop Acting') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true"></i>
+				class => 'btn btn-light btn-sm ms-2',
+				begin %>
+				<%= maketext('Stop Acting') %> <i class="icon fas fa-sign-out-alt" aria-hidden="true"></i>
 			<% end %>
 		</div>
 	% }
diff --git a/templates/ContentGenerator/Base/set_status.html.ep b/templates/ContentGenerator/Base/set_status.html.ep
index 79e3781b9e..fda08a4655 100644
--- a/templates/ContentGenerator/Base/set_status.html.ep
+++ b/templates/ContentGenerator/Base/set_status.html.ep
@@ -1,24 +1,26 @@
 % use WeBWorK::Utils::DateTime qw(before between after);
 %
-% my $useReducedScoring = ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
-	% && after($set->open_date)
-	% && $set->enable_reduced_scoring
-	% && $set->reduced_scoring_date
-	% && $set->reduced_scoring_date != $set->due_date
-% );
+% my $useReducedScoring =
+	% ($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+		% && after($set->open_date)
+		% && $set->enable_reduced_scoring
+		% && $set->reduced_scoring_date
+		% && $set->reduced_scoring_date != $set->due_date);
 %
 <div class="alert alert-info mb-3">
 	<%= tag 'p', $useReducedScoring ? () : (class => 'mb-0'), begin =%>
 		<strong>
 			% if (before($set->open_date)) {
-				<%= maketext('Set opens on [_1].',
-					$c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat})) %>
+				<%=
+					maketext('Set opens on [_1].', $c->formatDateTime($set->open_date, $ce->{studentDateDisplayFormat}))
+				%>
 			% } elsif ($useReducedScoring && before($set->reduced_scoring_date)) {
 				<%= maketext('Set is due on [_1].',
 					$c->formatDateTime($set->reduced_scoring_date, $ce->{studentDateDisplayFormat})) %>
 			% } elsif (before($set->due_date)) {
-				<%= maketext('Set closes on [_1].',
-					$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat})) %>
+				<%=
+					maketext('Set closes on [_1].', $c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}))
+				%>
 			% } else {
 				<%= maketext('Set is closed.') %>
 			% }
@@ -34,19 +36,18 @@
 				<%= maketext(
 					'After the due date this set enters a reduced scoring period until it closes on [_1].  All work '
 						. 'completed during the reduced scoring period counts for [_2]% of its value.',
-					$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}), $reducedScoringPerCent
-				) =%>
-			% } elsif (between($reduced_scoring_date, $set->due_date)) {
-				<%= maketext(
-					'This set is in its reduced scoring period.  All work counts for [_1]% of its value.',
+					$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}),
 					$reducedScoringPerCent
 				) =%>
+			% } elsif (between($reduced_scoring_date, $set->due_date)) {
+				<%= maketext('This set is in its reduced scoring period.  All work counts for [_1]% of its value.',
+					$reducedScoringPerCent) =%>
 			% } else {
 				<%= maketext(
 					'This set had a reduced scoring period that started on [_1] and ended on [_2].  '
 						. 'During that period all work counted for [_3]% of its value.',
 					$c->formatDateTime($reduced_scoring_date, $ce->{studentDateDisplayFormat}),
-					$c->formatDateTime($set->due_date, $ce->{studentDateDisplayFormat}),
+					$c->formatDateTime($set->due_date,        $ce->{studentDateDisplayFormat}),
 					$reducedScoringPerCent
 				) =%>
 			% }
diff --git a/templates/ContentGenerator/Base/warning_output.html.ep b/templates/ContentGenerator/Base/warning_output.html.ep
index f51c5935da..083b6b3586 100644
--- a/templates/ContentGenerator/Base/warning_output.html.ep
+++ b/templates/ContentGenerator/Base/warning_output.html.ep
@@ -5,8 +5,7 @@
 	<%= maketext(
 		'WeBWorK has encountered warnings while processing your request. This indicates a problem with the WeBWorK '
 			. 'system. If you are a student, report these warnings to your instructor to have them corrected. If you '
-			. 'are a instructor, please consult the warning output below for more information.'
-	) %>
+			. 'are a instructor, please consult the warning output below for more information.') %>
 </p>
 <h3><%= maketext('Warning messages') %></h3>
 <ul>
@@ -16,7 +15,16 @@
 </ul>
 <h3><%= maketext('Request information') %></h3>
 <table class="table-bordered">
-	<tr><td><%= maketext('Time') %><td><%= time2str('%a %b %d %H:%M:%S %Y', time) %></td></tr>
-	<tr><td><%= maketext('Method') %><td><%= $c->req->method %></td></tr>
-	<tr><td><%= maketext('URI') %><td><%= url_for %></td></tr>
+	<tr>
+		<td><%= maketext('Time') %></td>
+		<td><%= time2str('%a %b %d %H:%M:%S %Y', time) %></td>
+	</tr>
+	<tr>
+		<td><%= maketext('Method') %></td>
+		<td><%= $c->req->method %></td>
+	</tr>
+	<tr>
+		<td><%= maketext('URI') %></td>
+		<td><%= url_for %></td>
+	</tr>
 </table>
diff --git a/templates/ContentGenerator/CourseAdmin.html.ep b/templates/ContentGenerator/CourseAdmin.html.ep
index 793a193ac0..4b56860c53 100644
--- a/templates/ContentGenerator/CourseAdmin.html.ep
+++ b/templates/ContentGenerator/CourseAdmin.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils                   qw(getAssetURL);
 % use WeBWorK::Utils::CourseManagement qw(listCourses listArchivedCourses);
 %
 % content_for js => begin
@@ -59,10 +59,8 @@
 	%
 	<h2><%= maketext('Archived Courses') =%></h2>
 	<p>
-		<%= link_to maketext('Download/upload archived courses') => $c->systemLink(
-			url_for('instructor_file_manager'),
-			params => { pwd => 'archives', unpack => 0, autodelete => 0 },
-		) =%>
+		<%= link_to maketext('Download/upload archived courses') => $c->systemLink(url_for('instructor_file_manager'),
+			params => { pwd => 'archives', unpack => 0, autodelete => 0 },) =%>
 	</p>
 	<ol>
 		% my %courseArchives = listArchivedCourses($ce);
diff --git a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
index 694071b8e6..89b4b2e0a6 100644
--- a/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/add_course_form.html.ep
@@ -1,7 +1,7 @@
 % use WeBWorK::Utils::CourseManagement qw(listCourses);
 %
 % content_for js => begin
-    <%= javascript getAssetURL($ce, 'js/CourseAdmin/restrict_select.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/CourseAdmin/restrict_select.js'), defer => undef =%>
 % end
 %
 % # Create an array of permission values for the permission selects.
@@ -27,51 +27,55 @@
 	<div class="row my-3">
 		<div class="col-lg-8 col-md-10">
 			<div class="form-floating mb-1">
-				<%= text_field new_courseID => '',
-					id          => 'new_courseID',
-					placeholder => '',
-					class       => 'form-control set-id-tooltip',
-					maxlength   => $ce->{maxCourseIdLength},
-					data        => {
+				<%= text_field
+					new_courseID => '',
+					id           => 'new_courseID',
+					placeholder  => '',
+					class        => 'form-control set-id-tooltip',
+					maxlength    => $ce->{maxCourseIdLength},
+					data         => {
 						'bs-placement' => 'top',
 						'bs-title'     => maketext(
 							'Course ID may contain only letters, numbers, hyphens, and underscores, '
-								. 'and may have at most [_1] characters.',
+							. 'and may have at most [_1] characters.',
 							$ce->{maxCourseIdLength}
 						)
 					} =%>
 				<%= label_for new_courseID => maketext('Course ID') =%>
 			</div>
 			<div class="form-floating mb-1">
-				<%= text_field add_courseTitle => '',
-					id          => 'add_courseTitle',
-					placeholder => '',
-					class       => 'form-control' =%>
+				<%= text_field
+					add_courseTitle => '',
+					id              => 'add_courseTitle',
+					placeholder     => '',
+					class           => 'form-control' =%>
 				<%= label_for add_courseTitle => maketext('Course Title') =%>
 			</div>
 			<div class="form-floating">
-				<%= text_field add_courseInstitution => '',
-					id          => 'add_courseInstitution',
-					placeholder => '',
-					class       => 'form-control' =%>
+				<%= text_field
+					add_courseInstitution => '',
+					id                    => 'add_courseInstitution',
+					placeholder           => '',
+					class                 => 'form-control' =%>
 				<%= label_for add_courseInstitution => maketext('Institution') =%>
 			</div>
 		</div>
 	</div>
 	<div class="row mb-3">
 		<div class="mb-1">
-			<%= maketext(
-				'Select users from the [_1] course to add to the new course with indicated permission.',
+			<%= maketext('Select users from the [_1] course to add to the new course with indicated permission.',
 				$ce->{admin_course_id}) =%>
 		</div>
 		<div class="col-lg-4 col-md-5 col-sm-6">
 			<div class="overflow-auto border rounded px-2" style="max-height: 100px;">
 				% for my $user ($db->listUsers) {
-					% my $val   = $db->getPermissionLevel($user)->permission;
+					% my $val  = $db->getPermissionLevel($user)->permission;
 					% my $role = maketext((grep { $ce->{userRoles}{$_} eq $val } keys %{ $ce->{userRoles} })[0]);
 					<div class="form-check">
 						<label class="form-check-label">
-							<%= check_box 'add-admin-users' => $user, class => 'form-check-input',
+							<%= check_box
+								'add-admin-users' => $user,
+								class             => 'form-check-input',
 								$val == 20 && !param('last_page_was_add_course') ? (checked => undef) : () =%>
 							<%= "$user ($role)" %>
 						</label>
@@ -81,101 +85,109 @@
 		</div>
 	</div>
 	<div class="mb-2">
-	% for (1 .. $number_of_additional_users) {
-		<div class="mb-2">
-			<%= maketext('Enter information for additional user number [_1].', $_) %>
-		</div>
-		<div class="row mb-1">
-			<div class="col-lg-4 col-md-5 col-sm-6">
-				<div class="form-floating mb-1">
-					<%= text_field "add_initial_userID_$_" => '',
-						id          => "add_initial_userID_$_",
-						placeholder => '',
-						class       => 'form-control set-id-tooltip',
-						data        => {
-							'bs-placement' => 'top',
-							'bs-title'     => maketext(
+		% for (1 .. $number_of_additional_users) {
+			<div class="mb-2">
+				<%= maketext('Enter information for additional user number [_1].', $_) %>
+			</div>
+			<div class="row mb-1">
+				<div class="col-lg-4 col-md-5 col-sm-6">
+					<div class="form-floating mb-1">
+						<%= text_field
+							"add_initial_userID_$_" => '',
+							id                      => "add_initial_userID_$_",
+							placeholder             => '',
+							class                   => 'form-control set-id-tooltip',
+							data                    => {
+								'bs-placement' => 'top',
+								'bs-title'     => maketext(
 								'User ID may contain only numbers, letters, hyphens, periods, commas, at symbols, '
-								. 'and underscores.'
-							)
-						} =%>
-					<%= label_for "add_initial_userID_$_" => maketext('User ID') =%>
-				</div>
-				<div class="form-floating mb-1">
-					<%= text_field "add_initial_password_$_" => '',
-						id           => "add_initial_password_$_",
-						placeholder  => '',
-						class        => 'form-control' =%>
-					<%= label_for "add_initial_password_$_" => maketext('Password') =%>
+									. 'and underscores.'
+								)
+							} =%>
+						<%= label_for "add_initial_userID_$_" => maketext('User ID') =%>
+					</div>
+					<div class="form-floating mb-1">
+						<%= text_field
+							"add_initial_password_$_" => '',
+							id                        => "add_initial_password_$_",
+							placeholder               => '',
+							class                     => 'form-control' =%>
+						<%= label_for "add_initial_password_$_" => maketext('Password') =%>
+					</div>
+					<div class="form-floating mb-1">
+						<%= select_field
+							"add_initial_permission_$_" => $permissionLevels,
+							id                          => "add_initial_role_$_",
+							class                       => 'form-select' =%>
+						<%= label_for "add_initial_permission_$_" => maketext('Permission Level') =%>
+					</div>
 				</div>
-				<div class="form-floating mb-1">
-					<%= select_field "add_initial_permission_$_" => $permissionLevels,
-						id      => "add_initial_role_$_",
-						class   => 'form-select' =%>
-					<%= label_for "add_initial_permission_$_" => maketext('Permission Level') =%>
+				<div class="col-lg-4 col-md-5 col-sm-6">
+					<div class="form-floating mb-1">
+						<%= text_field
+							"add_initial_firstName_$_" => '',
+							id                         => "add_initial_firstName_$_",
+							placeholder                => '',
+							class                      => 'form-control' =%>
+						<%= label_for "add_initial_firstName_$_" => maketext('First Name') =%>
+					</div>
+					<div class="form-floating mb-1">
+						<%= text_field
+							"add_initial_lastName_$_" => '',
+							id                        => "add_initial_lastName_$_",
+							placeholder               => '',
+							class                     => 'form-control' =%>
+						<%= label_for "add_initial_lastName_$_" => maketext('Last Name') %>
+					</div>
+					<div class="form-floating mb-1">
+						<%= text_field
+							"add_initial_email_$_" => '',
+							id                     => "add_initial_email_$_",
+							placeholder            => '',
+							class                  => 'form-control' =%>
+						<%= label_for "add_initial_email_$_" => maketext('Email Address') =%>
+					</div>
 				</div>
 			</div>
-			<div class="col-lg-4 col-md-5 col-sm-6">
-				<div class="form-floating mb-1">
-					<%= text_field "add_initial_firstName_$_" => '',
-						id          => "add_initial_firstName_$_",
-						placeholder => '',
-						class       => 'form-control' =%>
-					<%= label_for "add_initial_firstName_$_" => maketext('First Name') =%>
-				</div>
-				<div class="form-floating mb-1">
-					<%= text_field "add_initial_lastName_$_" => '',
-						id          => "add_initial_lastName_$_",
-						placeholder => '',
-						class       => 'form-control' =%>
-					<%= label_for "add_initial_lastName_$_" => maketext('Last Name') %>
-				</div>
-				<div class="form-floating mb-1">
-					<%= text_field "add_initial_email_$_" => '',
-						id          => "add_initial_email_$_",
-						placeholder => '',
-						class       => 'form-control' =%>
-					<%= label_for "add_initial_email_$_" => maketext('Email Address') =%>
-				</div>
+			<div class="form-check mb-3">
+				<label class="form-check-label">
+					<%= check_box "add_initial_user_$_" => 1, class => 'form-check-input' =%>
+					<%= maketext('Also add this user to the [_1] course.', $ce->{admin_course_id}) =%>
+				</label>
 			</div>
-		</div>
-		<div class="form-check mb-3">
-			<label class="form-check-label">
-				<%= check_box "add_initial_user_$_" => 1, class => 'form-check-input' =%>
-				<%= maketext('Also add this user to the [_1] course.', $ce->{admin_course_id}) =%>
-			</label>
-		</div>
-	% }
+		% }
 	</div>
 	<div class="mb-3">
-		<%= submit_button maketext('Add Additional User'), name => 'add_another_instructor',
+		<%= submit_button maketext('Add Additional User'),
+			name  => 'add_another_instructor',
 			class => 'btn btn-secondary' =%>
 	</div>
 	<div class="mb-1">
 		<%= maketext('To copy components from an existing course, '
-			. 'select the course and check which components to copy.') =%>
+				. 'select the course and check which components to copy.') =%>
 	</div>
 	<div class="row mb-1">
 		% my @existingCourses = sort { lc($a) cmp lc($b) } listCourses($ce);
 		% unshift(@existingCourses, sort { lc($a) cmp lc($b) } @{ $ce->{modelCoursesForCopy} });
 		%
-		<%= label_for copy_from_course => maketext('Copy Components From:'),
-			class => 'col-auto col-form-label fw-bold' =%>
+		<%= label_for
+			copy_from_course => maketext('Copy Components From:'),
+			class            => 'col-auto col-form-label fw-bold' =%>
 		<div class="col-auto">
-			<%= select_field copy_from_course => [
-					[ maketext('No Course') => '' ],
-					map { [ $_ => $_] } @existingCourses
-				],
-				id      => 'copy_from_course',
-				class   => 'form-select' =%>
+			<%= select_field
+				copy_from_course => [ [ maketext('No Course') => '' ], map { [ $_ => $_ ] } @existingCourses ],
+				id               => 'copy_from_course',
+				class            => 'form-select' =%>
 		</div>
 	</div>
 	<fieldset class="mb-3">
 		<legend class="fw-bold fs-6"><%= maketext('Copy These Components:') %></legend>
 		<div class="form-check">
 			<label class="form-check-label">
-				<%= check_box select_all => 1, class => 'select-all form-check-input',
-					data => { select_group => 'copy_component' } =%>
+				<%= check_box
+					select_all => 1,
+					class      => 'select-all form-check-input',
+					data       => { select_group => 'copy_component' } =%>
 				<%= maketext('select all', 'templates', 'html') =%>
 			</label>
 		</div>
@@ -224,29 +236,31 @@
 		% my @addOnConfFiles;
 		% if (-d $ce->{webworkDirs}{addOnConf}) {
 			% @addOnConfFiles = glob "$ce->{webworkDirs}{addOnConf}/*.conf";
-			% for (0 .. $#addOnConfFiles){
+			% for (0 .. $#addOnConfFiles) {
 				% $addOnConfFiles[$_] =~ s/^.*\/|\.conf$//g;
 			% }
 		% }
 		% if (@addOnConfFiles) {
 			<div class="row my-2">
-				<%= label_for add_on_conf => maketext('Configuration File:'),
-					class => 'col-auto col-form-label fw-bold' =%>
+				<%= label_for
+					add_on_conf => maketext('Configuration File:'),
+					class       => 'col-auto col-form-label fw-bold' =%>
 				<div class="col-auto">
-					<%= select_field add_on_conf => [
+					<%= select_field
+						add_on_conf => [
 							c(
-								maketext('Default')
-									=> [ [ maketext('Use distribution default config file') => '', selected => undef ] ],
+								maketext('Default') =>
+								[ [ maketext('Use distribution default config file') => '', selected => undef ] ],
 								'data-single' => 'true',
 							),
 							c(
-								maketext('Source Course')
-									=> [ [ maketext("Use source course's config file") => '*' ] ],
+								maketext('Source Course') =>
+								[ [ maketext("Use source course's config file") => '*' ] ],
 								'data-single' => 'true'
 							),
 							c(
-								maketext('Append to distribution default')
-									=> [ map { [ $_ => "$_.conf" ] } @addOnConfFiles ]
+								maketext('Append to distribution default') =>
+								[ map { [ $_ => "$_.conf" ] } @addOnConfFiles ]
 							)
 						],
 						id       => 'add_on_conf',
@@ -260,16 +274,21 @@
 				<label class="form-check-label">
 					<%= check_box copy_config_file => 1, class => 'form-check-input' =%>
 					<%= maketext('course configuration file') =%>
-					<a class="help-popup" role="button" tabindex="0" data-bs-placement="top"
-						data-bs-toggle="popover" data-bs-content="<%= maketext('Copying the course configuration '
-							. 'file may copy configuration settings that are specific to the original course '
-							. 'instructor. If this is a new course for a new instructor, use the fields above to '
-							. 'add the new instructor and do not copy the course configuration file. Then if '
-							. 'there is something in the course configuration file that should be carried into '
-							. 'the new course, the administrator can copy that manually.  Alternatively, do copy '
-							. 'the course configuration file, but then the administrator should inspect the new '
-							. 'course configuration file and make adjustments for the new instructor.') =%>"
-						>
+					<a
+						class="help-popup"
+						role="button"
+						tabindex="0"
+						data-bs-placement="top"
+						data-bs-toggle="popover"
+						data-bs-content="<%= maketext('Copying the course configuration '
+								. 'file may copy configuration settings that are specific to the original course '
+								. 'instructor. If this is a new course for a new instructor, use the fields above to '
+								. 'add the new instructor and do not copy the course configuration file. Then if '
+								. 'there is something in the course configuration file that should be carried into '
+								. 'the new course, the administrator can copy that manually.  Alternatively, do copy '
+								. 'the course configuration file, but then the administrator should inspect the new '
+								. 'course configuration file and make adjustments for the new instructor.') =%>"
+					>
 						<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 						<span class="visually-hidden">
 							<%= maketext('Notes regarding copying the course configuration file') =%>
diff --git a/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep
index 98288e006f..699d8643a4 100644
--- a/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/archive_course_confirm.html.ep
@@ -6,38 +6,27 @@
 		<p class="<%= $_->[1] ? 'text-success' : 'text-danger' %> fw-bold my-0"><%= $_->[0] %></p>
 	% }
 % }
-% my (
-	% $all_tables_ok,
-	% $extra_database_tables,
-	% $extra_database_fields,
-	% $rebuild_table_indexes,
-	% $incorrect_type_database_fields,
-	% $db_report
-% ) = $c->formatReportOnDatabaseTables($dbStatus);
+% my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $rebuild_table_indexes,
+	% $incorrect_type_database_fields, $db_report)
+	% = $c->formatReportOnDatabaseTables($dbStatus);
 <%= $db_report %>
 % if ($extra_database_tables) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database tables which are not defined in the schema.  '
-				. 'These can be deleted when upgrading the course.'
-		) =%>
+		<%= maketext('There are extra database tables which are not defined in the schema.  '
+				. 'These can be deleted when upgrading the course.') =%>
 	</p>
 % }
 % if ($extra_database_fields) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database fields which are not defined in the schema for at least one table.  '
-				. 'They can be removed when upgrading the course.'
-		) =%>
+		<%= maketext('There are extra database fields which are not defined in the schema for at least one table.  '
+				. 'They can be removed when upgrading the course.') =%>
 	</p>
 % }
 % if ($rebuild_table_indexes) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database fields which are not defined in the schema and were part of the key '
+		<%= maketext('There are extra database fields which are not defined in the schema and were part of the key '
 				. 'for at least one table. These fields need to be deleted and the table indexes need to be rebuilt. '
-				. 'This will be done when upgrading the course.'
-		) =%>
+				. 'This will be done when upgrading the course.') =%>
 	</p>
 % }
 % if ($incorrect_type_database_fields) {
@@ -46,8 +35,7 @@
 			'There are database fields that do not have the same type as the field defined in the schema for '
 				. 'at least one table. The types of these fields can be changed when upgrading the course. '
 				. 'Make sure that you archive the course here before doing that, since changing the type of a '
-				. 'field can corrupt the table.'
-		) =%>
+				. 'field can corrupt the table.') =%>
 	</p>
 % }
 % if (!$all_tables_ok) {
@@ -96,10 +84,8 @@
 <hr>
 % if ($all_tables_ok && param('delete_course')) {
 	<p class="text-danger fw-bold">
-		<%== maketext(
-			'Are you sure that you want to delete the course [_1] after archiving? This cannot be undone!',
-			tag('b', $archive_courseID)
-		) =%>
+		<%== maketext('Are you sure that you want to delete the course [_1] after archiving? This cannot be undone!',
+			tag('b', $archive_courseID)) =%>
 	</p>
 % }
 % # Print form for choosing next action.
@@ -120,17 +106,18 @@
 				<%= maketext(
 					'The course "[_1]" has already been archived at "[_2]". '
 						. 'This earlier archive will be erased.  This cannot be undone.',
-					$archive_courseID,
-					$archive_path
+					$archive_courseID, $archive_path
 				) =%>
 			</p>
 		% }
 		<div class="d-flex justify-content-center gap-2">
 			<%= submit_button maketext('Stop Archiving'),
-				name => 'decline_archive_course', class => 'btn btn-primary' =%>
+				name  => 'decline_archive_course',
+				class => 'btn btn-primary' =%>
 			% if (scalar(@$archive_courseIDs) > 1) {
 				<%= submit_button maketext('Skip archiving this course'),
-					name => 'skip_archive_course', class => 'btn btn-primary' =%>
+					name  => 'skip_archive_course',
+					class => 'btn btn-primary' =%>
 			% }
 			<%= submit_button maketext('Archive'), name => 'confirm_archive_course', class => 'btn btn-primary' =%>
 		</div>
@@ -142,11 +129,13 @@
 		% }
 		<div class="d-flex justify-content-center gap-2">
 			<%= submit_button maketext(q{Don't Archive}),
-				name => 'decline_archive_course', class => 'btn btn-primary' =%>
+				name  => 'decline_archive_course',
+				class => 'btn btn-primary' =%>
 			<%= submit_button $all_tables_ok
-					? maketext('Attempt to upgrade directories and links')
-					: maketext('Upgrade Course Tables'),
-				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
+				? maketext('Attempt to upgrade directories and links')
+				: maketext('Upgrade Course Tables'),
+				name  => 'upgrade_course_tables',
+				class => 'btn btn-primary' =%>
 		</div>
 	% }
 <% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep
index fba07f6e3c..7fa50535a3 100644
--- a/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/archive_course_form.html.ep
@@ -6,21 +6,18 @@
 			'Courses are listed either alphabetically or in order by the time of most recent login activity, oldest '
 				. 'first. To change the listing order check the mode you want and click "Refresh Listing".  The '
 				. 'listing format is: Course_ID (status :: date/time of most recent login) where status is "hidden" '
-				. 'or "visible".'
-		) =%>
+				. 'or "visible".') =%>
 	</p>
 	<%= form_for current_route, method => 'POST', begin =%>
 		<div class="mb-3">
 			<div class="mb-2"><%= maketext('Select a listing format:') %></div>
-			% for (
-				% [ alphabetically => maketext('alphabetically') ],
-				% [ last_login     => maketext('by last login date') ]
-			% )
+			% for ([ alphabetically => maketext('alphabetically') ], [ last_login => maketext('by last login date') ])
 			% {
 				<div class="form-check">
-					<%= radio_button archive_listing_format => $_->[0],
-						id    => "archive_listing_format_$_->[0]",
-						class => 'form-check-input',
+					<%= radio_button
+						archive_listing_format => $_->[0],
+						id                     => "archive_listing_format_$_->[0]",
+						class                  => 'form-check-input',
 						$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
 					<%= label_for "archive_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
 				</div>
@@ -28,7 +25,8 @@
 		</div>
 		<div class="d-flex justify-content-start gap-2">
 			<%= submit_button maketext('Refresh Listing'),
-				name => 'archive_course_refresh', class => 'btn btn-primary' =%>
+				name  => 'archive_course_refresh',
+				class => 'btn btn-primary' =%>
 			<%= submit_button maketext('Archive Courses'), name => 'archive_course', class => 'btn btn-primary' =%>
 		</div>
 		<%= $c->hidden_authen_fields =%>
@@ -37,11 +35,12 @@
 		<div class="row mb-2">
 			<%= label_for archive_courseIDs => maketext('Course ID:'), class => 'col-auto col-form-label fw-bold' =%>
 			<div class="col-auto">
-				<%= select_field archive_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
-					id       => 'archive_courseIDs',
-					class    => 'form-select',
-					multiple => undef,
-					size     => 15 =%>
+				<%= select_field
+					archive_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
+					id                => 'archive_courseIDs',
+					class             => 'form-select',
+					multiple          => undef,
+					size              => 15 =%>
 			</div>
 		</div>
 		%
@@ -59,7 +58,8 @@
 		%
 		<div class="d-flex justify-content-start gap-2">
 			<%= submit_button maketext('Refresh Listing'),
-				name => 'archive_course_refresh', class => 'btn btn-primary' =%>
+				name  => 'archive_course_refresh',
+				class => 'btn btn-primary' =%>
 			<%= submit_button maketext('Archive Courses'), name => 'archive_course', class => 'btn btn-primary' =%>
 		</div>
 	<%= end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/copy_otp_secrets_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/copy_otp_secrets_confirm.html.ep
index 4b72b3ee3b..5ddd92e02d 100644
--- a/templates/ContentGenerator/CourseAdmin/copy_otp_secrets_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/copy_otp_secrets_confirm.html.ep
@@ -16,22 +16,24 @@
 						% $total++;
 						% $overwrite_warning = 1 if $row->{error} && $row->{error} eq 'danger';
 						% content_for 'hidden-rows' => begin
-							<%= hidden_field otp_copy_row => $row->{source_course} . ':' . $row->{source_user}
-								. ':' . $row->{dest_course} . ':' . $row->{dest_user} =%>
+							<%= hidden_field otp_copy_row => $row->{source_course} . ':'
+								. $row->{source_user} . ':'
+								. $row->{dest_course} . ':'
+								. $row->{dest_user} =%>
 						% end
 					% }
 					<tr class="<%= $row->{error} ? 'table-' . $row->{error} : '' %>">
 						<td>
 							<%= $row->{source_course} %> / <%= $row->{source_user} %>
 							% if ($row->{source_message}) {
-								<br/>(<%= $row->{source_message} %>)
+								<br>(<%= $row->{source_message} %>)
 							% }
 						</td>
 						<td>
 							% unless ($row->{source_message}) {
 								<%= $row->{dest_course} %> / <%= $row->{dest_user} %>
 								% if ($row->{dest_message}) {
-									<br/>(<%= $row->{dest_message} %>)
+									<br>(<%= $row->{dest_message} %>)
 								% }
 							% }
 						</td>
diff --git a/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep
index 68e9915ef7..1df1ea66b7 100644
--- a/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/delete_course_form.html.ep
@@ -7,20 +7,17 @@
 				'Courses are listed either alphabetically or in order by the time of most recent login activity, '
 					. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing". '
 					. 'The listing format is: Course_ID (status :: date/time of most recent login) where status is '
-					. '"hidden" or "visible".'
-			) =%>
+					. '"hidden" or "visible".') =%>
 		</p>
 		<div class="mb-3">
-			<div class="mb-2"><%= maketext('Select a listing format:')=%></div>
-			% for (
-				% [ alphabetically => maketext('alphabetically') ],
-				% [ last_login     => maketext('by last login date') ]
-			% )
+			<div class="mb-2"><%= maketext('Select a listing format:') =%></div>
+			% for ([ alphabetically => maketext('alphabetically') ], [ last_login => maketext('by last login date') ])
 			% {
 				<div class="form-check">
-					<%= radio_button delete_listing_format => $_->[0],
-						id    => "delete_listing_format_$_->[0]",
-						class => 'form-check-input',
+					<%= radio_button
+						delete_listing_format => $_->[0],
+						id                    => "delete_listing_format_$_->[0]",
+						class                 => 'form-check-input',
 						$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
 					<%= label_for "delete_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
 				</div>
@@ -28,7 +25,8 @@
 		</div>
 		<div class="d-flex gap-2 mb-2">
 			<%= submit_button maketext('Refresh Listing'),
-				name  => 'delete_course_refresh', class => 'btn btn-primary' =%>
+				name  => 'delete_course_refresh',
+				class => 'btn btn-primary' =%>
 			<%= submit_button maketext('Delete Course'), name => 'delete_course', class => 'btn btn-primary' =%>
 		</div>
 		<%= $c->hidden_authen_fields =%>
@@ -37,15 +35,17 @@
 		<div class="row mb-2">
 			<%= label_for delete_courseID => maketext('Course ID:'), class => 'col-auto col-form-label fw-bold' =%>
 			<div class="col-auto">
-				<%= select_field delete_courseID => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
-					id       => 'delete_courseID',
-					size     => 15,
-					class    => 'form-select' =%>
+				<%= select_field
+					delete_courseID => [ map { [ $courseLabels->{$_} => $_ ] } @$courseIDs ],
+					id              => 'delete_courseID',
+					size            => 15,
+					class           => 'form-select' =%>
 			</div>
 		</div>
 		<div class="d-flex gap-2">
 			<%= submit_button maketext('Refresh Listing'),
-				name => 'delete_course_refresh', class => 'btn btn-primary' =%>
+				name  => 'delete_course_refresh',
+				class => 'btn btn-primary' =%>
 			<%= submit_button maketext('Delete Course'), name => 'delete_course', class => 'btn btn-primary' =%>
 		</div>
 	<%= end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep b/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep
index 2bd8a8eca5..21a6b51093 100644
--- a/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/edit_location_form.html.ep
@@ -3,8 +3,7 @@
 	<%= maketext(
 		'Edit the current value of the location description, if desired, then add and select addresses to delete, '
 			. q{and then click the "Take Action" button to make all of your changes.  Or, click }
-			. q{"Manage Locations" above to make no changes and return to the Manage Locations page.}
-	) =%>
+			. q{"Manage Locations" above to make no changes and return to the Manage Locations page.}) =%>
 </p>
 %
 <%= form_for current_route, method => 'POST', begin =%>
@@ -16,33 +15,44 @@
 	<div class="row mb-2">
 		<%= label_for location_description => maketext('Location description:'), class => 'col-auto col-form-label' =%>
 		<div class="col-auto">
-			<%= text_field location_description => $location->description,
-				id => 'location_description', class => 'form-control', size => '50' =%>
+			<%= text_field
+				location_description => $location->description,
+				id                   => 'location_description',
+				class                => 'form-control',
+				size                 => '50' =%>
 		</div>
 	</div>
 	<div class="row">
 		<div class="col-md-6">
 			<div class="mb-2">
-				<%= label_for new_location_addresses => maketext(
-					'Addresses to add to the location.  Enter one per line, as single IP addresses '
+				<%= label_for new_location_addresses =>
+					maketext('Addresses to add to the location.  Enter one per line, as single IP addresses '
 						. '(e.g., 192.168.1.101), address masks (e.g., 192.168.1.0/24), or IP ranges '
 						. '(e.g., 192.168.1.101-192.168.1.150):') =%>
 			</div>
 			<div class="mb-2">
-				<textarea name="new_location_addresses" id="new_location_addresses" class="form-control"
-				   	rows="5" columns="28"></textarea>
+				<textarea
+					name="new_location_addresses"
+					id="new_location_addresses"
+					class="form-control"
+					rows="5"
+					columns="28"
+				></textarea>
 			</div>
 		</div>
 		<div class="col-md-6">
 			<div class="mb-2">
-				<%= label_for delete_location_addresses => maketext(
-					'Existing addresses for the location are given in the scrolling list below.  '
-						. 'Select addresses from the list to delete them:'
-				) =%>
+				<%= label_for delete_location_addresses =>
+					maketext('Existing addresses for the location are given in the scrolling list below.  '
+						. 'Select addresses from the list to delete them:') =%>
 			</div>
 			<div class="mb-2">
-				<%= select_field delete_location_addresses => $locAddresses,
-					id => 'delete_location_addresses', size => 8, multiple => undef, class => 'form-select' =%>
+				<%= select_field
+					delete_location_addresses => $locAddresses,
+					id                        => 'delete_location_addresses',
+					size                      => 8,
+					multiple                  => undef,
+					class                     => 'form-select' =%>
 			</div>
 			<div class="mb-2"><%= maketext('or') %></div>
 			<div class="mb-2">
diff --git a/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep
index be442fb54f..86e3d9345c 100644
--- a/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/hide_inactive_course_form.html.ep
@@ -5,29 +5,24 @@
 			. 'Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding a '
 			. 'course that is already visible does no harm (the action is skipped).  Hidden courses are still active '
 			. 'but are not listed in the list of WeBWorK courses on the opening page.  To access the course, an '
-			. 'instructor or student must know the full URL address for the course.'
-	) =%>
+			. 'instructor or student must know the full URL address for the course.') =%>
 </p>
 <p>
-	<%= maketext(
-		'Courses are listed either alphabetically or in order by the time of most recent login activity, '
+	<%= maketext('Courses are listed either alphabetically or in order by the time of most recent login activity, '
 			. 'oldest first. To change the listing order check the mode you want and click "Refresh Listing".  '
 			. 'The listing format is: Course_ID (status :: date/time of most recent login) where status is "hidden" '
-			. 'or "visible".'
-	) =%>
+			. 'or "visible".') =%>
 </p>
 <%= form_for current_route, method => 'POST', begin =%>
 	<div class="mb-3">
 		<div class="mb-2"><%= maketext('Select a listing format:') =%></div>
-		% for (
-			% [ alphabetically => maketext('alphabetically') ],
-			% [ last_login     => maketext('by last login date') ]
-		% )
+		% for ([ alphabetically => maketext('alphabetically') ], [ last_login => maketext('by last login date') ])
 		% {
 			<div class="form-check">
-				<%= radio_button hide_listing_format => $_->[0],
-					id    => "hide_listing_format_$_->[0]",
-					class => 'form-check-input',
+				<%= radio_button
+					hide_listing_format => $_->[0],
+					id                  => "hide_listing_format_$_->[0]",
+					class               => 'form-check-input',
 					$_->[0] eq 'alphabetically' ? (checked => undef) : () =%>
 				<%= label_for "hide_listing_format_$_->[0]" => $_->[1], class => 'form-check-label' =%>
 			</div>
@@ -45,11 +40,12 @@
 	<div class="row mb-2">
 		<%= label_for hide_courseIDs => maketext('Course ID:'), class => 'col-auto col-form-label fw-bold' =%>
 		<div class="col-auto">
-			<%= select_field hide_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$hideCourseIDs ],
-				id       => 'hide_courseIDs',
-				class    => 'form-select',
-				multiple => undef,
-				size     => 15 =%>
+			<%= select_field
+				hide_courseIDs => [ map { [ $courseLabels->{$_} => $_ ] } @$hideCourseIDs ],
+				id             => 'hide_courseIDs',
+				class          => 'form-select',
+				multiple       => undef,
+				size           => 15 =%>
 		</div>
 	</div>
 	<div class="d-flex gap-2">
diff --git a/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep b/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep
index f1e5f25f76..326660290c 100644
--- a/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/manage_location_form.html.ep
@@ -1,7 +1,7 @@
 <h2><%= maketext('Manage Locations') %> <%= $c->helpMacro('AdminManageLocations') %></h2>
 <p><strong><%= maketext('Currently defined locations are listed below.') %></strong></p>
 <%= form_for current_route, method => 'POST', begin =%>
-	% my @locationIDs = map  { $_->location_id } @$locations;
+	% my @locationIDs = map { $_->location_id } @$locations;
 	%
 	<%= $c->hidden_authen_fields =%>
 	<%= $c->hidden_fields('subDisplay') =%>
@@ -13,8 +13,9 @@
 			<div class="col-sm-4">
 				<div class="form-check">
 					<label class="form-check-label">
-						<%= radio_button manage_location_action => 'edit_location_form',
-							class => 'form-check-input' %>
+						<%= radio_button
+							manage_location_action => 'edit_location_form',
+							class                  => 'form-check-input' %>
 						<%= maketext('Edit Location:') %>
 					</label>
 				</div>
@@ -26,8 +27,9 @@
 			<div class="col-auto">
 				<div class="form-check">
 					<label class="form-check-label">
-						<%= radio_button manage_location_action => 'add_location_handler',
-							class => 'form-check-input' %>
+						<%= radio_button
+							manage_location_action => 'add_location_handler',
+							class                  => 'form-check-input' %>
 						<%= maketext('Create Location:') %>
 					</label>
 				</div>
@@ -40,25 +42,30 @@
 			</div>
 		</div>
 		<div class="row ms-sm-3 mb-2">
-			<%= label_for new_location_description => maketext('Location description:'),
-				class => 'col-sm-4 col-form-label' =%>
+			<%= label_for
+				new_location_description => maketext('Location description:'),
+				class                    => 'col-sm-4 col-form-label' =%>
 			<div class="col-sm-8">
-				<%= text_field new_location_description => '',
-					id => 'new_location_description', class => 'form-control' =%>
+				<%= text_field
+					new_location_description => '',
+					id                       => 'new_location_description',
+					class                    => 'form-control' =%>
 			</div>
 		</div>
 		<div class="row ms-sm-3 mb-2">
 			<div class="col">
 				<%= label_for new_location_addresses => maketext(
 					'Addresses for new location.  Enter one per line, as single IP addresses (e.g., 192.168.1.101), '
-						. 'address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):'
-				) =%>
+						. 'address masks (e.g., 192.168.1.0/24), or IP ranges (e.g., 192.168.1.101-192.168.1.150):') =%>
 			</div>
 		</div>
 		<div class="row ms-sm-3 mb-2">
 			<div class="col-7 col-xs-12">
-				<%= text_area new_location_addresses => '', id => 'new_location_addresses',
-					columns => 40, class => 'form-control' =%>
+				<%= text_area
+					new_location_addresses => '',
+					id                     => 'new_location_addresses',
+					columns                => 40,
+					class                  => 'form-control' =%>
 			</div>
 		</div>
 		% # Delete action
@@ -73,8 +80,9 @@
 			<div class="col-sm-4">
 				<div class="form-check">
 					<label class="form-check-label">
-						<%= radio_button manage_location_action => 'delete_location_handler',
-							class => 'form-check-input' %>
+						<%= radio_button
+							manage_location_action => 'delete_location_handler',
+							class                  => 'form-check-input' %>
 						<%= maketext('Delete location:') %>
 					</label>
 				</div>
@@ -82,11 +90,12 @@
 			<div class="col-sm-8">
 				<div class="row mb-1">
 					<div class="col-auto">
-						<%= select_field delete_location => [
+						<%= select_field
+							delete_location => [
 								[ maketext('no location') => '' ],
-								[ maketext('locations selected below') => 'selected_locations' ],
-								@locationIDs
-							], class => 'form-select' =%>
+								[ maketext('locations selected below') => 'selected_locations' ], @locationIDs
+							],
+							class => 'form-select' =%>
 					</div>
 				</div>
 				<div class="row">
@@ -121,14 +130,15 @@
 					% for (@$locations) {
 						<tr>
 							<td>
-								<%= check_box delete_selected => $_->location_id,
-									name  => 'delete_selected',
-									id    => $_->location_id . '_id',
-									class => 'form-check-input' =%>
+								<%= check_box
+									delete_selected => $_->location_id,
+									name            => 'delete_selected',
+									id              => $_->location_id . '_id',
+									class           => 'form-check-input' =%>
 							</td>
 							<td>
-								<%= label_for $_->location_id . '_id' =>
-									link_to $_->location_id => $c->systemLink(
+								<%= label_for $_->location_id
+									. '_id' => link_to $_->location_id => $c->systemLink(
 										url_for,
 										params => {
 											subDisplay             => 'manage_locations',
diff --git a/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep b/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep
index 1265bcfa13..35aea182b2 100644
--- a/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/manage_lti_course_map_form.html.ep
@@ -5,7 +5,9 @@
 	%
 	<div class="table-responsive mt-3">
 		<table class="table table-sm font-sm table-bordered caption-top font-sm align-middle w-auto">
-			<caption><%= maketext('LTI Course Map') %></caption>
+			<caption>
+				<%= maketext('LTI Course Map') %>
+			</caption>
 			<thead class="table-group-divider">
 				<tr>
 					<th class="text-nowrap"><%= maketext('Course ID') %></th>
@@ -19,37 +21,53 @@
 					<tr>
 						<td><%= $_ =%></td>
 						<td>
-							<%= text_field "$_-context-id" => $courseMap->{$_}, size => 40,
-								class => 'form-control form-control-sm d-inline w-auto',
+							<%= text_field
+								"$_-context-id"   => $courseMap->{$_},
+								size              => 40,
+								class             => 'form-control form-control-sm d-inline w-auto',
 								'aria-labelledby' => 'lms-context-id-header' =%>
 						</td>
 						<td class="text-center">
-							<%= $ltiConfigs->{$_}{LTIVersion} && $ltiConfigs->{$_}{LTIVersion} eq 'v1p1' ? '1.1'
-								: $ltiConfigs->{$_}{LTIVersion} && $ltiConfigs->{$_}{LTIVersion} eq 'v1p3' ? '1.3'
-								: maketext('Disabled') %>
+							<%= $ltiConfigs->{$_}{LTIVersion}
+								&& $ltiConfigs->{$_}{LTIVersion} eq 'v1p1' ? '1.1' : $ltiConfigs->{$_}{LTIVersion}
+								&& $ltiConfigs->{$_}{LTIVersion} eq 'v1p3' ? '1.3' : maketext('Disabled') %>
 						</td>
 						<td class="text-center">
 							% if ($ltiConfigs->{$_}{LTIVersion} && $ltiConfigs->{$_}{LTIVersion} =~ /^v1p[13]$/) {
-								<a href="#" role="button" data-bs-toggle="modal"
-									data-bs-target="#<%= $_ %>-config-modal">
+								<a
+									href="#"
+									role="button"
+									data-bs-toggle="modal"
+									data-bs-target="#<%= $_ %>-config-modal"
+								>
 									<i class="fa-solid fa-circle-question fa-xl"></i>
 									<span class="visually-hidden"><%= maketext('LTI Configuration') %></span>
 								</a>
-								<div class="modal fade" id="<%= $_ %>-config-modal" tabindex="-1"
-									aria-labelledby="<%= $_ %>-lti-config" aria-hidden="true">
+								<div
+									class="modal fade"
+									id="<%= $_ %>-config-modal"
+									tabindex="-1"
+									aria-labelledby="<%= $_ %>-lti-config"
+									aria-hidden="true"
+								>
 									<div class="modal-dialog modal-dialog-centered">
 										<div class="modal-content">
 											<div class="modal-header">
 												<h1 class="modal-title fs-6" id="<%= $_ %>-lti-config">
 													<%= maketext('LTI Configuration for [_1]', $_) %>
 												</h1>
-												<button type="button" class="btn-close" data-bs-dismiss="modal"
-													aria-label="<%= maketext('close') %>">
-												</button>
+												<button
+													type="button"
+													class="btn-close"
+													data-bs-dismiss="modal"
+													aria-label="<%= maketext('close') %>"
+												></button>
 											</div>
 											<div class="modal-body">
-												<table class="table table-sm table-light table-bordered
-													table-striped-columns mb-0">
+												<table
+													class="table table-sm table-light table-bordered
+													table-striped-columns mb-0"
+												>
 													<tbody>
 														% if ($ltiConfigs->{$_}{LTIVersion} eq 'v1p1') {
 															<tr>
diff --git a/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep b/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep
index e84af83c11..b5ad17c25d 100644
--- a/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/manage_otp_secrets_form.html.ep
@@ -1,5 +1,5 @@
 % content_for js => begin
-	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),          defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/CourseAdmin/manage_otp_secrets.js'), defer => undef =%>
 % end
 %
@@ -11,10 +11,13 @@
 	<div>
 		<ul class="nav nav-tabs mb-2" role="tablist">
 			% for my $tab ('single', 'multiple', 'reset') {
-				% my $tab_name = $tab eq 'single' ? maketext('Copy Single Secret')
-					% : $tab eq 'multiple' ? maketext('Copy Multiple Secrets') : maketext('Reset Secrets');
+				% my $tab_name =
+					% $tab eq 'single'     ? maketext('Copy Single Secret')
+					% : $tab eq 'multiple' ? maketext('Copy Multiple Secrets')
+					% :                      maketext('Reset Secrets');
 				<li class="nav-item" role="presentation">
-					<%= link_to $tab_name => "#$tab",
+					<%= link_to
+						$tab_name       => "#$tab",
 						class           => 'nav-link action-link' . ($active_tab eq $tab ? ' active' : ''),
 						id              => "$tab-tab",
 						data            => { action => $tab, bs_toggle => 'tab', bs_target => "#$tab" },
@@ -25,86 +28,107 @@
 			% }
 		</ul>
 		<div class="tab-content">
-			<div class="tab-pane fade mb-2<%= $active_tab eq 'single' ? ' show active' : '' %>"
-					id="single" role="tabpanel" aria-labelledby="single-tab">
+			<div
+				class="tab-pane fade mb-2<%= $active_tab eq 'single' ? ' show active' : '' %>"
+				id="single"
+				role="tabpanel"
+				aria-labelledby="single-tab"
+			>
 				<div class="row mb-3">
-					<%= label_for sourceSingleCourseID => maketext('Source Course ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						sourceSingleCourseID => maketext('Source Course ID'),
+						class                => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field sourceSingleCourseID => [
+						<%= select_field
+							sourceSingleCourseID => [
 								[
 									maketext('Select Course ID') => '',
 									disabled                     => undef,
 									selected                     => undef,
 								],
-								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] } @course_keys
+								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] }
+								@course_keys
 							],
 							id    => 'sourceSingleCourseID',
 							class => 'form-select' =%>
 					</div>
 				</div>
 				<div class="row mb-3">
-					<%= label_for sourceSingleUserID => maketext('Source User ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						sourceSingleUserID => maketext('Source User ID'),
+						class              => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field sourceSingleUserID => [
+						<%= select_field
+							sourceSingleUserID => [
 								[
 									maketext('Select User ID') => '',
 									disabled                   => undef,
 									selected                   => undef,
 								],
-								param('sourceSingleCourseID') ? @{ $courses->{param('sourceSingleCourseID')} } : ()
+								param('sourceSingleCourseID') ? @{ $courses->{ param('sourceSingleCourseID') } } : ()
 							],
 							id    => 'sourceSingleUserID',
 							class => 'form-select' =%>
 					</div>
 				</div>
 				<div class="row mb-3">
-					<%= label_for destSingleCourseID => maketext('Destination Course ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						destSingleCourseID => maketext('Destination Course ID'),
+						class              => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field destSingleCourseID => [
+						<%= select_field
+							destSingleCourseID => [
 								[
 									maketext('Select Course ID') => '',
 									disabled                     => undef,
 									selected                     => undef,
 								],
-								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] } @course_keys
+								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] }
+								@course_keys
 							],
 							id    => 'destSingleCourseID',
 							class => 'form-select' =%>
 					</div>
 				</div>
 				<div class="row mb-3">
-					<%= label_for destSingleUserID => maketext('Destination User ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						destSingleUserID => maketext('Destination User ID'),
+						class            => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field destSingleUserID => [
+						<%= select_field
+							destSingleUserID => [
 								[
 									maketext('Select User ID') => '',
 									disabled                   => undef,
 									selected                   => undef,
 								],
-								param('destSingleCourseID') ? @{ $courses->{param('destSingleCourseID')} } : ()
+								param('destSingleCourseID') ? @{ $courses->{ param('destSingleCourseID') } } : ()
 							],
 							id    => 'destSingleUserID',
 							class => 'form-select' =%>
 					</div>
 				</div>
 			</div>
-			<div class="tab-pane fade mb-2<%= $active_tab eq 'multiple' ? ' show active' : '' %>"
-					id="multiple" role="tabpanel" aria-labelledby="multiple-tab">
+			<div
+				class="tab-pane fade mb-2<%= $active_tab eq 'multiple' ? ' show active' : '' %>"
+				id="multiple"
+				role="tabpanel"
+				aria-labelledby="multiple-tab"
+			>
 				<div class="row mb-3">
-					<%= label_for sourceMultipleCourseID => maketext('Source Course ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						sourceMultipleCourseID => maketext('Source Course ID'),
+						class                  => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field sourceMultipleCourseID => [
+						<%= select_field
+							sourceMultipleCourseID => [
 								[
 									maketext('Select Course ID') => '',
 									disabled                     => undef,
 									selected                     => undef,
 								],
-								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] } @course_keys
+								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] }
+								@course_keys
 							],
 							id    => 'sourceMultipleCourseID',
 							class => 'form-select' =%>
@@ -112,15 +136,19 @@
 				</div>
 				<div class="row mb-3">
 					<div class="col-auto">
-						<%= label_for sourceMultipleUserID => maketext('Source User IDs'),
-							class => 'col-form-label fw-bold' =%>
-						<%= select_field sourceMultipleUserID => [
+						<%= label_for
+							sourceMultipleUserID => maketext('Source User IDs'),
+							class                => 'col-form-label fw-bold' =%>
+						<%= select_field
+							sourceMultipleUserID => [
 								[
 									maketext('Select User IDs') => '',
-									disabled                   => undef,
-									selected                   => undef,
+									disabled                    => undef,
+									selected                    => undef,
 								],
-								param('sourceMultipleCourseID') ? @{ $courses->{param('sourceMultipleCourseID')} } : ()
+								param('sourceMultipleCourseID')
+								? @{ $courses->{ param('sourceMultipleCourseID') } }
+								: ()
 							],
 							id       => 'sourceMultipleUserID',
 							class    => 'form-select',
@@ -128,13 +156,15 @@
 							size     => 10 =%>
 					</div>
 					<div class="col-auto">
-						<%= label_for destMultipleCourseID => maketext('Destination Course IDs'),
-							class => 'col-form-label fw-bold' =%>
-						<%= select_field destMultipleCourseID => [
+						<%= label_for
+							destMultipleCourseID => maketext('Destination Course IDs'),
+							class                => 'col-form-label fw-bold' =%>
+						<%= select_field
+							destMultipleCourseID => [
 								[
 									maketext('Select Course IDs') => '',
-									disabled                     => undef,
-									selected                     => undef,
+									disabled                      => undef,
+									selected                      => undef,
 								],
 								sort @course_keys
 							],
@@ -145,35 +175,44 @@
 					</div>
 				</div>
 			</div>
-			<div class="tab-pane fade mb-2<%= $active_tab eq 'reset' ? ' show active' : '' %>"
-					id="reset" role="tabpanel" aria-labelledby="reset-tab">
+			<div
+				class="tab-pane fade mb-2<%= $active_tab eq 'reset' ? ' show active' : '' %>"
+				id="reset"
+				role="tabpanel"
+				aria-labelledby="reset-tab"
+			>
 				<div class="row mb-3">
-					<%= label_for sourceResetCourseID => maketext('Source Course ID'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						sourceResetCourseID => maketext('Source Course ID'),
+						class               => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field sourceResetCourseID => [
+						<%= select_field
+							sourceResetCourseID => [
 								[
 									maketext('Select Course ID') => '',
 									disabled                     => undef,
 									selected                     => undef,
 								],
-								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] } @course_keys
+								map { [ $_ => $_, data => { users => join(':', @{ $courses->{$_} }) } ] }
+								@course_keys
 							],
 							id    => 'sourceResetCourseID',
 							class => 'form-select' =%>
 					</div>
 				</div>
 				<div class="row mb-3">
-					<%= label_for destResetUserID => maketext('Reset User IDs'),
-						class => 'col-auto col-form-label fw-bold' =%>
+					<%= label_for
+						destResetUserID => maketext('Reset User IDs'),
+						class           => 'col-auto col-form-label fw-bold' =%>
 					<div class="col-auto">
-						<%= select_field destResetUserID => [
+						<%= select_field
+							destResetUserID => [
 								[
 									maketext('Select User IDs') => '',
-									disabled                   => undef,
-									selected                   => undef,
+									disabled                    => undef,
+									selected                    => undef,
 								],
-								param('sourceResetCourseID') ? @{ $courses->{param('sourceResetCourseID')} } : ()
+								param('sourceResetCourseID') ? @{ $courses->{ param('sourceResetCourseID') } } : ()
 							],
 							id       => 'destResetUserID',
 							class    => 'form-select',
@@ -187,11 +226,11 @@
 	<%= $c->hidden_fields('subDisplay') =%>
 	<%= hidden_field action => $active_tab, id => 'current_action' =%>
 	<div class="mb-3">
-		<%= submit_button $active_tab eq 'single'
-			? maketext('Copy Single Secret')
-			: $active_tab eq 'multiple'
-				? maketext('Copy Multiple Secrets')
-				: maketext('Reset Secrets'),
-			id => 'take_action', name => 'take_action', class => 'btn btn-primary' =%>
+		<%= submit_button $active_tab eq 'single' ? maketext('Copy Single Secret')
+			: $active_tab eq 'multiple'       ? maketext('Copy Multiple Secrets')
+			: maketext('Reset Secrets'),
+			id    => 'take_action',
+			name  => 'take_action',
+			class => 'btn btn-primary' =%>
 	</div>
 <%= end %>
diff --git a/templates/ContentGenerator/CourseAdmin/registration_form.html.ep b/templates/ContentGenerator/CourseAdmin/registration_form.html.ep
index 8eb473eed7..5df75962d0 100644
--- a/templates/ContentGenerator/CourseAdmin/registration_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/registration_form.html.ep
@@ -1,8 +1,6 @@
-% if (
-	% -e "$ce->{courseDirs}{root}/registered_$ce->{WW_VERSION}"
+% if (-e "$ce->{courseDirs}{root}/registered_$ce->{WW_VERSION}"
 	% || param('register_site')
-	% || (defined param('subDisplay') && param('subDisplay') eq 'registration')
-% )
+	% || (defined param('subDisplay') && param('subDisplay') eq 'registration'))
 % {
 	% # Show registered note.
 	<div class="d-flex justify-content-center mb-2">REGISTERED for WeBWorK <%= $ce->{WW_VERSION} %></div>
@@ -15,14 +13,13 @@
 				using the join group link on the
 				<%= link_to 'group page' => $ce->{webworkURLs}{wwSecurityAnnounce}, target => '_blank' %>
 				which appears when you are logged in to a Google account <strong>or</strong> by sending an email using
-				<%= link_to 'this mailto link' =>
-						join('',
-							"mailto:$ce->{webworkSecListManagers}?subject=",
-							'Joining ww-security-announce',
-							'&body=',
-							"Server URL: $ce->{server_root_url}\n",
-							"WeBWorK version: $ce->{WW_VERSION}\n",
-							"Institution name: \n") %>
+				<%= link_to 'this mailto link' => join('',
+					"mailto:$ce->{webworkSecListManagers}?subject=",
+					'Joining ww-security-announce',
+					'&body=',
+					"Server URL: $ce->{server_root_url}\n",
+					"WeBWorK version: $ce->{WW_VERSION}\n",
+					"Institution name: \n") %>
 				This list will help us keep you updated about security issues and patches, and important related
 				announcements.
 			</p>
@@ -34,7 +31,9 @@
 			</p>
 			<div class="text-center">
 				<%= link_to 'https://github.com/sponsors/openwebwork',
-					class  => 'btn btn-secondary', target => '_blank', begin =%>
+					class  => 'btn btn-secondary',
+					target => '_blank',
+					begin =%>
 					<i class="fa-regular fa-heart"></i> Sponsor
 				<%= end =%>
 			</div>
@@ -43,21 +42,21 @@
 			<p>
 				We are often asked how many institutions are using WeBWorK and how many students are using WeBWorK.
 				Since WeBWorK is open source and can be freely downloaded from
-				<%= link_to $ce->{webworkURLs}{GitHub} => $ce->{webworkURLs}{GitHub}, target => '_blank' %>,
-				it is frequently difficult for us to give a reasonable answer to this question.
+				<%= link_to $ce->{webworkURLs}{GitHub} => $ce->{webworkURLs}{GitHub}, target => '_blank' %>, it is
+				frequently difficult for us to give a reasonable answer to this question.
 			</p>
 			<p>
 				You can help by
-				<%= link_to 'registering your current version of WeBWorK' => $ce->{webworkURLs}{serverRegForm},
-					target => '_blank' %>.
+				<%= link_to
+					'registering your current version of WeBWorK' => $ce->{webworkURLs}{serverRegForm},
+					target                                        => '_blank' %>.
 				Please complete the Google form as best you can and submit your answers to the WeBWorK Project team. It
-				takes just 2-3 minutes.  Thank you! The WeBWorK Project
+				takes just 2-3 minutes. Thank you! The WeBWorK Project
 			</p>
 			<p>
 				Eventually your site will be listed along with all of the others on the
 				<%= link_to 'site map' => $ce->{webworkURLs}{SiteMap}, target => '_blank' %>
-				on the main
-				<%= link_to 'WeBWorK Wiki' => $ce->{webworkURLs}{WikiMain}, target => '_blank' %>.
+				on the main <%= link_to 'WeBWorK Wiki' => $ce->{webworkURLs}{WikiMain}, target => '_blank' %>.
 			</p>
 			<hr>
 			<p>You can hide this "registration" banner for the future by clicking the button below.</p>
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep
index 2a1ff2e7e6..b44a7018d5 100644
--- a/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_confirm.html.ep
@@ -6,38 +6,27 @@
 		<p class="<%= $_->[1] ? 'text-success' : 'text-danger' %> fw-bold my-0"><%= $_->[0] %></p>
 	% }
 % }
-% my (
-	% $all_tables_ok,
-	% $extra_database_tables,
-	% $extra_database_fields,
-	% $rebuild_table_indexes,
-	% $incorrect_type_database_fields,
-	% $db_report
-% ) = $c->formatReportOnDatabaseTables($dbStatus);
+% my ($all_tables_ok, $extra_database_tables, $extra_database_fields, $rebuild_table_indexes,
+	% $incorrect_type_database_fields, $db_report)
+	% = $c->formatReportOnDatabaseTables($dbStatus);
 <%= $db_report =%>
 % if ($extra_database_tables) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database tables which are not defined in the schema.  '
-				. 'These can be deleted when upgrading the course.'
-		) =%>
+		<%= maketext('There are extra database tables which are not defined in the schema.  '
+				. 'These can be deleted when upgrading the course.') =%>
 	</p>
 % }
 % if ($extra_database_fields) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database fields which are not defined in the schema for at least one table.  '
-				. 'They can be removed when upgrading the course.'
-		) =%>
+		<%= maketext('There are extra database fields which are not defined in the schema for at least one table.  '
+				. 'They can be removed when upgrading the course.') =%>
 	</p>
 % }
 % if ($rebuild_table_indexes) {
 	<p class="text-danger fw-bold">
-		<%= maketext(
-			'There are extra database fields which are not defined in the schema and were part of the key '
+		<%= maketext('There are extra database fields which are not defined in the schema and were part of the key '
 				. 'for at least one table. These fields need to be deleted and the table indexes need to be rebuilt. '
-				. 'This will be done when upgrading the course.'
-		) =%>
+				. 'This will be done when upgrading the course.') =%>
 	</p>
 % }
 % if ($incorrect_type_database_fields) {
@@ -46,8 +35,7 @@
 			'There are database fields that do not have the same type as the field defined in the schema for '
 				. 'at least one table. The types of these fields can be changed when upgrading the course. '
 				. 'Make sure that you archive the course before doing that, since changing the type of a '
-				. 'field can corrupt the table.'
-		) =%>
+				. 'field can corrupt the table.') =%>
 	</p>
 % }
 % if (!$all_tables_ok) {
@@ -102,8 +90,9 @@
 			rename_newCourseID_checkbox rename_newCourseInstitution_checkbox rename_newCourseTitle_checkbox)
 	) =%>
 	<%= hidden_field rename_oldCourseTitle => $rename_oldCourseTitle, id => 'hidden_rename_oldCourseTitle' =%>
-	<%= hidden_field rename_oldCourseInstitution => $rename_oldCourseInstitution,
-		id => 'hidden_rename_oldCourseInstitution' =%>
+	<%= hidden_field
+		rename_oldCourseInstitution => $rename_oldCourseInstitution,
+		id                          => 'hidden_rename_oldCourseInstitution' =%>
 	%
 	% if ($all_tables_ok && $directories_ok && $links_ok) {
 		% # No missing tables, missing fields, missing directories, or missing/bad links
@@ -117,9 +106,11 @@
 			% }
 			<div class="d-flex justify-content-center gap-2">
 				<%= submit_button maketext(q{Don't Rename}),
-					name => 'decline_rename_course', class => 'btn btn-primary' =%>
+					name  => 'decline_rename_course',
+					class => 'btn btn-primary' =%>
 				<%= submit_button maketext('Rename'),
-					name => 'confirm_rename_course', class => 'btn btn-primary' =%>
+					name  => 'confirm_rename_course',
+					class => 'btn btn-primary' =%>
 			</div>
 		</div>
 	% } else {
@@ -130,11 +121,13 @@
 		% }
 		<div class="d-flex justify-content-center gap-2">
 			<%= submit_button maketext(q{Don't Rename}),
-				name => 'decline_rename_course', class => 'btn btn-primary' =%>
+				name  => 'decline_rename_course',
+				class => 'btn btn-primary' =%>
 			<%= submit_button $all_tables_ok
-					? maketext('Attempt to upgrade directories and links')
-					: maketext('Upgrade Course Tables'),
-				name => 'upgrade_course_tables', class => 'btn btn-primary' =%>
+				? maketext('Attempt to upgrade directories and links')
+				: maketext('Upgrade Course Tables'),
+				name  => 'upgrade_course_tables',
+				class => 'btn btn-primary' =%>
 		</div>
 	% }
 <% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep
index c498ccf0f1..775061fc61 100644
--- a/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_confirm_short.html.ep
@@ -7,8 +7,9 @@
 			rename_newCourseID_checkbox rename_newCourseInstitution_checkbox rename_newCourseTitle_checkbox/
 	) =%>
 	<%= hidden_field rename_oldCourseTitle => $rename_oldCourseTitle, id => 'hidden_rename_oldCourseTitle' =%>
-	<%= hidden_field rename_oldCourseInstitution => $rename_oldCourseInstitution,
-		id => 'hidden_rename_oldCourseInstitution' =%>
+	<%= hidden_field
+		rename_oldCourseInstitution => $rename_oldCourseInstitution,
+		id                          => 'hidden_rename_oldCourseInstitution' =%>
 	%
 	<div class="text-start">
 		<hr>
@@ -22,8 +23,8 @@
 		<hr>
 		<div class="d-flex justify-content-center gap-2">
 			<%= submit_button maketext(q{Don't make changes}),
-					name  => 'decline_retitle_course',
-					class => 'btn btn-primary' =%>
+				name  => 'decline_retitle_course',
+				class => 'btn btn-primary' =%>
 			<%= submit_button maketext('Make changes'), name => 'confirm_retitle_course', class => 'btn btn-primary' =%>
 		</div>
 	</div>
diff --git a/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep
index 131d946399..a46e3c5b64 100644
--- a/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/rename_course_form.html.ep
@@ -13,18 +13,19 @@
 			<%= maketext(
 				'Select a course to rename.  The courseID is used in the url and can only contain alphanumeric '
 					. 'characters and underscores. The course title appears on the course home page and can be any '
-					. 'string.'
-			) =%>
+					. 'string.') =%>
 		</p>
 		<div class="col-lg-9 col-md-11">
 			<div class="row mb-2">
-				<%= label_for rename_oldCourseID => maketext('Course ID:'),
-					class => 'col-lg-3 col-md-4 pe-0 col-form-label fw-bold' =%>
+				<%= label_for
+					rename_oldCourseID => maketext('Course ID:'),
+					class              => 'col-lg-3 col-md-4 pe-0 col-form-label fw-bold' =%>
 				<div class="col-lg-9 col-md-8">
-					<%= select_field rename_oldCourseID => [ map { [ $_ => $_ ] } @courseIDs ],
-						class    => 'form-select',
-						size     => 10,
-						id       => 'rename_oldCourseID' =%>
+					<%= select_field
+						rename_oldCourseID => [ map { [ $_ => $_ ] } @courseIDs ],
+						class              => 'form-select',
+						size               => 10,
+						id                 => 'rename_oldCourseID' =%>
 				</div>
 			</div>
 			<div class="row mb-2 align-items-center">
@@ -37,8 +38,10 @@
 					</div>
 				</div>
 				<div class="col-lg-9 col-md-8">
-					<%= text_field rename_newCourseID => '',
-						class => 'form-control', 'aria-labelledby' => 'rename_newCourseID_label' =%>
+					<%= text_field
+						rename_newCourseID => '',
+						class              => 'form-control',
+						'aria-labelledby'  => 'rename_newCourseID_label' =%>
 				</div>
 			</div>
 			<div class="row mb-2 align-items-center">
@@ -51,8 +54,10 @@
 					</div>
 				</div>
 				<div class="col-lg-9 col-md-8">
-					<%= text_field rename_newCourseTitle => '',
-						class => 'form-control', 'aria-labelledby' => 'rename_newCourseTitle_label' =%>
+					<%= text_field
+						rename_newCourseTitle => '',
+						class                 => 'form-control',
+						'aria-labelledby'     => 'rename_newCourseTitle_label' =%>
 				</div>
 			</div>
 			<div class="row mb-2 align-items-center">
@@ -65,8 +70,10 @@
 					</div>
 				</div>
 				<div class="col-lg-9 col-md-8">
-					<%= text_field rename_newCourseInstitution => '',
-						class => 'form-control', 'aria-labelledby' => 'rename_newCourseInstitution_label' =%>
+					<%= text_field
+						rename_newCourseInstitution => '',
+						class                       => 'form-control',
+						'aria-labelledby'           => 'rename_newCourseInstitution_label' =%>
 				</div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep
index 7e936e6216..e322cbddf9 100644
--- a/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/reset_otp_secrets_confirm.html.ep
@@ -20,7 +20,7 @@
 						<td>
 							<%= $row->{user} %>
 							% if ($row->{message}) {
-								<br/>(<%= $row->{message} %>)
+								<br>(<%= $row->{message} %>)
 							% }
 						</td>
 					</tr>
diff --git a/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep
index 8568088bf3..b49f30ae9e 100644
--- a/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/unarchive_course_confirm.html.ep
@@ -1,8 +1,9 @@
 <h2><%= maketext('Unarchive Course') %> <%= $c->helpMacro('AdminUnarchiveCourse') %></h2>
 <%= form_for current_route, method => 'POST', begin =%>
 	<div class="row mb-2">
-		<%= label_for new_courseID => maketext('Unarchive [_1] to course:', $unarchive_courseID),
-			class => 'col-auto col-form-label' =%>
+		<%= label_for
+			new_courseID => maketext('Unarchive [_1] to course:', $unarchive_courseID),
+			class        => 'col-auto col-form-label' =%>
 		<div class="col-auto">
 			<input type="text" name="new_courseID" id="new_courseID" value="<%= $courseID %>" class="form-control">
 		</div>
@@ -12,7 +13,7 @@
 			<div class="form-check">
 				<label class="form-check-label" id="clean_up_course">
 					<%= maketext('Clean course after unarchiving (remove student users, scoring files, log files, '
-						. 'temporary edited files)') =%>
+							. 'temporary edited files)') =%>
 					<%= check_box clean_up_course => 1, class => 'form-check-input' =%>
 				</label>
 			</div>
@@ -22,7 +23,8 @@
 	<%= $c->hidden_fields(qw(subDisplay unarchive_courseID create_newCourseID)) =%>
 	<div class="d-flex justify-content-center gap-2">
 		<%= submit_button maketext(q{Don't Unarchive}),
-			name => 'decline_unarchive_course', class => 'btn btn-primary' =%>
+			name  => 'decline_unarchive_course',
+			class => 'btn btn-primary' =%>
 		<%= submit_button maketext('Unarchive'), name => 'confirm_unarchive_course', class => 'btn btn-primary' =%>
 	</div>
 <% end =%>
diff --git a/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep
index d1e8082fb2..b42250fbd1 100644
--- a/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/unarchive_course_form.html.ep
@@ -4,7 +4,7 @@
 %
 % # Find courses which have been archived.
 % my %courseArchives = listArchivedCourses($ce);
-% my @courseIDs    = sort { lc($a) cmp lc($b) } keys %courseArchives;
+% my @courseIDs      = sort { lc($a) cmp lc($b) } keys %courseArchives;
 %
 % if (@courseIDs) {
 	<%= form_for current_route, method => 'POST', begin =%>
@@ -15,29 +15,29 @@
 		%
 		<div class="col-lg-9 col-md-11">
 			<div class="row mb-2">
-				<%= label_for 'unarchive_courseID' => maketext('Course ID:'),
-					class => 'col-md-2 pe-0 col-form-label fw-bold' =%>
+				<%= label_for
+					'unarchive_courseID' => maketext('Course ID:'),
+					class                => 'col-md-2 pe-0 col-form-label fw-bold' =%>
 				<div class="col-lg-9 col-md-8">
 					<%= select_field
-						unarchive_courseID => [
-							map { [ "$_ ($courseArchives{$_}{size})" => $courseArchives{$_}{filename} ] } @courseIDs
-						],
+						unarchive_courseID =>
+						[ map { [ "$_ ($courseArchives{$_}{size})" => $courseArchives{$_}{filename} ] } @courseIDs ],
 						id    => 'unarchive_courseID',
 						class => 'form-select',
-						size  => 10
-					=%>
+						size  => 10 =%>
 				</div>
 			</div>
 			<div class="row mb-2 align-items-center">
-				<%= label_for new_courseID => maketext('New ID:'),
-					class => 'col-md-2 pe-0 col-form-label fw-bold' =%>
+				<%= label_for
+					new_courseID => maketext('New ID:'),
+					class        => 'col-md-2 pe-0 col-form-label fw-bold' =%>
 				<div class="col-lg-9 col-md-8">
-					<%= text_field new_courseID => '',
-						id        => 'new_courseID',
-						size      => 25,
-						maxlength => $ce->{maxCourseIdLength},
-						class     => 'col-sm-8 form-control'
-					=%>
+					<%= text_field
+						new_courseID => '',
+						id           => 'new_courseID',
+						size         => 25,
+						maxlength    => $ce->{maxCourseIdLength},
+						class        => 'col-sm-8 form-control' =%>
 				</div>
 			</div>
 			<div class="row mb-2">
@@ -46,7 +46,7 @@
 						<%= check_box clean_up_course => 1, class => 'form-check-input', id => 'clean_up_course' %>
 						<label for="clean_up_course" class="form-check-label" id="clean_up_course">
 							<%= maketext('Clean course after unarchiving '
-								. '(remove student users, scoring files, log files, temporary edited files)') %>
+									. '(remove student users, scoring files, log files, temporary edited files)') %>
 						</label>
 					</div>
 				</div>
diff --git a/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep b/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep
index fd1ed16e61..6777134195 100644
--- a/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/upgrade_course_confirm.html.ep
@@ -4,8 +4,12 @@
 		% if ($extra_database_tables_exist) {
 			<div class="form-check">
 				<label class="form-check-label">
-					<input type="checkbox" value="on" class="select-all form-check-input"
-						data-select-group="delete_tableIDs">
+					<input
+						type="checkbox"
+						value="on"
+						class="select-all form-check-input"
+						data-select-group="delete_tableIDs"
+					>
 					<%= maketext('Select/unselect all tables missing in schema for deletion.') %>
 				</label>
 			</div>
@@ -13,8 +17,12 @@
 		% if ($extra_database_fields_exist) {
 			<div class="form-check">
 				<label class="form-check-label">
-					<input type="checkbox" value="on" class="select-all form-check-input"
-						data-select-group="delete_fieldIDs">
+					<input
+						type="checkbox"
+						value="on"
+						class="select-all form-check-input"
+						data-select-group="delete_fieldIDs"
+					>
 					<%= maketext('Select/unselect all fields missing in schema for deletion.') %>
 				</label>
 			</div>
@@ -22,8 +30,12 @@
 		% if ($incorrect_type_database_fields_exist) {
 			<div class="form-check">
 				<label class="form-check-label">
-					<input type="checkbox" value="on" class="select-all form-check-input"
-						data-select-group="fix_type_fieldIDs">
+					<input
+						type="checkbox"
+						value="on"
+						class="select-all form-check-input"
+						data-select-group="fix_type_fieldIDs"
+					>
 					<%= maketext('Select/unselect all fields with incorrect type.') %>
 				</label>
 			</div>
diff --git a/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep b/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep
index f742766ce3..0479361152 100644
--- a/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep
+++ b/templates/ContentGenerator/CourseAdmin/upgrade_course_form.html.ep
@@ -1,6 +1,6 @@
 % use WeBWorK::Utils::CourseDBIntegrityCheck;
 % use WeBWorK::Utils::CourseDirectoryIntegrityCheck qw(checkCourseDirectories checkCourseLinks);
-% use WeBWorK::Utils::CourseManagement qw(listCourses);
+% use WeBWorK::Utils::CourseManagement              qw(listCourses);
 % use WeBWorK::CourseEnvironment;
 %
 % my @courseIDs = sort { lc($a) cmp lc($b) } listCourses($ce);
@@ -36,10 +36,15 @@
 			<li class="align-items-center">
 				% if (!$tables_ok || !$directories_ok || !$links_ok) {
 					<div class="form-check form-check-inline me-0">
-						<%= check_box upgrade_courseIDs => $courseID, name => 'upgrade_courseIDs',
-							id => "upgrade_courseIDs_$courseID", checked => undef, class => 'form-check-input' %>
-						<%= label_for "upgrade_courseIDs_$courseID" => maketext('Upgrade'),
-							class => 'form-check-label' =%>
+						<%= check_box
+							upgrade_courseIDs => $courseID,
+							name              => 'upgrade_courseIDs',
+							id                => "upgrade_courseIDs_$courseID",
+							checked           => undef,
+							class             => 'form-check-input' %>
+						<%= label_for
+							"upgrade_courseIDs_$courseID" => maketext('Upgrade'),
+							class                         => 'form-check-label' =%>
 					</div>
 				% }
 				<%= link_to $courseID => 'set_list' => { courseID => $courseID } =%><span>:</span>
diff --git a/templates/ContentGenerator/EquationDisplay.html.ep b/templates/ContentGenerator/EquationDisplay.html.ep
index 21d09e37b4..9046b12628 100644
--- a/templates/ContentGenerator/EquationDisplay.html.ep
+++ b/templates/ContentGenerator/EquationDisplay.html.ep
@@ -3,7 +3,11 @@
 <p><%== $typesetStr %></p>
 <%= form_for current_route, method => 'POST', begin =%>
 	<%= $c->hidden_authen_fields =%>
-	<%= text_area eq => '', class => 'form-control mb-3', placeholder => 'Enter equation here',
-		cols => 40, rows => 5 =%>
+	<%= text_area
+		eq          => '',
+		class       => 'form-control mb-3',
+		placeholder => 'Enter equation here',
+		cols        => 40,
+		rows        => 5 =%>
 	<%= submit_button 'typeset', class => 'btn btn-primary' =%>
 <% end =%>
diff --git a/templates/ContentGenerator/Feedback.html.ep b/templates/ContentGenerator/Feedback.html.ep
index e046a52863..aebbaa7010 100644
--- a/templates/ContentGenerator/Feedback.html.ep
+++ b/templates/ContentGenerator/Feedback.html.ep
@@ -32,22 +32,25 @@
 			<%= maketext(
 				'Use this form to ask your instructor a question, to report a problem with the WeBWorK system, or '
 					. 'to report an error in a problem you are attempting. Along with your message, additional '
-					. 'information about the state of the system will be included.'
-			) =%>
+					. 'information about the state of the system will be included.') =%>
 		</div>
 		<div class="row mb-3">
 			<%= label_for 'from', class => 'col-form-label col-auto', begin =%><b><%= maketext('From:') %></b><% end =%>
 			<div class="col-auto">
-				<%= email_field from => $user_email_address, class => 'form-control', size => 40, id => 'from',
+				<%= email_field
+					from  => $user_email_address,
+					class => 'form-control',
+					size  => 40,
+					id    => 'from',
 					$user_email_address
-						? (disabled => undef, readonly => undef)
-						: (
-							required       => undef,
-							placeholder    => 'Email address',
-							autocorrect    => 'off',
-							autocapitalize => 'off',
-							pattern        => '^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`~\\-]+@[a-zA-Z0-9\\-]+\\.[a-zA-Z0-9.\\-]+$'
-						) =%>
+					? (disabled => undef, readonly => undef)
+					: (
+						required       => undef,
+						placeholder    => 'Email address',
+						autocorrect    => 'off',
+						autocapitalize => 'off',
+						pattern        => '^[a-zA-Z0-9.!#$%&\'*+\\/=?^_`~\\-]+@[a-zA-Z0-9\\-]+\\.[a-zA-Z0-9.\\-]+$'
+					) =%>
 			</div>
 		</div>
 		% if (stash 'send_error') {
@@ -55,8 +58,13 @@
 		% }
 		<div class="mb-3">
 			<%= label_for 'feedback', class => 'form-label', begin =%><b><%= maketext('E-mail:') %></b><% end =%>
-			<%= text_area feedback => '', id => 'feedback', rows => '20', class => 'form-control',
-				placeholder => maketext('Compose Email Message'), required => undef =%>
+			<%= text_area
+				feedback    => '',
+				id          => 'feedback',
+				rows        => '20',
+				class       => 'form-control',
+				placeholder => maketext('Compose Email Message'),
+				required    => undef =%>
 		</div>
 		% # Attachment
 		<div class="row mb-3">
@@ -64,7 +72,9 @@
 				<b><%= maketext('Attachment:') %></b>
 			<%= end %>
 			<div class="col-auto">
-				<%= file_field 'attachment', id => 'attachment', class => 'form-control',
+				<%= file_field 'attachment',
+					id     => 'attachment',
+					class  => 'form-control',
 					accept => 'image/*,application/pdf,application/zip,text/plain,text/csv' =%>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Feedback/feedback_email.html.ep b/templates/ContentGenerator/Feedback/feedback_email.html.ep
index 667e2fb5df..fb263e2bd5 100644
--- a/templates/ContentGenerator/Feedback/feedback_email.html.ep
+++ b/templates/ContentGenerator/Feedback/feedback_email.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(decodeAnswers);
+% use WeBWorK::Utils       qw(decodeAnswers);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
 % my $yes = maketext('yes');
@@ -7,11 +7,15 @@
 <html>
 	<body>
 		<p>
-			<%== maketext('Message from [_1] ([_2]) via WeBWorK at [_3] (sent from [_4]).',
-				$user->full_name, $user->user_id, $ce->{institutionName},
-				$problem ? link_to(format_set_name_display($set->set_id) . ', #' . $problem->problem_id, $emailableURL)
-				: $set   ? link_to(format_set_name_display($set->set_id), $emailableURL)
-				:          link_to('this page', $emailableURL)
+			<%== maketext(
+				'Message from [_1] ([_2]) via WeBWorK at [_3] (sent from [_4]).',
+				$user->full_name,
+				$user->user_id,
+				$ce->{institutionName},
+				$problem
+				? link_to(format_set_name_display($set->set_id) . ', #' . $problem->problem_id, $emailableURL)
+				: $set ? link_to(format_set_name_display($set->set_id), $emailableURL)
+				:        link_to('this page',                           $emailableURL)
 			) =%>
 		</p>
 		% if ($numRecipients > 1) {
@@ -31,16 +35,25 @@
 		% if ($problem && $verbosity >= 1) {
 			<table style="border-collapse: collapse; margin-bottom: 1rem">
 				<thead>
-					<tr><th style="text-align: left; padding: 0.25rem; border: 1px solid black;
-						background-color: lightgray" colspan="2"><%= maketext('Data about the problem') %></th></tr>
+					<tr>
+						<th
+							style="text-align: left; padding: 0.25rem; border: 1px solid black;
+						background-color: lightgray"
+							colspan="2"
+						>
+							<%= maketext('Data about the problem') %>
+						</th>
+					</tr>
 				</thead>
 				<tbody>
 					% my @rows = (
-						% [ maketext('Problem ID'),         $problem->problem_id ],
-						% [ maketext('Source file'),        $problem->source_file ],
-						% [ maketext('Value'),              $problem->value ],
-						% [ maketext('Max attempts'),
-							% $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts ],
+						% [ maketext('Problem ID'),  $problem->problem_id ],
+						% [ maketext('Source file'), $problem->source_file ],
+						% [ maketext('Value'),       $problem->value ],
+						% [
+							% maketext('Max attempts'),
+							% $problem->max_attempts == -1 ? 'unlimited' : $problem->max_attempts
+						% ],
 						% [ maketext('Random seed'),        $problem->problem_seed ],
 						% [ maketext('Status'),             $problem->status ],
 						% [ maketext('Attempted'),          $problem->attempted ? $yes : $no ],
@@ -83,8 +96,15 @@
 		% if ($set && $verbosity >= 1) {
 			<table style="border-collapse: collapse; margin-bottom: 1rem">
 				<thead>
-					<tr><th style="text-align: left; padding: 0.25rem; border: 1px solid black;
-						background-color: lightgray" colspan="2"><%= maketext('Data about the assignment') %></th></tr>
+					<tr>
+						<th
+							style="text-align: left; padding: 0.25rem; border: 1px solid black;
+						background-color: lightgray"
+							colspan="2"
+						>
+							<%= maketext('Data about the assignment') %>
+						</th>
+					</tr>
 				</thead>
 				<tbody>
 					% my @rows = (
@@ -98,15 +118,18 @@
 						% [ maketext('Assignment type'),      $set->assignment_type ]
 					% );
 					% if ($set->assignment_type =~ /gateway/) {
-						% push @rows, (
-							% [ maketext('Attempts per version'),      $set->attempts_per_version ],
-							% [ maketext('Time interval'),             $set->time_interval ],
-							% [ maketext('Versions per interval'),     $set->versions_per_interval ],
-							% [ maketext('Version time limit'),        $set->version_time_limit ],
-							% [ maketext('Version creation time'),     $c->formatDateTime($set->version_creation_time) ],
-							% [ maketext('Problem randorder'),         $set->problem_randorder ],
-							% [ maketext('Version last attempt time'), $set->version_last_attempt_time ]
-						% );
+						% push @rows,
+							% (
+								% [ maketext('Attempts per version'),  $set->attempts_per_version ],
+								% [ maketext('Time interval'),         $set->time_interval ],
+								% [ maketext('Versions per interval'), $set->versions_per_interval ],
+								% [ maketext('Version time limit'),    $set->version_time_limit ],
+								% [
+									% maketext('Version creation time'), $c->formatDateTime($set->version_creation_time)
+								% ],
+								% [ maketext('Problem randorder'),         $set->problem_randorder ],
+								% [ maketext('Version last attempt time'), $set->version_last_attempt_time ]
+							% );
 					% }
 					% for (@rows) {
 						<tr>
@@ -121,8 +144,11 @@
 			<table style="border-collapse: collapse; margin-bottom: 1rem">
 				<thead>
 					<tr>
-						<th style="text-align: left; padding: 0.25rem; border: 1px solid black;
-							background-color: lightgray" colspan="2">
+						<th
+							style="text-align: left; padding: 0.25rem; border: 1px solid black;
+							background-color: lightgray"
+							colspan="2"
+						>
 							<%= maketext('Data about the problem processor') =%>
 						</th>
 					</tr>
@@ -130,10 +156,10 @@
 				<tbody>
 					% my @rows = (
 						% [ maketext('Display Mode'),         param('displayMode') ],
-						% [ maketext('Show Old Answers'),     param('showOldAnswers') ? $yes : $no ],
+						% [ maketext('Show Old Answers'),     param('showOldAnswers')     ? $yes : $no ],
 						% [ maketext('Show Correct Answers'), param('showCorrectAnswers') ? $yes : $no ],
-						% [ maketext('Show Hints'),           param('showHints') ? $yes : $no ],
-						% [ maketext('Show Solutions'),       param('showSolutions') ? $yes : $no ]
+						% [ maketext('Show Hints'),           param('showHints')          ? $yes : $no ],
+						% [ maketext('Show Solutions'),       param('showSolutions')      ? $yes : $no ]
 					% );
 					% for (@rows) {
 						<tr>
@@ -148,8 +174,15 @@
 		% if ($user && $verbosity >= 1) {
 			<table style="border-collapse: collapse; margin-bottom: 1rem">
 				<thead>
-					<tr><th style="text-align: left; padding: 0.25rem; border: 1px solid black;
-						background-color: lightgray" colspan="2"><%= maketext('Data about the user') %></th></tr>
+					<tr>
+						<th
+							style="text-align: left; padding: 0.25rem; border: 1px solid black;
+						background-color: lightgray"
+							colspan="2"
+						>
+							<%= maketext('Data about the user') %>
+						</th>
+					</tr>
 				</thead>
 				<tbody>
 					% my @rows = (
@@ -157,19 +190,20 @@
 						% [ maketext('Name'),    $user->full_name ],
 						% [ maketext('Email'),   $user->email_address ]
 					% );
-					% unless ($ce->{blockStudentIDinFeedback}) { push @rows, ['Student ID', $user->student_id]; }
+					% unless ($ce->{blockStudentIDinFeedback}) { push @rows, [ 'Student ID', $user->student_id ]; }
 					% my $status_name = $ce->status_abbrev_to_name($user->status);
 					% my $status_string =
 						% defined $status_name
 						% ? "$status_name ('" . $user->status . q{')}
 						% : maketext('[_1] (unknown status abbreviation)', $user->status);
-					% push @rows, (
-						% [ maketext('Status'),     $status_string ],
-						% [ maketext('Section'),    $user->section ],
-						% [ maketext('Recitation'), $user->recitation ],
-						% [ maketext('Comment'),    $user->comment ],
-						% [ maketext('IP Address'), $remote_host ]
-					%);
+					% push @rows,
+						% (
+							% [ maketext('Status'),     $status_string ],
+							% [ maketext('Section'),    $user->section ],
+							% [ maketext('Recitation'), $user->recitation ],
+							% [ maketext('Comment'),    $user->comment ],
+							% [ maketext('IP Address'), $remote_host ]
+						% );
 					% for (@rows) {
 						<tr>
 							<th style="text-align: left; padding: 0.25rem"><%= $_->[0] %>:</th>
@@ -182,11 +216,20 @@
 		% if ($verbosity >= 2) {
 			<table style="border-collapse: collapse">
 				<thead>
-					<tr><th style="text-align: left; padding: 0.25rem; border: 1px solid black;
-						background-color: lightgray" colspan="2"><%= maketext('Data about the environment') %></th></tr>
+					<tr>
+						<th
+							style="text-align: left; padding: 0.25rem; border: 1px solid black;
+						background-color: lightgray"
+							colspan="2"
+						>
+							<%= maketext('Data about the environment') %>
+						</th>
+					</tr>
 				</thead>
 				<tbody>
-					<tr><td style="text-align: left; padding: 0.25rem"><pre><%= dumper($ce) %></pre></td></tr>
+					<tr>
+						<td style="text-align: left; padding: 0.25rem"><pre><%= dumper($ce) %></pre></td>
+					</tr>
 				</tbody>
 			</table>
 		% }
diff --git a/templates/ContentGenerator/ForgotPassword.html.ep b/templates/ContentGenerator/ForgotPassword.html.ep
index 2378e291cd..853925ec26 100644
--- a/templates/ContentGenerator/ForgotPassword.html.ep
+++ b/templates/ContentGenerator/ForgotPassword.html.ep
@@ -1,14 +1,14 @@
 <div class="row">
 	% if (!$ce->{password_reset_sender_email}) {
-			<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8">
-				<div class="alert alert-danger"><%= maketext('Password reset is not enabled for this course.') %></div>
-			</div>
+		<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8">
+			<div class="alert alert-danger"><%= maketext('Password reset is not enabled for this course.') %></div>
+		</div>
 	% } elsif (param('request_password_reset')) {
 		<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 my-3">
 			<div class="alert alert-info">
 				<%= maketext('If the username that was entered is valid, that user has a valid email address set, '
-					. 'and that user has permission to change their password, then a reset link has been emailed '
-					. 'to that address. That link will only be valid for the next 15 minutes.') %>
+						. 'and that user has permission to change their password, then a reset link has been emailed '
+						. 'to that address. That link will only be valid for the next 15 minutes.') %>
 			</div>
 			<%= link_to maketext('Login') => 'set_list', class => 'btn btn-primary' =%>
 		</div>
@@ -19,12 +19,18 @@
 		<%= form_for current_route, method => 'POST', begin =%>
 			<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 my-3">
 				<div class="form-floating mb-2">
-					<%= text_field user => '', required => undef, class => 'form-control', placeholder => '',
-						autocapitalize => 'none', spellcheck => 'false' =%>
+					<%= text_field
+						user           => '',
+						required       => undef,
+						class          => 'form-control',
+						placeholder    => '',
+						autocapitalize => 'none',
+						spellcheck     => 'false' =%>
 					<%= label_for uname => maketext('Username') =%>
 				</div>
 				<div class="submit-buttons-container">
-					<%= submit_button maketext('Request Password Reset'), name => 'request_password_reset',
+					<%= submit_button maketext('Request Password Reset'),
+						name  => 'request_password_reset',
 						class => 'btn btn-primary' =%>
 					<%= link_to maketext('Cancel') => 'set_list', class => 'btn btn-primary' =%>
 				</div>
diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
index 26a0e56c6c..682d81eee1 100644
--- a/templates/ContentGenerator/GatewayQuiz.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -1,5 +1,5 @@
-% use WeBWorK::Utils qw(wwRound getAssetURL);
-% use WeBWorK::Utils::DateTime qw(before after);
+% use WeBWorK::Utils                       qw(wwRound getAssetURL);
+% use WeBWorK::Utils::DateTime             qw(before after);
 % use WeBWorK::Utils::LanguageAndDirection qw(get_problem_lang_and_dir);
 % use WeBWorK::HTML::SingleProblemGrader;
 % use WeBWorK::AchievementEvaluator qw(checkForAchievements);
@@ -91,17 +91,15 @@
 		<div class="mb-2"><%= stash->{actingConfirmation} =%></div>
 		<div>
 			<%= link_to stash->{actingConfirmationButton} => $c->systemLink(
-					url_for,
-					params => { effectiveUser => $effectiveUserID, user => $userID, submit_for_student_ok => 1 }
+				url_for,
+				params => { effectiveUser => $effectiveUserID, user => $userID, submit_for_student_ok => 1 }
 				),
-				class => 'btn btn-primary'
-			=%>
+				class => 'btn btn-primary' =%>
 			<%= link_to maketext('Cancel') => $c->systemLink(
-					url_for('problem_list', setID => $setID =~ s/,v\d+$//r),
-					params => { effectiveUser => $effectiveUserID, user => $userID }
+				url_for('problem_list', setID => $setID =~ s/,v\d+$//r),
+				params => { effectiveUser => $effectiveUserID, user => $userID }
 				),
-				class => 'btn btn-primary'
-			=%>
+				class => 'btn btn-primary' =%>
 		</div>
 	</div>
 	%
@@ -162,12 +160,10 @@
 	</div>
 	%
 	% # Finally, if there is another recorded message, output that too.
-	% if (
-		% $c->{set}->attempts_per_version > 1
+	% if ($c->{set}->attempts_per_version > 1
 		% && $c->{attemptNumber} > 0
 		% && $c->{recordedScore} != $c->{attemptScore}
-		% && $c->{can}{showScore}
-	% )
+		% && $c->{can}{showScore})
 	% {
 		<div class="alert alert-warning p-1">
 			<%== maketext(
@@ -224,7 +220,8 @@
 	%
 	% # Print the timer if there is less than 24 hours left.
 	% if ($timeLeft < 86400) {
-		<%= tag('div',
+		<%= tag(
+			'div',
 			id    => 'gwTimer',
 			class => 'alert alert-warning p-1',
 			data  => {
@@ -235,7 +232,8 @@
 				grace_period    => $ce->{gatewayGracePeriod},
 				alert_title     => maketext('Test Time Notification'),
 				alert_three     => maketext(
-					'You have less than 90 seconds left to complete this assignment. You should finish it soon!'),
+					'You have less than 90 seconds left to complete this assignment. You should finish it soon!'
+				),
 				alert_two => ('<div>' . maketext('You have less than 45 seconds left!') . '</div>')
 					. (
 						($c->{set}->attempts_per_version > 1 && $c->{attemptNumber} > 0) ? ''
@@ -254,19 +252,17 @@
 	% }
 	%
 	% if ($timeLeft < 60 && $timeLeft > 0 && !$c->{can}{gradeUnsubmittedTest}
-			% && !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
+	% && !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
 		<div class="alert alert-danger d-inline-block mb-2 p-1">
 			<strong><%= maketext('You have less than 1 minute to complete this test.') %></strong>
 		</div>
 	% } elsif ($timeLeft <= 0 && !$c->{can}{gradeUnsubmittedTest} &&
-			% !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
+	% !$authz->hasPermissions($userID, 'record_answers_when_acting_as_student')) {
 		<div class="alert alert-danger d-inline-block mb-2 p-1">
 			<strong>
 				<%= maketext('You are out of time!')
-					. (
-						$c->{set}->attempts_per_version > 1
-						&& $c->{attemptNumber} > 0 ? '' : ' ' . maketext('Press "Grade Test" now!')
-					) =%>
+					. ($c->{set}->attempts_per_version > 1
+						&& $c->{attemptNumber} > 0 ? '' : ' ' . maketext('Press "Grade Test" now!')) =%>
 			</strong>
 		</div>
 	% }
@@ -312,19 +308,16 @@
 		<div class="alert alert-warning p-1">
 			<strong>
 				<%== maketext(
-						'Your recorded score on this test (version [_1]) is [_2]/[_3] ([_4]%).',
-						$setVersionID,
-						'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore}) . '</span>',
-						'<span id="test-total-possible">' . $c->{totalPossible} . '</span>',
-						'<span id="test-recorded-percent">'
-							. wwRound(0, 100 * $c->{recordedScore} / $c->{totalPossible})
-							. '</span>'
+					'Your recorded score on this test (version [_1]) is [_2]/[_3] ([_4]%).',
+					$setVersionID,
+					'<span id="test-recorded-score">' . wwRound(2, $c->{recordedScore}) . '</span>',
+					'<span id="test-total-possible">' . $c->{totalPossible} . '</span>',
+					'<span id="test-recorded-percent">'
+						. wwRound(0, 100 * $c->{recordedScore} / $c->{totalPossible})
+						. '</span>'
 					)
-					. (
-						$c->{exceededAllowedTime} && $c->{recordedScore} == 0
-						? ' ' . maketext('You exceeded the allowed time.')
-						: ''
-					) =%>
+					. ($c->{exceededAllowedTime}
+						&& $c->{recordedScore} == 0 ? ' ' . maketext('You exceeded the allowed time.') : '') =%>
 			</strong>
 			<br>
 		</div>
@@ -348,7 +341,7 @@
 			<div class="col-md-10 mb-1">
 				<div class="alert alert-info p-1 mb-0">
 					<%= maketext('The test (which is version [_1]) may no longer be submitted for a grade.',
-							$setVersionID)
+						$setVersionID)
 						. ($c->{can}{showScore} ? (' ' . maketext('You may still check your answers.')) : '') %>
 				</div>
 			</div>
@@ -377,8 +370,10 @@
 	<div class="gwProblem">
 		% if ($c->{set}->hide_work eq 'BeforeAnswerDate') {
 			<strong>
-				<%= maketext('Completed results for this assignment are not available until [_1].',
-					$c->formatDateTime($c->{set}->answer_date, $ce->{studentDateDisplayFormat})) %>
+				<%= maketext(
+					'Completed results for this assignment are not available until [_1].',
+					$c->formatDateTime($c->{set}->answer_date, $ce->{studentDateDisplayFormat})
+				) %>
 			</strong>
 		% } else {
 			<strong><%= maketext('Completed results for this assignment are not available.') %></strong>
@@ -392,7 +387,7 @@
 		<div class="row g-0">
 			<div class="col-12 alert alert-danger">
 				<%== maketext('<strong>Warning</strong>: There may be something wrong with a problem in this test. '
-					. 'Please inform your instructor including the warning messages below the problem.') =%>
+						. 'Please inform your instructor including the warning messages below the problem.') =%>
 			</div>
 		</div>
 	% }
@@ -419,15 +414,21 @@
 			% content_for 'gw-navigation-problem-row' => begin
 				<td class="problem">
 					% if ($i >= $startProb && $i <= $endProb) {
-						<%= link_to $pn => '#', class => 'problem-jump-link', data => { problem_number => $pn } =%>
+						<%= link_to
+							$pn   => '#',
+							class => 'problem-jump-link',
+							data  => { problem_number => $pn } =%>
 					% } else {
 						<%= $pn =%>
 					% }
 				</td>
 			% end
 			% content_for 'gw-navigation-score-row' => begin
-				<td class="score" data-problem-id="<%= $problems->[ $probOrder->[$i] ]->problem_id %>"
-					data-problem-value="<%= $problems->[ $probOrder->[$i] ]->value %>">
+				<td
+					class="score"
+					data-problem-id="<%= $problems->[ $probOrder->[$i] ]->problem_id %>"
+					data-problem-value="<%= $problems->[ $probOrder->[$i] ]->value %>"
+				>
 					% if ($c->{probStatus}[ $probOrder->[$i] ] == 1) {
 						&#128175;
 					% } else {
@@ -437,7 +438,9 @@
 			% end
 		% }
 		% content_for 'gw-navigation-cols' => begin
-			<colgroup><col class="header"></colgroup>
+			<colgroup>
+				<col class="header">
+			</colgroup>
 		% end
 		% if ($numProbPerPage && $numPages > 1) {
 			% content_for 'gw-navigation-cols' => begin
@@ -452,14 +455,19 @@
 			% end
 			% for my $i (1 .. $numPages) {
 				% content_for 'gw-navigation-pages' => begin
-					<td colspan="<%= $i == $numPages && (@$problem_numbers % $numProbPerPage)
-						? (@$problem_numbers % $numProbPerPage)
-						: $numProbPerPage %>"
-						class="<%= $i == $pageNumber ? 'page active' : 'page' %>">
+					<td
+						colspan="<%= $i == $numPages && (@$problem_numbers % $numProbPerPage)
+							? (@$problem_numbers % $numProbPerPage)
+							: $numProbPerPage %>"
+						class="<%= $i == $pageNumber ? 'page active' : 'page' %>"
+					>
 						% if ($i == $pageNumber) {
 							<%= $i =%>
 						% } else {
-							<%= link_to $i => '#', class => 'page-change-link', data => { page_number => $i } =%>
+							<%= link_to
+								$i    => '#',
+								class => 'page-change-link',
+								data  => { page_number => $i } =%>
 						% }
 					</td>
 				% end
@@ -485,15 +493,19 @@
 				<div class="submit-buttons-container mb-3">
 					% my $prevText = $numProbPerPage == 1 ? maketext('Previous Problem') : maketext('Previous Page');
 					% if ($pageNumber > 1) {
-						<%= link_to $prevText => '#',
-							class => 'btn btn-primary page-change-link', data => { page_number => $pageNumber - 1 } =%>
+						<%= link_to
+							$prevText => '#',
+							class     => 'btn btn-primary page-change-link',
+							data      => { page_number => $pageNumber - 1 } =%>
 					% } else {
 						<a class="btn btn-primary disabled" role="button" aria-disabled="true"><%= $prevText =%></a>
 					% }
 					% my $nextText = $numProbPerPage == 1 ? maketext('Next Problem') : maketext('Next Page');
 					% if ($pageNumber < $numPages) {
-						<%= link_to $nextText => '#',
-							class => 'btn btn-primary page-change-link', data => { page_number => $pageNumber + 1 } =%>
+						<%= link_to
+							$nextText => '#',
+							class     => 'btn btn-primary page-change-link',
+							data      => { page_number => $pageNumber + 1 } =%>
 					% } else {
 						<a class="btn btn-primary disabled" role="button" aria-disabled="true"><%= $nextText =%></a>
 					% }
@@ -501,7 +513,9 @@
 			% end
 		% } else {
 			% content_for 'gw-navigation-cols' => begin
-				<colgroup class="page"><% for (0 .. $#$pg_results) { =%><col class="problem"><% } =%></colgroup>
+				<colgroup class="page">
+					<% for (0 .. $#$pg_results) { =%><col class="problem"><% } =%>
+				</colgroup>
 			% end
 			% content_for 'gw-navigation-table-rows' => begin
 				<tr>
@@ -512,7 +526,10 @@
 		% }
 		% if ($c->{can}{showProblemScores} && $c->{set}->version_last_attempt_time) {
 			% content_for 'gw-navigation-table-rows' => begin
-				<tr><th><%= maketext('% Score:') %></th><%= content 'gw-navigation-score-row' =%></tr>
+				<tr>
+					<th><%= maketext('% Score:') %></th>
+					<%= content 'gw-navigation-score-row' =%>
+				</tr>
 			% end
 		% }
 		% my $jumpLinks = begin
@@ -536,23 +553,34 @@
 				%
 				% if ($c->{submitAnswers}) {
 					% if ($c->{scoreRecordedMessage}[ $probOrder->[$i] ] ne 'recorded') {
-						% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
-							% maketext('ANSWERS NOT RECORDED -- [_1]', $c->{scoreRecordedMessage}[ $probOrder->[$i] ])
+						% $recordMessage = tag(
+							% 'div',
+							% class => 'alert alert-danger d-inline-block mb-2 p-1',
+							% maketext(
+								% 'ANSWERS NOT RECORDED -- [_1]',
+								% $c->{scoreRecordedMessage}[ $probOrder->[$i] ]
+							% )
 						% );
 					% }
 					% $resultsTable = $c->attemptResults($pg);
 				% } elsif (param('showCorrectAnswers') && $c->{will}{showCorrectAnswers}) {
-					% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
+					% $recordMessage = tag(
+						% 'div',
+						% class => 'alert alert-danger d-inline-block mb-2 p-1',
 						% maketext('CORRECT ANSWERS SHOWN ONLY -- ANSWERS NOT RECORDED')
 					% );
 				% } elsif ($c->{will}{checkAnswers}) {
-					% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
+					% $recordMessage = tag(
+						% 'div',
+						% class => 'alert alert-danger d-inline-block mb-2 p-1',
 						% maketext('ANSWERS ONLY CHECKED -- ANSWERS NOT RECORDED')
 					% );
-					%
+				%
 					% $resultsTable = $c->attemptResults($pg);
 				% } elsif ($c->{previewAnswers}) {
-					% $recordMessage = tag('div', class => 'alert alert-danger d-inline-block mb-2 p-1',
+					% $recordMessage = tag(
+						% 'div',
+						% class => 'alert alert-danger d-inline-block mb-2 p-1',
 						% maketext('PREVIEW ONLY -- ANSWERS NOT RECORDED')
 					% );
 				% }
@@ -564,8 +592,9 @@
 					<h2 class="gw-problem-number"><%= maketext('Problem [_1].', $i + 1) %></h2>
 					<span class="problem-sub-header">
 						% if ($c->{can}{showTemplateIds}) {
-							<%= '('
-								. maketext('Template ID: [_1]', $problems->[ $probOrder->[$i] ]->problem_id) . ')' %>
+							<%=
+								'(' . maketext('Template ID: [_1]', $problems->[ $probOrder->[$i] ]->problem_id) . ')'
+							%>
 						% }
 						% my $problemValue = $problems->[ $probOrder->[$i] ]->value;
 						% if (defined $problemValue) {
@@ -574,7 +603,7 @@
 						% }
 						%
 						% # This uses the permission level and user id of the user assigned to the set.
-						% if ( $authz->hasPermissions($effectiveUserID, 'print_path_to_problem') )
+						% if ($authz->hasPermissions($effectiveUserID, 'print_path_to_problem'))
 						% {
 							<%= $problems->[ $probOrder->[$i] ]->source_file %>
 						% }
@@ -593,14 +622,17 @@
 					% if ($pg->{flags}{error_flag}) {
 						% stash->{briefErrorOutput} = 1;
 						<%= include 'ContentGenerator/Base/error_output',
-							error => $pg->{errors},
+							error   => $pg->{errors},
 							details => $pg->{body_text} =%>
 						%
 						% delete stash->{briefErrorOutput};
 					% } else {
-						<div class="problem-content text-dark col-lg-10" <%== get_problem_lang_and_dir(
-								$pg->{flags}, $ce->{perProblemLangAndDirSettingMode}, $ce->{language}
-							) %>  data-bs-theme="light">
+						<div
+							class="problem-content text-dark col-lg-10"
+							<%== get_problem_lang_and_dir($pg->{flags}, $ce->{perProblemLangAndDirSettingMode},
+								$ce->{language}) %>
+							data-bs-theme="light"
+						>
 							<%== $pg->{body_text} =%>
 						</div>
 					% }
@@ -613,8 +645,7 @@
 							<b><%= maketext('Note') %>:</b>
 							<i>
 								<%= maketext('The solution shown is an instructor preview and '
-									. 'will only be shown to students when answers are available.'
-								) =%>
+										. 'will only be shown to students when answers are available.') =%>
 							</i>
 						</p>
 					% }
@@ -625,20 +656,20 @@
 							% || $authz->hasPermissions($userID, 'view_hidden_work')
 						% )
 						% && !$c->can_showCorrectAnswersForAll($c->{set}, $c->{problem}, $c->{tmplSet})
-						% )
+					% )
 					% {
 						<p>
 							<b><%= maketext('Note') %>:</b>
 							<i>
 								<%= maketext('The correct answers shown in feedback are instructor previews and '
-									. 'will only be shown to students when answers are available.') =%>
+										. 'will only be shown to students when answers are available.') =%>
 							</i>
 						</p>
 					% }
 					%
 					<div class="text-end mb-2">
 						<%= link_to maketext('preview answers') => '#',
-							class => 'gateway-preview-btn btn btn-secondary',
+							class                               => 'gateway-preview-btn btn btn-secondary',
 							($numProbPerPage && $numPages > 1) ? (data => { page_number => $pageNumber }) : () =%>
 					</div>
 					%
@@ -658,8 +689,8 @@
 						debug_messages   => ref $pg->{debug_messages} eq 'ARRAY'   ? $pg->{debug_messages}   : [] =%>
 				</div>
 				% # Store the problem status for continued attempts recording.
-				<%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id}
-					=> $c->{probStatus}[ $probOrder->[$i] ] =%>
+				<%= hidden_field 'probstatus'
+					. $problems->[ $probOrder->[$i] ]{problem_id} => $c->{probStatus}[ $probOrder->[$i] ] =%>
 				%
 				<div class="gwDivider"></div>
 			% } else {
@@ -675,8 +706,8 @@
 					% }
 				% }
 				% # Store the problem status for continued attempts recording.
-				<%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id}
-					=> $c->{probStatus}[ $probOrder->[$i] ] %>
+				<%= hidden_field 'probstatus'
+					. $problems->[ $probOrder->[$i] ]{problem_id} => $c->{probStatus}[ $probOrder->[$i] ] %>
 			% }
 			%
 			% # If the user can check answers and a problem_data form parameter for
@@ -685,8 +716,9 @@
 				% $c->{can}{checkAnswers}
 				% && defined $c->param('problem_data_' . $problems->[ $probOrder->[$i] ]{problem_id})
 			% ) {
-				<%= hidden_field 'problem_data_' . $problems->[ $probOrder->[$i] ]{problem_id}
-					=> param('problem_data_' . $problems->[ $probOrder->[$i] ]{problem_id}) =%>
+				<%= hidden_field 'problem_data_'
+					. $problems->[ $probOrder->[$i] ]{problem_id} =>
+					param('problem_data_' . $problems->[ $probOrder->[$i] ]{problem_id}) =%>
 			% }
 		% }
 		%
@@ -696,15 +728,17 @@
 		<div class="submit-buttons-container col-12 mb-2">
 			<%= submit_button maketext('Preview Test'), name => 'previewAnswers', class => 'btn btn-primary mb-1' =%>
 			% if ($c->{can}{checkAnswersNextTime}
-					% && (!$c->{can}{recordAnswersNextTime} || $c->{can}{showProblemGrader})) {
+			% && (!$c->{can}{recordAnswersNextTime} || $c->{can}{showProblemGrader})) {
 				<%= submit_button maketext('Check Test'), name => 'checkAnswers', class => 'btn btn-primary mb-1' =%>
 			% }
 			% if ($c->{can}{recordAnswersNextTime}) {
-				<%= tag('input',
+				<%= tag(
+					'input',
 					type  => 'submit',
 					name  => 'submitAnswers',
 					value => $effectiveUserID ne $userID
-						? maketext('Grade Test for [_1]', $effectiveUserID) : maketext('Grade Test'),
+					? maketext('Grade Test for [_1]', $effectiveUserID)
+					: maketext('Grade Test'),
 					class => 'btn btn-primary mb-1',
 					$c->{set}->attempts_per_version
 					? (
@@ -726,17 +760,18 @@
 									. 'and you will not be able to continue to work this test version.'
 								)
 							: maketext(
-							'This is your only submission.  If you say yes, then your answers will be final, '
-								. 'and you will not be able to continue to work this test version.'
+								'This is your only submission.  If you say yes, then your answers will be final, '
+									. 'and you will not be able to continue to work this test version.'
 							),
 							# This is always a plural form. JavaScript replaces %d with the
 							# number of unanswered questions which will be greater than one.
 							unanswered_questions_message =>
 								maketext('There are [_1] problems with unanswered questions.', '%d'),
-							unanswered_question_message => maketext('There is a problem with unanswered questions.'),
+							unanswered_question_message =>
+								maketext('There is a problem with unanswered questions.'),
 							return_to_test_message => maketext(
 								'Are you sure you want to grade the test? '
-								. 'Select "No" if you would like to return to the test to enter more answers.'
+									. 'Select "No" if you would like to return to the test to enter more answers.'
 							)
 						}
 						)
@@ -750,7 +785,8 @@
 		%
 		% if ($c->{can}{showCorrectAnswers}) {
 			<div class="submit-buttons-container col-12 my-2">
-				<%= submit_button maketext('Show Correct Answers'), name => 'showCorrectAnswers',
+				<%= submit_button maketext('Show Correct Answers'),
+					name  => 'showCorrectAnswers',
 					class => 'btn btn-primary mb-1' =%>
 			</div>
 		% }
diff --git a/templates/ContentGenerator/GatewayQuiz/nav.html.ep b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
index 1f87ca7896..52f9a09b37 100644
--- a/templates/ContentGenerator/GatewayQuiz/nav.html.ep
+++ b/templates/ContentGenerator/GatewayQuiz/nav.html.ep
@@ -1,7 +1,7 @@
 % # Cap the number of tests shown to at most 200.
 % my $numAfter     = $#$userRecords - $currentTestIndex;
 % my $numBefore    = 200 - ($numAfter < 100 ? $numAfter : 100);
-% my $minTestIndex = $currentTestIndex < $numBefore      ? 0                   : $currentTestIndex - $numBefore;
+% my $minTestIndex = $currentTestIndex < $numBefore       ? 0                   : $currentTestIndex - $numBefore;
 % my $maxTestIndex = $minTestIndex + 200 < $#$userRecords ? $minTestIndex + 200 : $#$userRecords;
 %
 % my $setID = $c->{set}->set_id;
@@ -12,12 +12,12 @@
 			% if ($eUserID ne $userID) {
 				% if ($prevTest) {
 					<%= link_to $c->systemLink(
-							url_for('gateway_quiz', setID => "$setID,v$prevTest->{setVersion}"),
-							params => {
-								effectiveUser => $prevTest->user_id,
-								currentPage   => $pageNumber,
-								$filter ? (studentNavFilter => $filter) : ()
-							}
+						url_for('gateway_quiz', setID => "$setID,v$prevTest->{setVersion}"),
+						params => {
+							effectiveUser => $prevTest->user_id,
+							currentPage   => $pageNumber,
+							$filter ? (studentNavFilter => $filter) : ()
+						}
 						),
 						data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
 						title => "$prevTest->{displayName} (version $prevTest->{setVersion})",
@@ -30,21 +30,21 @@
 				% }
 			% }
 			<div class="btn-group student-nav-selector">
-				% my $buttonName =
-					% $eUserID ne $userID
+				% my $buttonName = $eUserID ne $userID
 					% ? maketext(
 						% '[_1] (version [_2])',
 						% $userRecords->[$currentTestIndex]{displayName},
 						% $userRecords->[$currentTestIndex]{setVersion}
-						% )
+					% )
 					% : maketext('Select a Test to Review');
-				<%= link_to $buttonName => '#',
+				<%= link_to
+					$buttonName     => '#',
 					id              => 'studentSelector',
 					class           => 'btn btn-primary dropdown-toggle',
 					role            => 'button',
 					data            => { bs_toggle => 'dropdown' },
 					'aria-expanded' => 'false' =%>
-				<ul class="dropdown-menu" role ="menu" aria-labelledby="studentSelector">
+				<ul class="dropdown-menu" role="menu" aria-labelledby="studentSelector">
 					% for (@$userRecords[ $minTestIndex .. $maxTestIndex ]) {
 						<li>
 							<%= link_to maketext('[_1] (version [_2])', $_->{displayName}, $_->{setVersion}) =>
@@ -57,9 +57,8 @@
 									}
 								),
 								tabindex => '-1',
-								class =>
-									join(' ', 'dropdown-item', $eUserID ne $userID && $_->{currentTest} ? 'active' : '')
-							=%>
+								class    =>
+								join(' ', 'dropdown-item', $eUserID ne $userID && $_->{currentTest} ? 'active' : '') =%>
 						</li>
 					% }
 				</ul>
@@ -67,14 +66,14 @@
 			% if ($eUserID ne $userID) {
 				% if ($nextTest) {
 					<%= link_to $c->systemLink(
-							url_for('gateway_quiz', setID => "$setID,v$nextTest->{setVersion}"),
-							params => {
-								effectiveUser => $nextTest->user_id,
-								currentPage   => $pageNumber,
-								$filter ? (studentNavFilter => $filter) : ()
-							}
+						url_for('gateway_quiz', setID => "$setID,v$nextTest->{setVersion}"),
+						params => {
+							effectiveUser => $nextTest->user_id,
+							currentPage   => $pageNumber,
+							$filter ? (studentNavFilter => $filter) : ()
+						}
 						),
-						data  => { bs_toggle    => 'tooltip', bs_placement => 'top' },
+						data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
 						title => "$nextTest->{displayName} (version $nextTest->{setVersion})",
 						class => 'btn btn-primary student-nav-button',
 						begin =%>
@@ -89,18 +88,18 @@
 		% if (scalar keys %$filters) {
 			<div class="btn-group student-nav-filter-selector">
 				<%= link_to $filter ? $filters->{$filter}[0] : maketext('Showing all tests') => '#',
-						id              => 'testSelectorFilter',
-						class           => 'btn btn-primary dropdown-toggle',
-						role            => 'button',
-						data            => { bs_toggle => 'dropdown' },
-						'aria-expanded' => 'false' =%>
+					id                                                                       => 'testSelectorFilter',
+					class           => 'btn btn-primary dropdown-toggle',
+					role            => 'button',
+					data            => { bs_toggle => 'dropdown' },
+					'aria-expanded' => 'false' =%>
 				<ul class="dropdown-menu" role="menu" aria-labelledby="testSelectorFilter">
 					% # If a filter is currently in use, then add an item that will remove that filter.
 					% if ($filter) {
 						<li>
 							<%= link_to maketext('Show all tests') => $c->systemLink(
-									url_for('gateway_quiz', setID => "$setID,v$setVersion"),
-									params => { effectiveUser => param('effectiveUser'), currentPage => $pageNumber }
+								url_for('gateway_quiz', setID => "$setID,v$setVersion"),
+								params => { effectiveUser => param('effectiveUser'), currentPage => $pageNumber }
 								),
 								class => 'dropdown-item' =%>
 						</li>
@@ -108,12 +107,12 @@
 					% for (sort keys %$filters) {
 						<li>
 							<%= link_to $filters->{$_}[0] => $c->systemLink(
-									url_for('gateway_quiz', setID => "$setID,v$filters->{$_}[2]"),
-									params => {
-										effectiveUser    => $filters->{$_}[1],
-										currentPage      => $pageNumber,
-										studentNavFilter => $_
-									}
+								url_for('gateway_quiz', setID => "$setID,v$filters->{$_}[2]"),
+								params => {
+									effectiveUser    => $filters->{$_}[1],
+									currentPage      => $pageNumber,
+									studentNavFilter => $_
+								}
 								),
 								class => join(' ', 'dropdown-item', ($filter || '') eq $_ ? 'active' : '') =%>
 						</li>
diff --git a/templates/ContentGenerator/Grades/grade_items.html.ep b/templates/ContentGenerator/Grades/grade_items.html.ep
index a99804944f..202652619b 100644
--- a/templates/ContentGenerator/Grades/grade_items.html.ep
+++ b/templates/ContentGenerator/Grades/grade_items.html.ep
@@ -30,4 +30,3 @@
 		</li>
 	% }
 </ul>
-
diff --git a/templates/ContentGenerator/Grades/problem_table.html.ep b/templates/ContentGenerator/Grades/problem_table.html.ep
index d0d06e3265..a997df6aa9 100644
--- a/templates/ContentGenerator/Grades/problem_table.html.ep
+++ b/templates/ContentGenerator/Grades/problem_table.html.ep
@@ -31,8 +31,8 @@
 				<th scope="col">
 					% if ($problem->{link}) {
 						<%= link_to $problem->{id} => $problem->{link},
-							class        => "fw-bold",
-							'aria-label' => maketext('[_1] problem [_2]', $item->{set_name}, $problem->{id}) %>
+							class                  => "fw-bold",
+							'aria-label'           => maketext('[_1] problem [_2]', $item->{set_name}, $problem->{id}) %>
 					% } else {
 						<%= $problem->{id} %>
 					% }
diff --git a/templates/ContentGenerator/Grades/student_grades.html.ep b/templates/ContentGenerator/Grades/student_grades.html.ep
index c73d4b3fa5..18cedb1fd3 100644
--- a/templates/ContentGenerator/Grades/student_grades.html.ep
+++ b/templates/ContentGenerator/Grades/student_grades.html.ep
@@ -22,12 +22,24 @@
 % if (@$open || @$reduced || @$closed) {
 	<div class="my-3">
 		<%= hidden_field hidden_course_id => $courseID =%>
-		<button id="toggle-weights" class="btn btn-primary" data-hidden="1" data-row-class="weights-row"
-				data-hide-text="<%= maketext('Hide Weights') %>" data-show-text="<%= maketext('Show Weights') %>">
+		<button
+			id="toggle-weights"
+			class="btn btn-primary"
+			data-hidden="1"
+			data-row-class="weights-row"
+			data-hide-text="<%= maketext('Hide Weights') %>"
+			data-show-text="<%= maketext('Show Weights') %>"
+		>
 			<%= maketext('Show Weights') %>
 		</button>
-		<button id="toggle-attempts" class="btn btn-primary" data-hidden="1" data-row-class="attempts-row"
-				data-hide-text="<%= maketext('Hide Attempts') %>" data-show-text="<%= maketext('Show Attempts') %>">
+		<button
+			id="toggle-attempts"
+			class="btn btn-primary"
+			data-hidden="1"
+			data-row-class="attempts-row"
+			data-hide-text="<%= maketext('Hide Attempts') %>"
+			data-show-text="<%= maketext('Show Attempts') %>"
+		>
 			<%= maketext('Show Attempts') %>
 		</button>
 	</div>
diff --git a/templates/ContentGenerator/Hardcopy.html.ep b/templates/ContentGenerator/Hardcopy.html.ep
index 30551ffff5..6e1c1f2f92 100644
--- a/templates/ContentGenerator/Hardcopy.html.ep
+++ b/templates/ContentGenerator/Hardcopy.html.ep
@@ -19,15 +19,13 @@
 				'A hardcopy file was generated, but it may not be complete or correct. Please check that no problems '
 					. 'are missing and that they are all legible. If not, please inform your instructor.') =%>
 			<br>
-			<%= link_to(
-				maketext('Download Hardcopy') => $c->systemLink(url_for, params => { tempFilePath => $file_path })
-			) =%>
+			<%= link_to(maketext('Download Hardcopy') =>
+					$c->systemLink(url_for, params => { tempFilePath => $file_path })) =%>
 		</p>
 	% } else {
 		<p>
 			<%= maketext(
-				'WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor.'
-			) =%>
+				'WeBWorK was unable to generate a paper copy of this homework set.  Please inform your instructor.') =%>
 		</p>
 	% }
 	%
@@ -35,9 +33,8 @@
 		<p>
 			<%= maketext('You can also examine the following temporary files: ') =%>
 			<%= c(
-				map {
-					link_to $_ => $c->systemLink(url_for, params => { tempFilePath => $temp_file_map{$_} })
-				} keys %temp_file_map
+				map { link_to $_ => $c->systemLink(url_for, params => { tempFilePath => $temp_file_map{$_} }) }
+					keys %temp_file_map
 			)->join(', ') =%>
 		</p>
 	% }
diff --git a/templates/ContentGenerator/Hardcopy/form.html.ep b/templates/ContentGenerator/Hardcopy/form.html.ep
index 8c9714572e..ab5908a924 100644
--- a/templates/ContentGenerator/Hardcopy/form.html.ep
+++ b/templates/ContentGenerator/Hardcopy/form.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets               qw(format_set_name_display);
 % use WeBWorK::HTML::ScrollingRecordList qw/scrollingRecordList/;
 %
 %= form_for current_route, name => 'hardcopy-form', id => 'hardcopy-form', method => 'POST', begin
@@ -7,8 +7,7 @@
 	%
 	% if ($multiuser) {
 		<p>
-			<%= maketext(
-				'Select the assignments for which to generate hardcopy versions. You may'
+			<%= maketext('Select the assignments for which to generate hardcopy versions. You may'
 					. ' also select multiple users from the users list. You will receive hardcopy'
 					. ' for each (set, user) pair.') =%>
 		</p>
@@ -55,7 +54,11 @@
 		<p>
 			<%== maketext(
 				'Download hardcopy of set [_1] for [_2]?',
-				tag('span', dir => 'ltr', format_set_name_display($selected_set_id =~ s/,v(\d+)$/ (version $1)/r)),
+				tag(
+					'span',
+					dir => 'ltr',
+					format_set_name_display($selected_set_id =~ s/,v(\d+)$/ (version $1)/r)
+				),
 				join(' ', $user->first_name, $user->last_name)
 			) =%>
 		</p>
@@ -115,7 +118,9 @@
 					<div class="input-group-text">
 						% for (@$formats) {
 							<label class="form-check-label me-3">
-								<%= radio_button hardcopy_format => $_, class => 'form-check-input me-2',
+								<%= radio_button
+									hardcopy_format => $_,
+									class           => 'form-check-input me-2',
 									$_ eq $default_format ? (checked => undef) : () =%>
 								<%= $format_labels->{$_} =%>
 							</label>
@@ -131,13 +136,17 @@
 						<span class="input-group-text"><b><%= maketext('Show Problem Source File:') %></b></span>
 						<div class="input-group-text">
 							<label class="form-check-label me-3">
-								<%= radio_button show_source_file => 'Yes', class => 'form-check-input me-2',
-									checked => undef =%>
+								<%= radio_button
+									show_source_file => 'Yes',
+									class            => 'form-check-input me-2',
+									checked          => undef =%>
 								<%= maketext('Yes') =%>
 							</label>
 							<label class="form-check-label me-3">
-								<%= radio_button show_source_file => 'No', class => 'form-check-input me-2',
-									checked => undef =%>
+								<%= radio_button
+									show_source_file => 'No',
+									class            => 'form-check-input me-2',
+									checked          => undef =%>
 								<%= maketext('No') =%>
 							</label>
 						</div>
@@ -154,7 +163,9 @@
 							<div class="input-group-text">
 								% for (@{ $hardcopyThemesAvailable }) {
 									<label class="form-check-label me-3">
-										<%= radio_button hardcopy_theme => $_, class => 'form-check-input me-2',
+										<%= radio_button
+											hardcopy_theme => $_,
+											class          => 'form-check-input me-2',
 											$_ eq $ce->{hardcopyTheme} ? (checked => undef) : () =%>
 										<%= $hardcopyLabels->{$_} =%>
 									</label>
@@ -162,11 +173,12 @@
 							</div>
 						% } else {
 							<div class="input-group-text p-0">
-								<%= select_field 'hardcopy_theme' => [
+								<%= select_field
+									'hardcopy_theme' => [
 										map { [
 											$hardcopyLabels->{$_} => $_,
 											$_ eq $ce->{hardcopyTheme} ? (selected => undef) : ()
-										] } @{ $hardcopyThemesAvailable }
+										] } @{$hardcopyThemesAvailable}
 									],
 									id    => 'action_hardcopy_theme_id',
 									class => 'form-select form-select-sm d-inline w-auto' =%>
@@ -177,11 +189,11 @@
 			</div>
 		% }
 		<div>
-			<%= submit_button
-				$multiuser
+			<%= submit_button $multiuser
 				? maketext('Generate hardcopy for selected sets and selected users')
 				: maketext('Generate Hardcopy'),
-				name => 'generate_hardcopy', class => 'btn btn-primary' =%>
+				name  => 'generate_hardcopy',
+				class => 'btn btn-primary' =%>
 		</div>
 	</div>
 % end
diff --git a/templates/ContentGenerator/Home.html.ep b/templates/ContentGenerator/Home.html.ep
index 448504c397..40d6444423 100644
--- a/templates/ContentGenerator/Home.html.ep
+++ b/templates/ContentGenerator/Home.html.ep
@@ -1,13 +1,13 @@
 % use WeBWorK::Utils::CourseManagement qw(listCourses);
 %
-% my $coursesDir = $ce->{webworkDirs}{courses};
-% my @courseIDs = listCourses($ce);
+% my $coursesDir      = $ce->{webworkDirs}{courses};
+% my @courseIDs       = listCourses($ce);
 % my $admin_course_id = $ce->{admin_course_id};
 %
 <p><%= maketext('Welcome to WeBWorK!') %></p>
 %
 % if ((grep { $_ eq $admin_course_id } @courseIDs) && !-f "$coursesDir/$admin_course_id/hide_directory") {
-	<p><%=	link_to maketext('Course Administration') => url_for('course_admin') =%></p>
+	<p><%= link_to maketext('Course Administration') => url_for('course_admin') =%></p>
 % }
 %
 <h2><%= maketext('Courses') %></h2>
diff --git a/templates/ContentGenerator/Instructor/AchievementEditor.html.ep b/templates/ContentGenerator/Instructor/AchievementEditor.html.ep
index b593704ec0..37bb481b1e 100644
--- a/templates/ContentGenerator/Instructor/AchievementEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementEditor.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(not_blank getAssetURL);
+% use WeBWorK::Utils                  qw(not_blank getAssetURL);
 % use WeBWorK::HTML::CodeMirrorEditor qw(generate_codemirror_html output_codemirror_static_files);
 %
 % content_for js => begin
@@ -14,7 +14,10 @@
 <div class="mb-2">
 	<i><%= maketext('Editing achievement in file "[_1]"', $c->shortPath($c->{sourceFilePath})) =%></i>
 </div>
-<%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
+<%= form_for current_route,
+	method  => 'POST',
+	id      => 'editor',
+	name    => 'editor',
 	enctype => 'application/x-www-form-urlencoded',
 	begin =%>
 	<%= $c->hidden_authen_fields =%>
@@ -37,8 +40,8 @@
 			% content_for 'tab-list' => begin
 				<li class="nav-item" role="presentation">
 					<%= link_to maketext($actionFormTitles->{$actionID}) => "#$actionID",
-						class           => "nav-link action-link$active",
-						id              => "$actionID-tab",
+						class                                            => "nav-link action-link$active",
+						id                                               => "$actionID-tab",
 						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
 						role            => 'tab',
 						'aria-controls' => $actionID,
@@ -46,8 +49,12 @@
 				</li>
 			% end
 			% content_for 'tab-content' => begin
-				<div class="tab-pane fade mb-2 <%= $active ? "show$active" : '' %>" id="<%= $actionID %>"
-					role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<div
+					class="tab-pane fade mb-2 <%= $active ? "show$active" : '' %>"
+					id="<%= $actionID %>"
+					role="tabpanel"
+					aria-labelledby="<%= $actionID %>-tab"
+				>
 					<%= $line_contents =%>
 				</div>
 			% end
@@ -56,11 +63,15 @@
 	%
 	<%= hidden_field action => $default_choice, id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	<div>
 		<%= submit_button maketext($actionFormTitles->{$default_choice}),
-			name => 'submit', id => 'take_action', class => 'btn btn-primary' %>
+			name  => 'submit',
+			id    => 'take_action',
+			class => 'btn btn-primary' %>
 	</div>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep
index db04f240f3..fd13f600cf 100644
--- a/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementEditor/save_as_form.html.ep
@@ -5,33 +5,46 @@
 	<div class="row align-items-center mb-2">
 		<%= label_for 'action.save_as.target_file_id' => maketext('Save as:'), class => 'col-form-label col-auto' =%>
 		<div class="col-auto">
-			<%= text_field 'action.save_as.target_file' => $c->getRelativeSourceFilePath($c->{sourceFilePath}),
-				id => 'action.save_as.target_file_id', size => 40, class => 'form-control form-control-sm' =%>
+			<%= text_field
+				'action.save_as.target_file' => $c->getRelativeSourceFilePath($c->{sourceFilePath}),
+				id                           => 'action.save_as.target_file_id',
+				size                         => 40,
+				class                        => 'form-control form-control-sm' =%>
 		</div>
-		<%=  hidden_field 'action.save_as.source_file' => $c->{sourceFilePath} =%>
+		<%= hidden_field 'action.save_as.source_file' => $c->{sourceFilePath} =%>
 	</div>
 	<div class="form-check mb-2">
-		<%= radio_button 'action.save_as.saveMode' => 'use_in_current',
-			id => 'action.save_as.saveMode.use_in_current', class => 'form-check-input' =%>
+		<%= radio_button
+			'action.save_as.saveMode' => 'use_in_current',
+			id                        => 'action.save_as.saveMode.use_in_current',
+			class                     => 'form-check-input' =%>
 		<%= label_for 'action.save_as.saveMode.use_in_current', class => 'form-check-label', begin =%>
 			<%== maketext('Use in achievement [_1]', tag('b', $achievementID)) =%>
 		<% end =%>
 	</div>
 	<div class="mb-2">
 		<div class="form-check d-inline-block">
-			<%= radio_button 'action.save_as.saveMode' => 'use_in_new',
-				id => 'action.save_as.saveMode.use_in_new', class => 'form-check-input' =%>
-			<%= label_for 'action.save_as.saveMode.use_in_new' => maketext('Use in new achievement:'),
-				class => 'form-check-label me-1', id => 'action.save_as.saveMode.use_in_new.label' =%>
+			<%= radio_button
+				'action.save_as.saveMode' => 'use_in_new',
+				id                        => 'action.save_as.saveMode.use_in_new',
+				class                     => 'form-check-input' =%>
+			<%= label_for
+				'action.save_as.saveMode.use_in_new' => maketext('Use in new achievement:'),
+				class                                => 'form-check-label me-1',
+				id                                   => 'action.save_as.saveMode.use_in_new.label' =%>
 		</div>
-		<%= text_field 'action.save_as.id' => '',
-			'aria-labelledby' => 'action.save_as.saveMode.use_in_new.label',
-			class             => 'form-control form-control-sm d-inline w-auto' =%>
+		<%= text_field
+			'action.save_as.id' => '',
+			'aria-labelledby'   => 'action.save_as.saveMode.use_in_new.label',
+			class               => 'form-control form-control-sm d-inline w-auto' =%>
 	</div>
 	<div class="form-check">
-		<%= radio_button 'action.save_as.saveMode' => 'dont_use',
-			id => 'action.save_as.saveMode.dont_use', class => 'form-check-input' =%>
-		<%= label_for 'action.save_as.saveMode.dont_use' => maketext(q{Don't use in an achievement}),
-			class => 'form-check-label' =%>
+		<%= radio_button
+			'action.save_as.saveMode' => 'dont_use',
+			id                        => 'action.save_as.saveMode.dont_use',
+			class                     => 'form-check-input' =%>
+		<%= label_for
+			'action.save_as.saveMode.dont_use' => maketext(q{Don't use in an achievement}),
+			class                              => 'form-check-label' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList.html.ep b/templates/ContentGenerator/Instructor/AchievementList.html.ep
index 1c8a8a0fe6..74bae463b9 100644
--- a/templates/ContentGenerator/Instructor/AchievementList.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList.html.ep
@@ -1,9 +1,9 @@
 % use WeBWorK::Utils qw(getAssetURL);
 %
 % content_for js => begin
-	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),           defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/AchievementList/achievementlist.js'), defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),             defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
 % end
 %
 % unless ($authz->hasPermissions(param('user'), 'edit_achievements')) {
@@ -11,7 +11,11 @@
 	% last;
 % }
 %
-<%= form_for current_route, method => 'post', id => 'achievement-list', name => 'achievementlist', class => 'font-sm',
+<%= form_for current_route,
+	method => 'post',
+	id     => 'achievement-list',
+	name   => 'achievementlist',
+	class  => 'font-sm',
 	begin =%>
 	<%= $c->hidden_authen_fields =%>
 	<%= hidden_field editMode => $c->{editMode} =%>
@@ -34,9 +38,9 @@
 			% for my $actionID (@$formsToShow) {
 				<li class="nav-item" role="presentation">
 					<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
-						class           => 'nav-link action-link'
-							. ($actionID eq $formsToShow->[0] ? ' active' : '')
-							. ($actionID eq 'import' && !@$axpList ? ' disabled' : ''),
+						class                                      => 'nav-link action-link'
+						. ($actionID eq $formsToShow->[0]      ? ' active'   : '')
+						. ($actionID eq 'import' && !@$axpList ? ' disabled' : ''),
 						id              => "$actionID-tab",
 						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
 						role            => 'tab',
@@ -47,8 +51,12 @@
 		</ul>
 		<div class="tab-content">
 			% for my $actionID (@$formsToShow) {
-				<div class="tab-pane fade mb-2 <%= $actionID eq $formsToShow->[0] ? 'show active' : '' %>"
-					id="<%= $actionID %>" role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<div
+					class="tab-pane fade mb-2 <%= $actionID eq $formsToShow->[0] ? 'show active' : '' %>"
+					id="<%= $actionID %>"
+					role="tabpanel"
+					aria-labelledby="<%= $actionID %>-tab"
+				>
 					<%= include "ContentGenerator/Instructor/AchievementList/${actionID}_form" =%>
 				</div>
 			% }
@@ -56,10 +64,12 @@
 	</div>
 	<div>
 		<%= submit_button maketext($formTitles->{ $formsToShow->[0] }),
-			id => 'take_action', class => 'btn btn-primary mb-3' =%>
+			id    => 'take_action',
+			class => 'btn btn-primary mb-3' =%>
 	</div>
 	<p class="mb-2">
-		<%= maketext('Showing [_1] out of [_2] achievements.',
+		<%= maketext(
+			'Showing [_1] out of [_2] achievements.',
 			scalar @{ $c->{visibleAchievementIDs} },
 			scalar @{ $c->{allAchievementIDs} }
 		) =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep
index 5abd26befb..94e9bef023 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/assign_form.html.ep
@@ -1,9 +1,11 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for assign_select => maketext('Assign which achievements?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			assign_select => maketext('Assign which achievements?'),
+			class         => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.assign.scope' => [
+			<%= select_field
+				'action.assign.scope' => [
 					[ maketext('all course achievements') => 'all' ],
 					[ maketext('selected achievements')   => 'selected', selected => undef ]
 				],
@@ -12,10 +14,12 @@
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for 'assign_data_select' => maketext('Choose what to do with existing data:'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			'assign_data_select' => maketext('Choose what to do with existing data:'),
+			class                => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.assign.overwrite' => [
+			<%= select_field
+				'action.assign.overwrite' => [
 					[ maketext('overwrite') => 'everything' ],
 					[ maketext('preserve')  => 'new_only', selected => undef ]
 				],
diff --git a/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep
index 983b3b22ee..04e8b5dce4 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/create_form.html.ep
@@ -4,15 +4,19 @@
 			<%= maketext('Create a new achievement with ID') =%><span class="required-field">*</span>:
 		<% end =%>
 		<div class="col-auto">
-			<%= text_field 'action.create.id' => '', id => 'create_text',
-				class => 'form-control form-control-sm d-inline w-auto' =%>
+			<%= text_field
+				'action.create.id' => '',
+				id                 => 'create_text',
+				class              => 'form-control form-control-sm d-inline w-auto' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for create_select => maketext("Create as what type of achievement?"),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			create_select => maketext("Create as what type of achievement?"),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.create.type' => [
+			<%= select_field
+				'action.create.type' => [
 					[ maketext('a new empty achievement')                       => 'empty', selected => undef ],
 					[ maketext('a duplicate of the first selected achievement') => 'copy' ],
 				],
diff --git a/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
index ac180b1c46..e62e0cfedb 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
@@ -3,19 +3,23 @@
 </div>
 <div class="table-responsive">
 	<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
-		<caption><%= maketext('Achievement List') %></caption>
+		<caption>
+			<%= maketext('Achievement List') %>
+		</caption>
 		<thead class="table-group-divider">
 			<tr>
 				<th class="text-nowrap">
 					<%= label_for 'select-all', begin =%>
-						<%= check_box 'select-all' => '', id => 'select-all',
-							class => 'select-all form-check-input set-id-tooltip',
+						<%= check_box
+							'select-all' => '',
+							id           => 'select-all',
+							class        => 'select-all form-check-input set-id-tooltip',
 							'aria-label' => maketext('Select all achievements'),
-							data => {
+							data         => {
 								select_group => 'selected_achievements',
-								bs_toggle => 'tooltip',
+								bs_toggle    => 'tooltip',
 								bs_placement => 'right',
-								bs_title => maketext('Select all achievements')
+								bs_title     => maketext('Select all achievements')
 							} =%>
 						<i class="fa-solid fa-check-double" aria-hidden="true"></i>
 					<% end =%>
@@ -36,18 +40,17 @@
 				% my $achievement_id = $_->achievement_id;
 				<tr>
 					<td>
-						<%= check_box selected_achievements => $achievement_id,
-							id    => "${achievement_id}_id",
-							class => 'form-check-input',
+						<%= check_box
+							selected_achievements => $achievement_id,
+							id                    => "${achievement_id}_id",
+							class                 => 'form-check-input',
 							$selectedAchievementIDs{ $_->achievement_id } ? (checked => undef) : () =%>
 					</td>
 					<td>
 						<div class="d-flex justify-content-between gap-1">
 							<%= label_for "${achievement_id}_id" => $_->achievement_id =%>
-							<%= link_to $c->systemLink(
-									url_for('instructor_achievement_list'),
-									params => { editMode => 1, selected_achievements => $achievement_id }
-								),
+							<%= link_to $c->systemLink(url_for('instructor_achievement_list'),
+								params => { editMode => 1, selected_achievements => $achievement_id }),
 								begin %>
 								<i class="icon fas fa-pencil-alt" aria-hidden="true"></i>
 								<span class="visually-hidden"><%= maketext('Edit') =%></span>
@@ -61,13 +64,12 @@
 					<td>
 						% my $num_users = $db->countAchievementUsers($_->achievement_id);
 						<%= link_to "$num_users/$c->{totalUsers}" => $c->systemLink(
-							url_for('instructor_achievement_user_editor', achievementID => $achievement_id)
-						) =%>
+							url_for('instructor_achievement_user_editor', achievementID => $achievement_id)) =%>
 					</td>
 					<td class="text-nowrap">
 						<%= link_to $c->systemLink(
-							url_for('instructor_achievement_notification', achievementID => $achievement_id),
-						), begin =%>
+							url_for('instructor_achievement_notification', achievementID => $achievement_id),),
+							begin =%>
 							<%= $_->email_template
 								? maketext('Edit Email Template')
 								: maketext('Enable Email Notification') =%>
@@ -76,7 +78,7 @@
 					<td class="text-nowrap">
 						<%= link_to maketext('Edit Evaluator') => $c->systemLink(
 							url_for('instructor_achievement_editor', achievementID => $achievement_id),
-							params => { sourceFilePath => $ce->{courseDirs}{achievements}. '/' . $_->test }
+							params => { sourceFilePath => $ce->{courseDirs}{achievements} . '/' . $_->test }
 						) =%>
 					</td>
 				</tr>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
index 0605d96843..6a6290d0d2 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
@@ -3,13 +3,13 @@
 		<em><%= maketext('Deletion destroys all achievement-related data and is not undoable!') =%></em>
 	</div>
 	<div class="row mb-2">
-		<%= label_for delete_select => maketext('Delete selected achievements?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			delete_select => maketext('Delete selected achievements?'),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.delete.confirm' => [
-					[ maketext('No')  => 'no', selected => undef ],
-					[ maketext('Yes') => 'yes' ],
-				],
+			<%= select_field
+				'action.delete.confirm' =>
+				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ], ],
 				id    => 'delete_select',
 				class => 'form-select form-select-sm d-inline w-auto me-3' =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep
index be88ba59ea..f31d3e164d 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_form.html.ep
@@ -1,8 +1,10 @@
 <div class="row mb-2">
-<%= label_for edit_select => maketext('Edit which achievements?'),
-		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<%= label_for
+		edit_select => maketext('Edit which achievements?'),
+		class       => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.edit.scope' => [
+		<%= select_field
+			'action.edit.scope' => [
 				[ maketext('all course achievements') => 'all' ],
 				[ maketext('selected achievements')   => 'selected', selected => undef ],
 			],
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep
index 0bb0bf1d78..2520f26933 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_table.html.ep
@@ -3,7 +3,9 @@
 % } else {
 	<div class="table-responsive">
 		<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
-			<caption><%= maketext('Achievement List') %></caption>
+			<caption>
+				<%= maketext('Achievement List') %>
+			</caption>
 			<thead class="table-group-divider">
 				<tr>
 					<th class="align-top"><%= maketext('Icon') %></th>
@@ -40,17 +42,17 @@
 						<tr>
 							<td>
 								<%= hidden_field selected_achievements => $achievement_id =%>
-								<%= image
-									$ce->{courseURLs}{achievements}
-										. '/'
-										. ($achievement->icon // 'defaulticon.png'),
-									alt => 'Achievement Icon', height => 60, class => 'm-1' =%>
+								<%= image $ce->{courseURLs}{achievements} . '/'
+									. ($achievement->icon // 'defaulticon.png'),
+									alt    => 'Achievement Icon',
+									height => 60,
+									class  => 'm-1' =%>
 							</td>
 							% for (
 								% { size => 30, fields => [ 'achievement_id', 'name',    'category' ] },
 								% { size => 8,  fields => [ 'number',         'enabled', 'points', 'max_counter' ] },
 								% { size => 85, fields => [ 'description',    'test',    'icon',   'assignment_type' ] }
-								% )
+							% )
 							% {
 								<td>
 									<div class="d-flex flex-column gap-1">
@@ -59,8 +61,8 @@
 												<%= include
 													'ContentGenerator/Instructor/AchievementList/edit_table_row',
 													fieldName => "achievement.$achievement_id.$field",
-													value => $achievement->$field,
-													size => $_->{size} =%>
+													value     => $achievement->$field,
+													size      => $_->{size} =%>
 											</span>
 										% }
 									</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep b/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep
index c9e6d681fd..b9a2f2b534 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/edit_table_row.html.ep
@@ -1,7 +1,8 @@
 % if ($fieldName =~ /\.enabled$/) {
 	% # If the "enabled" checkbox is checked it returns a 1, if it is unchecked it returns nothing
 	% # in which case the hidden field overrides the parameter with a 0.
-	<%= check_box $fieldName => 1,
+	<%= check_box
+		$fieldName        => 1,
 		'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
 		class             => 'form-check-input',
 		$value ? (checked => undef) : () =%>
@@ -11,14 +12,17 @@
 	% for my $type ([ default => 'homework' ], [ gateway => 'tests' ], [ jitar => 'just-in-time' ]) {
 		<label class="form-check-label me-1">
 			<%= $type->[1] =%>
-			<%= check_box $fieldName => $type->[0], class => 'form-check-input me-1',
+			<%= check_box
+				$fieldName => $type->[0],
+				class      => 'form-check-input me-1',
 				(grep { $type->[0] eq $_ } @allowedTypes) ? (checked => undef) : () =%>
 		</label>
 	% }
 % } elsif ($fieldName =~ /\.achievement_id$/) {
 	<%= $value =%>
 % } else {
-	<%= text_field $fieldName => $value,
+	<%= text_field
+		$fieldName        => $value,
 		'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header',
 		size              => $size,
 		class             => 'form-control form-control-sm' =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep
index 54a0bd6945..54c9a3caa4 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/export_form.html.ep
@@ -1,8 +1,10 @@
 <div class="row mb-2">
-<%= label_for export_select => maketext('Export which achievements?'),
-		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<%= label_for
+		export_select => maketext('Export which achievements?'),
+		class         => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.export.scope' => [
+		<%= select_field
+			'action.export.scope' => [
 				[ maketext('all course achievements') => 'all' ],
 				[ maketext('selected achievements')   => 'selected', selected => undef ],
 			],
diff --git a/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep
index 8cd66dac88..14b89d22af 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/export_table.html.ep
@@ -1,18 +1,22 @@
 <div class="table-responsive">
 	<table class="table table-sm table-bordered font-sm caption-top" id="achievement-table">
-		<caption><%= maketext('Achievement List') %></caption>
+		<caption>
+			<%= maketext('Achievement List') %>
+		</caption>
 		<thead class="table-group-divider">
 			<tr>
 				<th>
 					<%= label_for 'select-all', begin =%>
-						<%= check_box 'select-all' => '', id => 'select-all',
-							class => 'select-all form-check-input set-id-tooltip',
+						<%= check_box
+							'select-all' => '',
+							id           => 'select-all',
+							class        => 'select-all form-check-input set-id-tooltip',
 							'aria-label' => maketext('Select all achievements'),
-							data => {
+							data         => {
 								select_group => 'selected_achievements',
-								bs_toggle => 'tooltip',
+								bs_toggle    => 'tooltip',
 								bs_placement => 'right',
-								bs_title => maketext('Select all achievements')
+								bs_title     => maketext('Select all achievements')
 							} =%>
 						<i class="fa-solid fa-check-double" aria-hidden="true"></i>
 					<% end =%>
@@ -27,9 +31,10 @@
 				% my $achievement_id = $_->achievement_id;
 				<tr>
 					<td>
-						<%= check_box selected_achievements => $_->achievement_id,
-							id    => "${achievement_id}_id",
-							class => 'form-check-input',
+						<%= check_box
+							selected_achievements => $_->achievement_id,
+							id                    => "${achievement_id}_id",
+							class                 => 'form-check-input',
 							$selectedAchievementIDs{ $_->achievement_id } ? (checked => undef) : () =%>
 					</td>
 					<td><%= label_for "${achievement_id}_id" => $_->achievement_id %></td>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/filter_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/filter_form.html.ep
index c64282bd37..fae463a043 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/filter_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/filter_form.html.ep
@@ -1,9 +1,11 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for filter_select => maketext('Show which achievements?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			filter_select => maketext('Show which achievements?'),
+			class         => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.filter.scope' => [
+			<%= select_field
+				'action.filter.scope' => [
 					[ maketext('all course achievements')              => 'all' ],
 					[ maketext('selected achievements')                => 'selected' ],
 					[ maketext('enter matching achievement IDs below') => 'match_ids', selected => undef ],
@@ -11,7 +13,8 @@
 					[ maketext('enabled achievements')                 => 'enabled' ],
 					[ maketext('disabled achievements')                => 'disabled' ]
 				],
-				id => 'filter_select', class => 'form-select form-select-sm' =%>
+				id    => 'filter_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="filter_text_elements" class="row mb-2">
@@ -20,8 +23,12 @@
 			<span class="required-field">*</span>
 		<% end =%>
 		<div class="col-auto">
-			<%= text_field 'action.filter.achievement_ids' => '', id => 'filter_text', 'aria-required' => 'true',
-				class => 'form-control form-control-sm', dir => 'ltr' =%>
+			<%= text_field
+				'action.filter.achievement_ids' => '',
+				id                              => 'filter_text',
+				'aria-required'                 => 'true',
+				class                           => 'form-control form-control-sm',
+				dir                             => 'ltr' =%>
 		</div>
 	</div>
 	<div id="filter_text_err_msg" class="alert alert-danger p-1 mb-2 d-inline-flex d-none">
@@ -33,8 +40,10 @@
 			<%= maketext('Match on which category?') =%>
 		<% end =%>
 		<div class="col-auto">
-			<%= select_field 'action.filter.category' => \@categories,
-				id => 'filter_category', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.filter.category' => \@categories,
+				id                       => 'filter_category',
+				class                    => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep
index ece0c27b60..373f2f3f01 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/import_form.html.ep
@@ -1,21 +1,22 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for import_file_select => maketext('Import from where?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			import_file_select => maketext('Import from where?'),
+			class              => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.source' => [
-					[ maketext('Select import file') => '', selected => undef ],
-					@$axpList
-				],
-				id    => 'import_file_select',
-				class => 'form-select form-select-sm d-inline w-auto' =%>
+			<%= select_field
+				'action.import.source' => [ [ maketext('Select import file') => '', selected => undef ], @$axpList ],
+				id                     => 'import_file_select',
+				class                  => 'form-select form-select-sm d-inline w-auto' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for import_users_select => maketext('Assign this achievement to which users?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			import_users_select => maketext('Assign this achievement to which users?'),
+			class               => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.assign' => [
+			<%= select_field
+				'action.import.assign' => [
 					[ maketext('all current users') => 'all' ],
 					[ maketext('no users')          => 'none', selected => undef ],
 				],
diff --git a/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep
index 74404b5df5..58c1d049e2 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/score_form.html.ep
@@ -1,8 +1,10 @@
 <div class="row mb-2">
-	<%= label_for score_select => maketext('Score which achievements?'),
-		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<%= label_for
+		score_select => maketext('Score which achievements?'),
+		class        => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.score.scope' => [
+		<%= select_field
+			'action.score.scope' => [
 				[ maketext('all course achievements') => 'all' ],
 				[ maketext('selected achievements')   => 'selected', selected => undef ],
 			],
diff --git a/templates/ContentGenerator/Instructor/AchievementNotificationEditor.html.ep b/templates/ContentGenerator/Instructor/AchievementNotificationEditor.html.ep
index e759725636..9b7aee7986 100644
--- a/templates/ContentGenerator/Instructor/AchievementNotificationEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementNotificationEditor.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(not_blank getAssetURL);
+% use WeBWorK::Utils                  qw(not_blank getAssetURL);
 % use WeBWorK::HTML::CodeMirrorEditor qw(generate_codemirror_html output_codemirror_static_files);
 %
 % content_for js => begin
@@ -14,7 +14,10 @@
 <div class="mb-2">
 	<i><%= maketext('Editing achievement in file "[_1]"', $c->shortPath($c->{sourceFilePath})) =%></i>
 </div>
-<%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
+<%= form_for current_route,
+	method  => 'POST',
+	id      => 'editor',
+	name    => 'editor',
 	enctype => 'application/x-www-form-urlencoded',
 	begin =%>
 	<%= $c->hidden_authen_fields =%>
@@ -23,7 +26,8 @@
 	% }
 	%
 	<div class="mb-2">
-    <%= generate_codemirror_html($c, 'achievementNotification', $achievementNotification, 'mt-text') =%></div>
+		<%= generate_codemirror_html($c, 'achievementNotification', $achievementNotification, 'mt-text') =%>
+	</div>
 	%
 	% # Output action forms
 	% my $default_choice;
@@ -38,8 +42,8 @@
 			% content_for 'tab-list' => begin
 				<li class="nav-item" role="presentation">
 					<%= link_to maketext($actionFormTitles->{$actionID}) => "#$actionID",
-						class           => "nav-link action-link$active",
-						id              => "$actionID-tab",
+						class                                            => "nav-link action-link$active",
+						id                                               => "$actionID-tab",
 						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
 						role            => 'tab',
 						'aria-controls' => $actionID,
@@ -47,8 +51,12 @@
 				</li>
 			% end
 			% content_for 'tab-content' => begin
-				<div class="tab-pane fade mb-2 <%= $active ? "show$active" : '' %>" id="<%= $actionID %>"
-					role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<div
+					class="tab-pane fade mb-2 <%= $active ? "show$active" : '' %>"
+					id="<%= $actionID %>"
+					role="tabpanel"
+					aria-labelledby="<%= $actionID %>-tab"
+				>
 					<%= $line_contents =%>
 				</div>
 			% end
@@ -57,11 +65,15 @@
 	%
 	<%= hidden_field action => $default_choice, id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	<div>
 		<%= submit_button maketext($actionFormTitles->{$default_choice}),
-			name => 'submit', id => 'take_action', class => 'btn btn-primary' %>
+			name  => 'submit',
+			id    => 'take_action',
+			class => 'btn btn-primary' %>
 	</div>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/AchievementNotificationEditor/existing_form.html.ep b/templates/ContentGenerator/Instructor/AchievementNotificationEditor/existing_form.html.ep
index 882400c279..f9acef79b7 100644
--- a/templates/ContentGenerator/Instructor/AchievementNotificationEditor/existing_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementNotificationEditor/existing_form.html.ep
@@ -1,16 +1,22 @@
 % use Mojo::File qw(path);
 %
 <div class="row align-items-center mb-2">
-	<%= label_for 'action.existing.target_file_id' => maketext('Use existing template:'),
-		class => 'col-form-label col-auto' =%>
+	<%= label_for
+		'action.existing.target_file_id' => maketext('Use existing template:'),
+		class                            => 'col-form-label col-auto' =%>
 	<div class="col-auto">
 		% my $relativeSourceFilePath = $c->getRelativeSourceFilePath($c->{sourceFilePath});
-		<%= select_field 'action.existing.target_file' => [
+		<%= select_field
+			'action.existing.target_file' => [
 				map { [ $_ =~ s/(\.html)?\.ep//r => $_, $_ eq $relativeSourceFilePath ? (selected => undef) : () ] }
-				@{ path($ce->{courseDirs}{achievement_notifications})->list->grep(qr/\.ep$/)
-					->map(sub { $c->getRelativeSourceFilePath($_) })->to_array }
+				@{
+					path($ce->{courseDirs}{achievement_notifications})->list->grep(qr/\.ep$/)
+					->map(sub { $c->getRelativeSourceFilePath($_) })
+					->to_array
+				}
 			],
-			id => 'action.existing.target_file_id', class => 'form-select form-select-sm d-inline w-auto',
-			dir => 'ltr' =%>
+			id    => 'action.existing.target_file_id',
+			class => 'form-select form-select-sm d-inline w-auto',
+			dir   => 'ltr' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/AchievementNotificationEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/AchievementNotificationEditor/save_as_form.html.ep
index 6f18900c0f..7e4ce0f92a 100644
--- a/templates/ContentGenerator/Instructor/AchievementNotificationEditor/save_as_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementNotificationEditor/save_as_form.html.ep
@@ -5,8 +5,12 @@
 			<div class="editor-save-path input-group input-group-sm">
 				<span class="input-group-text">[ACHEVNOTIFYDIR]/</span>
 				% param('action.save_as.target_file', $c->getRelativeSourceFilePath($c->{sourceFilePath}));
-				<%= text_field 'action.save_as.target_file' => '', id => 'action.save_as.target_file_id', size => 40,
-					class => 'form-control form-control-sm', dir  => 'ltr' =%>
+				<%= text_field
+					'action.save_as.target_file' => '',
+					id                           => 'action.save_as.target_file_id',
+					size                         => 40,
+					class                        => 'form-control form-control-sm',
+					dir                          => 'ltr' =%>
 			</div>
 		</div>
 	</div>
diff --git a/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep b/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep
index 48a0776d88..f14a715d32 100644
--- a/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementUserEditor.html.ep
@@ -43,25 +43,43 @@
 					%
 					<tr>
 						<td class="text-center">
-							<input type="checkbox" name="selected" id="<%= $user %>.assigned" value="<%= $user %>"
-								class="form-check-input" <%= $userAchievement ? 'checked' : '' %>>
+							<input
+								type="checkbox"
+								name="selected"
+								id="<%= $user %>.assigned"
+								value="<%= $user %>"
+								class="form-check-input"
+								<%= $userAchievement ? 'checked' : '' %>
+							>
 						</td>
 						<td><%= label_for "$user.assigned" => $user %></td>
 						<td><%= $prettyName %></td>
 						<td class="text-center"><%= $userRecord->section %></td>
 						% if ($userAchievement) {
 							<td class="text-center">
-								<input type="checkbox" name="<%= $user %>.earned" value="1"
-									aria-labelledby="earned_header" class="form-check-input"
-								   	<%= $userAchievement->earned ? 'checked' : '' %>>
+								<input
+									type="checkbox"
+									name="<%= $user %>.earned"
+									value="1"
+									aria-labelledby="earned_header"
+									class="form-check-input"
+									<%= $userAchievement->earned ? 'checked' : '' %>
+								>
 							</td>
 							<td class="text-center">
-								<input name="<%= $user %>.counter" value="<%= $userAchievement->counter %>"
-									type="number" min="0" aria-labelledby="counter_header" size="6"
-									class="form-control form-control-sm">
+								<input
+									name="<%= $user %>.counter"
+									value="<%= $userAchievement->counter %>"
+									type="number"
+									min="0"
+									aria-labelledby="counter_header"
+									size="6"
+									class="form-control form-control-sm"
+								>
 							</td>
 						% } else {
-							<td></td><td></td>
+							<td></td>
+							<td></td>
 						% }
 					</tr>
 				% }
@@ -85,7 +103,8 @@
 		</div>
 		<div class="d-flex align-items-center">
 			<%= submit_button maketext('Unassign from All Users'),
-				name => 'unassignFromAll', class => 'btn btn-primary' =%>
+				name  => 'unassignFromAll',
+				class => 'btn btn-primary' =%>
 			<label class="form-check-label">
 				<%= radio_button unassignFromAllSafety => 0, checked => undef, class => 'form-check-input mx-1' =%>
 				<%= maketext('Read only') =%>
diff --git a/templates/ContentGenerator/Instructor/AddUsers.html.ep b/templates/ContentGenerator/Instructor/AddUsers.html.ep
index 03d0dc1cea..72bd47f341 100644
--- a/templates/ContentGenerator/Instructor/AddUsers.html.ep
+++ b/templates/ContentGenerator/Instructor/AddUsers.html.ep
@@ -1,5 +1,5 @@
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
-% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils       qw(getAssetURL);
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	<div class="alert alert-danger p-1 mb-0">
@@ -14,7 +14,7 @@
 % }
 %
 % content_for js => begin
-    <%= javascript getAssetURL($ce, 'js/AddUsers/add-users.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/AddUsers/add-users.js'), defer => undef =%>
 % end
 <p><%= defined $c->{studentEntryReport} ? $c->{studentEntryReport}->join('') : '' %></p>
 <p><%= maketext('Enter information below for students you wish to add.') =%></p>
@@ -25,8 +25,11 @@
 	<%= $c->hidden_authen_fields('create_') =%>
 	<div class="input-group d-inline-flex w-auto mb-3">
 		<%= submit_button maketext('Create'), class => 'btn btn-primary' =%>
-		<%= number_field number_of_students => $numberOfStudents, min => 1,
-			class => 'form-control', style => 'width: 6em' =%>
+		<%= number_field
+			number_of_students => $numberOfStudents,
+			min                => 1,
+			class              => 'form-control',
+			style              => 'width: 6em' =%>
 		<span class="input-group-text"><%= maketext('entry rows.') %></span>
 	</div>
 <% end =%>
@@ -45,9 +48,9 @@
 				data  => {
 					bs_content => maketext(
 						'This is the field that will be used for the password if the password field is left blank. '
-							. 'If it is set to "None", and no password is provided in the password field, or if no '
-							. 'value is provided for the field this is set to, then the user will be created without '
-							. 'a password.'
+						. 'If it is set to "None", and no password is provided in the password field, or if no '
+						. 'value is provided for the field this is set to, then the user will be created without '
+						. 'a password.'
 					),
 					bs_placement => 'top',
 					bs_toggle    => 'popover'
@@ -55,11 +58,12 @@
 				role     => 'button',
 				tabindex => 0,
 				begin =%>
-					<i class="icon fas fa-question-circle" aria-hidden="true"></i><% =%>\
-					<span class="visually-hidden"><%= maketext('Fallback password source help') %></span><% =%>\
-				<% end =%>
+				<i class="icon fas fa-question-circle" aria-hidden="true"></i><% =%>\
+				<span class="visually-hidden"><%= maketext('Fallback password source help') %></span><% =%>\
+			<% end =%>
 		<% end =%>
-		<%= select_field fallback_password_source => [
+		<%= select_field
+			fallback_password_source => [
 				[ maketext('None')       => '',           $default eq ''           ? (selected => undef) : () ],
 				[ maketext('Login Name') => 'user_id',    $default eq 'user_id'    ? (selected => undef) : () ],
 				[ maketext('First Name') => 'first_name', $default eq 'first_name' ? (selected => undef) : () ],
@@ -73,7 +77,8 @@
 				placeholder_last_name  => maketext('Use last name'),
 				placeholder_student_id => maketext('Use student ID')
 			},
-			id => 'fallback_password_source', class => 'form-select w-auto flex-grow-0' =%>
+			id    => 'fallback_password_source',
+			class => 'form-select w-auto flex-grow-0' =%>
 	</div>
 
 	<div class="table-responsive">
@@ -98,61 +103,87 @@
 					<tr>
 						<td>
 							% param("user_id_$_", undef);
-							<%= text_field "user_id_$_" => '', size => '10', 'aria-labelledby' => 'user_id_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"user_id_$_"      => '',
+								size              => '10',
+								'aria-labelledby' => 'user_id_header',
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("first_name_$_", undef);
-							<%= text_field "first_name_$_" => '', size => '10',
+							<%= text_field
+								"first_name_$_"   => '',
+								size              => '10',
 								'aria-labelledby' => 'first_name_header',
-								class => 'form-control form-control-sm w-auto' =%>
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("last_name_$_", undef);
-							<%= text_field "last_name_$_" => '', size => '10', 'aria-labelledby' => 'last_name_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"last_name_$_"    => '',
+								size              => '10',
+								'aria-labelledby' => 'last_name_header',
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("email_address_$_", undef);
-							<%= text_field "email_address_$_" => '', 'aria-labelledby' => 'email_address_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"email_address_$_" => '',
+								'aria-labelledby'  => 'email_address_header',
+								class              => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("student_id_$_", undef);
-							<%= text_field "student_id_$_" => '', size => '16',
+							<%= text_field
+								"student_id_$_"   => '',
+								size              => '16',
 								'aria-labelledby' => 'student_id_header',
-								class => 'form-control form-control-sm w-auto' =%>
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("status_$_", undef);
-							<%= select_field "status_$_" => $statusValues, 'aria-labelledby' => 'status_header',
-							class => 'form-select form-select-sm w-auto flex-grow-0' =%>
+							<%= select_field
+								"status_$_"       => $statusValues,
+								'aria-labelledby' => 'status_header',
+								class             => 'form-select form-select-sm w-auto flex-grow-0' =%>
 						</td>
 						<td>
 							% param("section_$_", undef);
-							<%= text_field "section_$_" => '', size => '4', 'aria-labelledby' => 'section_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"section_$_"      => '',
+								size              => '4',
+								'aria-labelledby' => 'section_header',
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("recitation_$_", undef);
-							<%= text_field "recitation_$_" => '', size => '4', 'aria-labelledby' => 'recitation_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"recitation_$_"   => '',
+								size              => '4',
+								'aria-labelledby' => 'recitation_header',
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("comment_$_", undef);
-							<%= text_field "comment_$_" => '', 'aria-labelledby' => 'comment_header',
-								class => 'form-control form-control-sm w-auto' =%>
+							<%= text_field
+								"comment_$_"      => '',
+								'aria-labelledby' => 'comment_header',
+								class             => 'form-control form-control-sm w-auto' =%>
 						</td>
 						<td>
 							% param("permission_$_", undef);
-							<%= select_field "permission_$_" => $permissionValues,
-							'aria-labelledby' => 'permission_header',
-							class => 'form-select form-select-sm w-auto flex-grow-0' =%>
+							<%= select_field
+								"permission_$_"   => $permissionValues,
+								'aria-labelledby' => 'permission_header',
+								class             => 'form-select form-select-sm w-auto flex-grow-0' =%>
 						</td>
 						<td>
 							% param("password_$_", undef);
-							<%= text_field "password_$_" => '', size => '16', 'aria-labelledby' => 'password_header',
-							class => 'form-control form-control-sm w-auto new_password' =%>
+							<%= text_field
+								"password_$_"     => '',
+								size              => '16',
+								'aria-labelledby' => 'password_header',
+								class             => 'form-control form-control-sm w-auto new_password' =%>
 						</td>
 					</tr>
 				% }
@@ -162,8 +193,11 @@
 	% unless ($ce->{courseName} eq $ce->{admin_course_id}) {
 		<p class="my-2"><%= maketext('Select sets below to assign them to the newly-created users.') %></p>
 		% param('assignSets', undef);
-		<%= select_field assignSets => [ map { [ format_set_name_display($_) => $_ ] } $db->listGlobalSets ],
-			size => 10, multiple => undef, class => 'form-select w-auto mb-2' =%>
+		<%= select_field
+			assignSets => [ map { [ format_set_name_display($_) => $_ ] } $db->listGlobalSets ],
+			size       => 10,
+			multiple   => undef,
+			class      => 'form-select w-auto mb-2' =%>
 	% }
 	<p><%= submit_button maketext('Add Users'), name => 'addStudents', class => 'btn btn-primary' =%></p>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/Assigner.html.ep b/templates/ContentGenerator/Instructor/Assigner.html.ep
index 303653c028..a76cde8541 100644
--- a/templates/ContentGenerator/Instructor/Assigner.html.ep
+++ b/templates/ContentGenerator/Instructor/Assigner.html.ep
@@ -12,7 +12,7 @@
 %
 <p>
 	<%= maketext('Select one or more sets and one or more users below to assign/unassign '
-		. 'each selected set to/from all selected users.') =%>
+			. 'each selected set to/from all selected users.') =%>
 </p>
 %
 % $c->stash->{footerWidthClass} = 'col-xl-10 col-md-12';
@@ -56,7 +56,8 @@
 		<div class="row">
 			<div class="col-xl-10 col-md-12">
 				<%= submit_button maketext('Assign selected sets to selected users'),
-					name => 'assign', class => 'btn btn-primary mb-2' =%>
+					name  => 'assign',
+					class => 'btn btn-primary mb-2' =%>
 				<div class="alert alert-danger p-1 mb-2">
 					<div class="mb-1">
 						<%= maketext('Do not unassign students unless you know what you are doing.') =%>
@@ -65,11 +66,14 @@
 				</div>
 				<div class="d-flex align-items-center">
 					<%= submit_button maketext('Unassign selected sets from selected users'),
-						name => 'unassign', class => 'btn btn-primary me-2' =%>
+						name  => 'unassign',
+						class => 'btn btn-primary me-2' =%>
 					<label class="form-check-label">
 						<%= maketext('Read only') =%>
-						<%= radio_button unassignFromAllSafety => 0, checked => undef,
-							class => 'form-check-input mx-1' =%>
+						<%= radio_button
+							unassignFromAllSafety => 0,
+							checked               => undef,
+							class                 => 'form-check-input mx-1' =%>
 					</label>
 					<label class="form-check-label">
 						<%= maketext('Allow unassign') =%>
@@ -81,8 +85,7 @@
 						'When you unassign a set from students, you destroy all of the data for the set for those '
 							. 'students. If the set is re-assigned to these students, then they will receive new '
 							. 'versions of problems in the set.  Make sure this is what you want to do before '
-							. 'unassigning sets from students.'
-					) =%>
+							. 'unassigning sets from students.') =%>
 				</div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/Config.html.ep b/templates/ContentGenerator/Instructor/Config.html.ep
index 6c05f9e613..c5a255bd2c 100644
--- a/templates/ContentGenerator/Instructor/Config.html.ep
+++ b/templates/ContentGenerator/Instructor/Config.html.ep
@@ -40,8 +40,13 @@
 		% end
 		%
 		% content_for config_tabs_content => begin
-			<div class="tab-pane fade show<%= $sectionName eq param('current_tab') ? ' active' : '' %>"
-				id="<%= $id %>" role="tabpanel" aria-labelledby="<%= $id %>-tab" tabindex="0">
+			<div
+				class="tab-pane fade show<%= $sectionName eq param('current_tab') ? ' active' : '' %>"
+				id="<%= $id %>"
+				role="tabpanel"
+				aria-labelledby="<%= $id %>-tab"
+				tabindex="0"
+			>
 				<h2><b><%= maketext($sectionName) %></b></h2>
 				<div class="table-responsive">
 					<table class="table table-bordered align-middle">
@@ -52,14 +57,13 @@
 						</tr>
 						% for my $con (@$configSection) {
 							% my $conobject = $c->objectify($con);
-							% next if (
-								% defined $ce->{permissionLevels}{"change_config_$conobject->{var}"}
-								% && !$authz->hasPermissions(param('user'), "change_config_$conobject->{var}")
-							% );
+							% next
+								% if (defined $ce->{permissionLevels}{"change_config_$conobject->{var}"}
+									% && !$authz->hasPermissions(param('user'), "change_config_$conobject->{var}"));
 							% # Hide sensitive variables from being displayed.
 							% my $default_value = $conobject->get_value($default_ce);
 							% my $current_value = $conobject->get_value($ce3);
-							% my $is_secret = $conobject->{secret} && $default_value eq $current_value ? 1 : 0;
+							% my $is_secret     = $conobject->{secret} && $default_value eq $current_value ? 1 : 0;
 							<tr>
 								<td><%= $conobject->what_string %></td>
 								<td class="text-center">
@@ -80,5 +84,5 @@
 	</nav>
 	<div class="tab-content"><%= content 'config_tabs_content' =%></div>
 	%
-	<p><%= submit_button maketext('Save Changes'), name => 'make_changes',  class => 'btn btn-primary' =%></p>
+	<p><%= submit_button maketext('Save Changes'), name => 'make_changes', class => 'btn btn-primary' =%></p>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/Config/config_help.html.ep b/templates/ContentGenerator/Instructor/Config/config_help.html.ep
index b3113e5ab3..9b0d11e911 100644
--- a/templates/ContentGenerator/Instructor/Config/config_help.html.ep
+++ b/templates/ContentGenerator/Instructor/Config/config_help.html.ep
@@ -9,13 +9,20 @@
 		% }
 	</div>
 	<div>
-		<%= link_to '#', data => { bs_toggle => 'modal', bs_target => "#$configObject->{name}_help_modal" }, begin =%>
+		<%= link_to '#',
+			data => { bs_toggle => 'modal', bs_target => "#$configObject->{name}_help_modal" },
+			begin =%>
 			<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 			<span class="visually-hidden"><%= $configObject->help_link_aria_label %></span>
 		<% end =%>
 		<% content_for 'modal-dialog-area', begin =%>
-			<div class="modal fade" id="<%= "$configObject->{name}_help_modal" %>" tabindex="-1"
-				aria-labelledby="<%= "$configObject->{name}_help_title" %>" aria-hidden="true">
+			<div
+				class="modal fade"
+				id="<%= "$configObject->{name}_help_modal" %>"
+				tabindex="-1"
+				aria-labelledby="<%= "$configObject->{name}_help_title" %>"
+				aria-hidden="true"
+			>
 				<div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
 					<div class="modal-content">
 						<div class="modal-header">
diff --git a/templates/ContentGenerator/Instructor/FileManager.html.ep b/templates/ContentGenerator/Instructor/FileManager.html.ep
index e10aa557be..130336ecce 100644
--- a/templates/ContentGenerator/Instructor/FileManager.html.ep
+++ b/templates/ContentGenerator/Instructor/FileManager.html.ep
@@ -14,8 +14,12 @@
 	% last;
 % }
 %
-<%= form_for current_route, method => 'POST', enctype => 'multipart/form-data',
-	id => 'FileManager', name => 'FileManager', begin =%>
+<%= form_for current_route,
+	method  => 'POST',
+	enctype => 'multipart/form-data',
+	id      => 'FileManager',
+	name    => 'FileManager',
+	begin =%>
 	<%= $c->hidden_authen_fields =%>
 	%
 	% my $action = param('action') || param('formAction') || param('confirmed') || 'Init';
diff --git a/templates/ContentGenerator/Instructor/FileManager/archive.html.ep b/templates/ContentGenerator/Instructor/FileManager/archive.html.ep
index 324bd542f4..3367568216 100644
--- a/templates/ContentGenerator/Instructor/FileManager/archive.html.ep
+++ b/templates/ContentGenerator/Instructor/FileManager/archive.html.ep
@@ -4,16 +4,19 @@
 	<div class="card-body">
 		<div class="mb-3" id="files-label">
 			<%= maketext('The following files have been selected for archiving.  Select the type '
-				. 'of archive and any subset of the requested files.') =%>
+					. 'of archive and any subset of the requested files.') =%>
 		</div>
 		<div class="row">
 			<div class="col-12">
 				<div class="input-group input-group-sm mb-2">
 					<label class="input-group-text" for="archive-filename"><%= maketext('Archive Filename') %>:</label>
-					<%= text_field archive_filename =>
-							@$files == 1 ? $files->[0] =~ s/(\..*)?$/.zip/r : 'webwork_files.zip',
-						id => 'archive-filename', placeholder => maketext('Archive Filename'),
-						class => 'form-control', size => 30, dir => 'ltr' =%>
+					<%= text_field
+						archive_filename => @$files == 1 ? $files->[0] =~ s/(\..*)?$/.zip/r : 'webwork_files.zip',
+						id               => 'archive-filename',
+						placeholder      => maketext('Archive Filename'),
+						class            => 'form-control',
+						size             => 30,
+						dir              => 'ltr' =%>
 				</div>
 			</div>
 		</div>
@@ -21,12 +24,14 @@
 			<div class="col-12 col-lg-6">
 				<div class="input-group input-group-sm mb-2">
 					<label class="input-group-text" for="archive-type"><%= maketext('Archive Type') %>:</label>
-					<%= select_field archive_type => [
+					<%= select_field
+						archive_type => [
 							[ maketext('By extension') => '', selected => undef ],
 							[ 'zip'                    => 'zip' ],
 							[ 'tar'                    => 'tgz' ]
 						],
-						class => 'form-select', id => 'archive-type' =%>
+						class => 'form-select',
+						id    => 'archive-type' =%>
 				</div>
 			</div>
 			<div class="col-12 col-lg-6">
@@ -51,8 +56,14 @@
 		%
 		% # Select all files initially. Even those that are in previously selected directories or subdirectories.
 		% param('files', \@files_to_compress) unless param('confirmed');
-		<%= select_field files => \@files_to_compress, id => 'archive-files', class => 'form-select mb-2',
-			'aria-labelledby' => 'files-label', size => 20, multiple => undef, dir => 'ltr' =%>
+		<%= select_field
+			files             => \@files_to_compress,
+			id                => 'archive-files',
+			class             => 'form-select mb-2',
+			'aria-labelledby' => 'files-label',
+			size              => 20,
+			multiple          => undef,
+			dir               => 'ltr' =%>
 		%
 		<div class="d-flex justify-content-evenly">
 			<%= submit_button maketext('Cancel'), name => 'action', class => 'btn btn-sm btn-secondary' =%>
diff --git a/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep
index fdf30fe01b..3f02eb73d2 100644
--- a/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep
+++ b/templates/ContentGenerator/Instructor/FileManager/refresh.html.ep
@@ -12,7 +12,9 @@
 <div class="row">
 	<div class="col-md-8 mb-2">
 		<div class="input-group input-group-sm">
-			<%= submit_button '^', name  => 'action', $pwd eq '.' || $pwd eq '' ? (disabled => undef) : (),
+			<%= submit_button '^',
+				name => 'action',
+				$pwd eq '.' || $pwd eq '' ? (disabled => undef) : (),
 				class => 'btn btn-sm btn-secondary' =%>
 			<%= select_field directory => $c->directoryMenu($pwd), class => 'form-select', dir => 'ltr' =%>
 		</div>
@@ -32,9 +34,14 @@
 % my $width  = ($c->getFlag('dates') && scalar(@{$files}) > 0) ? '' : ' width:30em';
 <div class="row">
 	<div class="col-md-8 mb-2">
-		<%= select_field files => $files, id => 'files', class => 'form-select font-monospace h-100',
-			dir => 'ltr', size => 17, multiple => undef,
-			data => {
+		<%= select_field
+			files    => $files,
+			id       => 'files',
+			class    => 'form-select font-monospace h-100',
+			dir      => 'ltr',
+			size     => 17,
+			multiple => undef,
+			data     => {
 				link_message         => maketext('Symbolic links cannot be followed.'),
 				non_viewable_message => maketext('This is not a viewable file type.'),
 				close_title          => maketext('Close')
@@ -48,7 +55,8 @@
 			<%= submit_button maketext('Rename'), id => 'Rename', %button =%>
 			<%= submit_button maketext('Copy'), id => 'Copy', %button =%>
 			<%= submit_button maketext('Delete'), id => 'Delete', %button =%>
-			<%= submit_button maketext('Make Archive'), id => 'MakeArchive',
+			<%= submit_button maketext('Make Archive'),
+				id   => 'MakeArchive',
 				data => {
 					archive_text   => maketext('Make Archive'),
 					unarchive_text => maketext('Unpack Archive')
@@ -69,7 +77,10 @@
 <div class="row">
 	<div class="col-md-8">
 		<div class="input-group input-group-sm mb-2">
-			<%= submit_button maketext('Upload'), name => 'action', style => 'width:7em', id => 'Upload',
+			<%= submit_button maketext('Upload'),
+				name  => 'action',
+				style => 'width:7em',
+				id    => 'Upload',
 				class => 'btn btn-sm btn-primary' =%>
 			<%= file_field 'file', id => 'file', class => 'form-control form-control-sm' =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep b/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep
index ab15cf84e3..1603f38765 100644
--- a/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep
+++ b/templates/ContentGenerator/Instructor/FileManager/refresh_edit.html.ep
@@ -7,8 +7,12 @@
 <div class="d-flex">
 	<div class="col-12">
 		% param('data', $contents);
-		<%= text_area data => '', rows => 30, columns => 80, dir => 'auto',
-			class => 'file-manager-editor form-control' =%>
+		<%= text_area
+			data    => '',
+			rows    => 30,
+			columns => 80,
+			dir     => 'auto',
+			class   => 'file-manager-editor form-control' =%>
 	</div>
 </div>
 <div class="row">
diff --git a/templates/ContentGenerator/Instructor/FileManager/view.html.ep b/templates/ContentGenerator/Instructor/FileManager/view.html.ep
index 00519b573e..d74586a52b 100644
--- a/templates/ContentGenerator/Instructor/FileManager/view.html.ep
+++ b/templates/ContentGenerator/Instructor/FileManager/view.html.ep
@@ -1,6 +1,6 @@
 % use WeBWorK::Utils::Files qw(readFile);
 %
-% my $fileManagerURL = $c->systemLink(url_for, params => { download => $filename, pwd => $c->{pwd} } );
+% my $fileManagerURL = $c->systemLink(url_for, params => { download => $filename, pwd => $c->{pwd} });
 %
 % # Include a download link
 <div class="d-flex justify-content-between align-items-center flex-wrap">
@@ -9,7 +9,7 @@
 		<%= link_to maketext('Download') => $fileManagerURL, class => 'btn btn-primary' =%>
 		% if (-T $file) {
 			<%= link_to maketext('Edit') =>
-				$c->systemLink(url_for, params => { action => 'Edit', files => [$filename], pwd => $c->{pwd} } ),
+				$c->systemLink(url_for, params => { action => 'Edit', files => [$filename], pwd => $c->{pwd} }),
 				class => 'btn btn-primary' =%>
 		% }
 	</div>
diff --git a/templates/ContentGenerator/Instructor/Index.html.ep b/templates/ContentGenerator/Instructor/Index.html.ep
index c88f1e1891..2493745188 100644
--- a/templates/ContentGenerator/Instructor/Index.html.ep
+++ b/templates/ContentGenerator/Instructor/Index.html.ep
@@ -1,6 +1,6 @@
 % use Mojo::JSON qw(encode_json);
 %
-% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils                     qw(getAssetURL);
 % use WeBWorK::HTML::ScrollingRecordList qw(scrollingRecordList);
 %
 % content_for js => begin
@@ -78,7 +78,8 @@
 						type="button"
 						role="tab"
 						aria-controls="user-actions"
-						aria-selected="true">\
+						aria-selected="true"
+					>\
 						<%== maketext('User Actions') =%>\
 					</button>
 				</li>
@@ -91,7 +92,8 @@
 						type="button"
 						role="tab"
 						aria-controls="user-set-actions"
-						aria-selected="false">\
+						aria-selected="false"
+					>\
 						<%== maketext('User-Set Actions') =%>\
 					</button>
 				</li>
@@ -104,20 +106,25 @@
 						type="button"
 						role="tab"
 						aria-controls="set-actions"
-						aria-selected="false">\
+						aria-selected="false"
+					>\
 						<%== maketext('Set Actions') =%>\
 					</button>
 				</li>
 			</ul>
 
 			<div class="tab-content row" id="pills-tabContent">
-				<div class="tab-pane fade show active col-lg-6 col-sm-8" id="user-actions" role="tabpanel"
-					aria-labelledby="pills-user-actions-tab">
+				<div
+					class="tab-pane fade show active col-lg-6 col-sm-8"
+					id="user-actions"
+					role="tabpanel"
+					aria-labelledby="pills-user-actions-tab"
+				>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Edit'),
 							name  => 'sets_assigned_to_user',
 							class => 'btn btn-sm btn-secondary',
-							data  => { users_needed => 'exactly one', error_users  => maketext($E_ONE_USER) } =%>
+							data  => { users_needed => 'exactly one', error_users => maketext($E_ONE_USER) } =%>
 						<span class="input-group-text flex-grow-1">\
 							<%== maketext('assignments and dates for <strong>one</strong> user') =%>\
 						</span>
@@ -152,25 +159,33 @@
 					</div>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Email'),
-							name  => 'email_users',
-							class => 'btn btn-sm btn-secondary',
+							name       => 'email_users',
+							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'instructor_mail_merge') =%>
 						<span class="input-group-text flex-grow-1">\
 							<%== maketext('<strong>selected</strong> users') =%>\
 						</span>
 					</div>
 					<div class="input-group input-group-sm mb-2">
-						<%= submit_button maketext('Add'), name => 'add_users',
+						<%= submit_button maketext('Add'),
+							name  => 'add_users',
 							class => 'btn btn-sm btn-secondary' =%>
-						<%= number_field number_of_students => 1, min => 1, max => 100,
-							class => 'form-control form-control-sm text-center' =%>
+						<%= number_field
+							number_of_students => 1,
+							min                => 1,
+							max                => 100,
+							class              => 'form-control form-control-sm text-center' =%>
 						<span class="input-group-text flex-grow-1">\
 							<%== maketext('new user accounts') =%>\
 						</span>
 					</div>
 				</div>
-				<div class="tab-pane fade show offset-xxl-3 offset-lg-2 offset-sm-1 col-xxl-6 col-lg-8 col-sm-10"
-					id="user-set-actions" role="tabpanel" aria-labelledby="pills-user-set-actions-tab">
+				<div
+					class="tab-pane fade show offset-xxl-3 offset-lg-2 offset-sm-1 col-xxl-6 col-lg-8 col-sm-10"
+					id="user-set-actions"
+					role="tabpanel"
+					aria-labelledby="pills-user-set-actions-tab"
+				>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Assign'),
 							# This name is the same as the name of the submit button in Assigner.pm and the form is
@@ -178,7 +193,7 @@
 							name       => 'assign',
 							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'instructor_set_assigner'),
-							data => {
+							data       => {
 								users_needed => 'at least one',
 								error_users  => maketext($E_MIN_ONE_USER),
 								sets_needed  => 'at least one',
@@ -198,9 +213,9 @@
 								sets_needed  => 'at most one',
 								error_sets   => maketext($E_MAX_ONE_SET)
 							} =%>
-						<span class="input-group-text flex-grow-1"><%==
-							maketext('as <strong>one</strong> user on <strong>up to one</strong> set')
-						=%></span>
+						<span class="input-group-text flex-grow-1"
+							><%== maketext('as <strong>one</strong> user on <strong>up to one</strong> set') =%></span
+						>
 					</div>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Edit'),
@@ -208,9 +223,11 @@
 							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'instructor_set_detail'),
 							data       => { sets_needed => 'exactly one', error_sets => maketext($E_ONE_SET) } =%>
-						<span class="input-group-text flex-grow-1"><%==
-							maketext(q{<strong>one</strong> set's details for <strong>some or all</strong> users})
-						=%></span>
+						<span class="input-group-text flex-grow-1"
+							><%==
+								maketext(q{<strong>one</strong> set's details for <strong>some or all</strong> users})
+							=%></span
+						>
 					</div>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('View'),
@@ -218,24 +235,28 @@
 							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'answer_log'),
 							formtarget => 'WW_Info' =%>
-						<span class="input-group-text flex-grow-1"><%==
-							maketext('answer log for <strong>selected</strong> users, '
-								. 'for <strong>selected</strong> sets')
-						=%></span>
+						<span class="input-group-text flex-grow-1"
+							><%== maketext('answer log for <strong>selected</strong> users, '
+									. 'for <strong>selected</strong> sets') =%></span
+						>
 					</div>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Generate'),
 							name       => 'hardcopy',
 							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'hardcopy') =%>
-						<span class="input-group-text flex-grow-1"><%==
-							maketext('PDF hardcopy for <strong>selected</strong> users, '
-								. 'for <strong>selected</strong> sets')
-						=%></span>
+						<span class="input-group-text flex-grow-1"
+							><%== maketext('PDF hardcopy for <strong>selected</strong> users, '
+									. 'for <strong>selected</strong> sets') =%></span
+						>
 					</div>
 				</div>
-				<div class="tab-pane fade show row offset-lg-6 offset-sm-4 col-lg-6 col-sm-8"
-					id="set-actions" role="tabpanel" aria-labelledby="pills-set-actions-tab">
+				<div
+					class="tab-pane fade show row offset-lg-6 offset-sm-4 col-lg-6 col-sm-8"
+					id="set-actions"
+					role="tabpanel"
+					aria-labelledby="pills-set-actions-tab"
+				>
 					<div class="input-group input-group-sm mb-2">
 						<%= submit_button maketext('Edit'),
 							name  => 'users_assigned_to_set',
@@ -277,7 +298,7 @@
 							name       => 'score_sets',
 							class      => 'btn btn-sm btn-secondary',
 							formaction => $c->systemLink(url_for 'instructor_scoring'),
-							data => { sets_needed => 'at least one', error_sets => maketext($E_MIN_ONE_SET) } =%>
+							data       => { sets_needed => 'at least one', error_sets => maketext($E_MIN_ONE_SET) } =%>
 						<span class="input-group-text flex-grow-1">\
 							<%== maketext('<strong>selected</strong> sets') =%>\
 						</span>
@@ -292,12 +313,13 @@
 								error_invalid_set_name => maketext($E_BAD_NAME)
 							} =%>
 						<%= label_for new_set_name => maketext('new set:'), class => 'input-group-text' =%>
-						<%= text_field new_set_name => '',
-							id          => 'new_set_name',
-							placeholder => maketext('New set name'),
-							size        => 20,
-							class       => 'form-control form-control-sm',
-							dir         => 'ltr' =%>
+						<%= text_field
+							new_set_name => '',
+							id           => 'new_set_name',
+							placeholder  => maketext('New set name'),
+							size         => 20,
+							class        => 'form-control form-control-sm',
+							dir          => 'ltr' =%>
 					</div>
 				</div>
 			</div>
diff --git a/templates/ContentGenerator/Instructor/JobManager.html.ep b/templates/ContentGenerator/Instructor/JobManager.html.ep
index 6294fadd64..71f6e53946 100644
--- a/templates/ContentGenerator/Instructor/JobManager.html.ep
+++ b/templates/ContentGenerator/Instructor/JobManager.html.ep
@@ -2,7 +2,7 @@
 %
 % content_for js => begin
 	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),   defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/JobManager/jobmanager.js'), defer => undef =%>
 % end
 %
@@ -27,12 +27,12 @@
 		<%= hidden_field no_visible_jobs => '1' =%>
 	% }
 	%
-	<%= hidden_field primarySortField   => $primarySortField =%>
-	<%= hidden_field primarySortOrder   => $primarySortOrder =%>
+	<%= hidden_field primarySortField => $primarySortField =%>
+	<%= hidden_field primarySortOrder => $primarySortOrder =%>
 	<%= hidden_field secondarySortField => $secondarySortField =%>
 	<%= hidden_field secondarySortOrder => $secondarySortOrder =%>
-	<%= hidden_field ternarySortField   => $ternarySortField =%>
-	<%= hidden_field ternarySortOrder   => $ternarySortOrder =%>
+	<%= hidden_field ternarySortField => $ternarySortField =%>
+	<%= hidden_field ternarySortOrder => $ternarySortOrder =%>
 	%
 	% # Output action forms
 	% for my $form (@$actionForms) {
@@ -41,18 +41,22 @@
 		% content_for 'tab-list' => begin
 			<li class="nav-item" role="presentation">
 				<%= link_to maketext($form->[1]) => "#$form->[0]",
-					class            => "nav-link action-link$active",
-					id               => "$form->[0]-tab",
-					data             => { action => $form->[0], bs_toggle => 'tab', bs_target => "#$form->[0]" },
-					role             => 'tab',
-					'aria-controls'  => $form->[0],
-					'aria-selected'  => $active ? 'true' : 'false' =%>
+					class                        => "nav-link action-link$active",
+					id                           => "$form->[0]-tab",
+					data            => { action => $form->[0], bs_toggle => 'tab', bs_target => "#$form->[0]" },
+					role            => 'tab',
+					'aria-controls' => $form->[0],
+					'aria-selected' => $active ? 'true' : 'false' =%>
 			</li>
 		% end
 		%
 		% content_for 'tab-content' => begin
-			<div class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>" id="<%= $form->[0] %>"
-				role="tabpanel" aria-labelledby="<%= $form->[0] %>-tab">
+			<div
+				class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>"
+				id="<%= $form->[0] %>"
+				role="tabpanel"
+				aria-labelledby="<%= $form->[0] %>-tab"
+			>
 				<%= include "ContentGenerator/Instructor/JobManager/$form->[0]_form" =%>
 			</div>
 		% end
@@ -60,7 +64,9 @@
 	%
 	<%= hidden_field action => $actionForms->[0][0], id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	%
@@ -75,67 +81,77 @@
 				<tr>
 					<th class="text-nowrap">
 						<%= label_for 'select-all', begin =%>
-							<%= check_box 'select-all' => 'on', id => 'select-all',
-								class => 'select-all form-check-input set-id-tooltip',
+							<%= check_box
+								'select-all' => 'on',
+								id           => 'select-all',
+								class        => 'select-all form-check-input set-id-tooltip',
 								'aria-label' => maketext('Select all jobs'),
-								data => {
+								data         => {
 									select_group => 'selected_jobs',
-									bs_toggle => 'tooltip',
+									bs_toggle    => 'tooltip',
 									bs_placement => 'right',
-									bs_title => maketext('Select all jobs')
-							} =%>
+									bs_title     => maketext('Select all jobs')
+								} =%>
 							<i class="fa-solid fa-check-double" aria-hidden="true"></i>
 						<% end =%>
 					</th>
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('Id') => '#', class => 'sort-header',
-								data => { sort_field => 'id' } =%>
+							<%= link_to maketext('Id') => '#',
+								class                  => 'sort-header',
+								data                   => { sort_field => 'id' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'id' =%>
 						</div>
 					</th>
 					% if ($courseID eq $ce->{admin_course_id}) {
 						<th>
 							<div class="d-flex justify-content-between align-items-end gap-1">
-								<%= link_to maketext('Course Id') => '#', class => 'sort-header',
-									data => { sort_field => 'courseID' } =%>
-								<%= include 'ContentGenerator/Instructor/JobManager/sort_button',
-									field => 'course_id' =%>
+								<%= link_to maketext('Course Id') => '#',
+									class                         => 'sort-header',
+									data                          => { sort_field => 'courseID' } =%>
+								<%=
+									include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'course_id'
+								=%>
 							</div>
 						</th>
 					% }
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('Task') => '#', class => 'sort-header',
-								data => { sort_field => 'task' } =%>
+							<%= link_to maketext('Task') => '#',
+								class                    => 'sort-header',
+								data                     => { sort_field => 'task' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'task' =%>
 						</div>
 					</th>
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('Created') => '#', class => 'sort-header',
-								data => { sort_field => 'created' } =%>
+							<%= link_to maketext('Created') => '#',
+								class                       => 'sort-header',
+								data                        => { sort_field => 'created' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'created' =%>
 						</div>
 					</th>
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('Started') => '#', class => 'sort-header',
-								data => { sort_field => 'started' } =%>
+							<%= link_to maketext('Started') => '#',
+								class                       => 'sort-header',
+								data                        => { sort_field => 'started' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'started' =%>
 						</div>
 					</th>
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('Finished') => '#', class => 'sort-header',
-								data => { sort_field => 'finished' } =%>
+							<%= link_to maketext('Finished') => '#',
+								class                        => 'sort-header',
+								data                         => { sort_field => 'finished' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'finished' =%>
 						</div>
 					</th>
 					<th>
 						<div class="d-flex justify-content-between align-items-end gap-1">
-							<%= link_to maketext('State') => '#', class => 'sort-header',
-								data => { sort_field => 'state' } =%>
+							<%= link_to maketext('State') => '#',
+								class                     => 'sort-header',
+								data                      => { sort_field => 'state' } =%>
 							<%= include 'ContentGenerator/Instructor/JobManager/sort_button', field => 'state' =%>
 						</div>
 					</th>
@@ -150,8 +166,11 @@
 							<td><%= $jobID =%></td>
 						% } else {
 							<td>
-								<%= check_box selected_jobs => $jobID, id => "job_${jobID}_checkbox",
-									class => 'form-check-input', $selectedJobs->{$jobID} ? (checked => undef) : () =%>
+								<%= check_box
+									selected_jobs => $jobID,
+									id            => "job_${jobID}_checkbox",
+									class         => 'form-check-input',
+									$selectedJobs->{$jobID} ? (checked => undef) : () =%>
 							</td>
 							<td><%= label_for "job_${jobID}_checkbox" => $jobID =%></td>
 						% }
@@ -164,43 +183,57 @@
 								: $jobs->{$jobID}{task} =%>
 						</td>
 						<td class="text-nowrap">
-							<%= $c->formatDateTime(
-								$jobs->{$jobID}{created}, 'datetime_format_medium', '', $ce->{language}) =%>
+							<%= $c->formatDateTime($jobs->{$jobID}{created},
+								'datetime_format_medium', '', $ce->{language}) =%>
 						</td>
 						<td class="text-nowrap">
 							% if ($jobs->{$jobID}{started}) {
-								<%= $c->formatDateTime(
-									$jobs->{$jobID}{started}, 'datetime_format_medium', '', $ce->{language}) =%>
+								<%= $c->formatDateTime($jobs->{$jobID}{started},
+									'datetime_format_medium', '', $ce->{language}) =%>
 							% }
 						</td>
 						<td class="text-nowrap">
 							% if ($jobs->{$jobID}{finished}) {
-								<%= $c->formatDateTime(
-									$jobs->{$jobID}{finished}, 'datetime_format_medium', '', $ce->{language}) =%>
+								<%= $c->formatDateTime($jobs->{$jobID}{finished},
+									'datetime_format_medium', '', $ce->{language}) =%>
 							% }
 						</td>
 						<td>
 							<div class="d-flex justify-content-between gap-1">
 								<%= maketext($jobs->{$jobID}{state}) =%>
 								% if (defined $jobs->{$jobID}{result}) {
-									<a role="button" class="result-btn" tabindex="0" data-bs-toggle="modal" href="#"
-										data-bs-target="<%= "#result-$jobID" %>">
+									<a
+										role="button"
+										class="result-btn"
+										tabindex="0"
+										data-bs-toggle="modal"
+										href="#"
+										data-bs-target="<%= "#result-$jobID" %>"
+									>
 										<i class="fa-solid fa-circle-info fa-xl" aria-hidden="true"></i>
 										<span class="visually-hidden">
 											<%= maketext('Result for job [_1]', $jobID) %>
 										</span>
 									</a>
-									<div class="result-modal modal fade" id="<%= "result-$jobID" %>" tabindex="-1"
-										aria-labelledby="<%= "result-$jobID-label" %>" aria-hidden="true">
+									<div
+										class="result-modal modal fade"
+										id="<%= "result-$jobID" %>"
+										tabindex="-1"
+										aria-labelledby="<%= "result-$jobID-label" %>"
+										aria-hidden="true"
+									>
 										<div class="modal-dialog modal-dialog-centered modal-lg">
 											<div class="modal-content">
 												<div class="modal-header">
 													<h1 class="modal-title fs-5" id="<%= "result-$jobID-label" %>">
 														<%= maketext('Result for job [_1]', $jobID) %>
 													</h1>
-													<button type="button" class="btn-close" data-bs-dismiss="modal"
-														aria-label="<%= maketext("Close") %>">
-													</button>
+													<button
+														type="button"
+														class="btn-close"
+														data-bs-dismiss="modal"
+														aria-label="<%= maketext("Close") %>"
+													></button>
 												</div>
 												<div class="modal-body">
 													% if (ref($jobs->{$jobID}{result}) eq 'ARRAY') {
diff --git a/templates/ContentGenerator/Instructor/JobManager/delete_form.html.ep b/templates/ContentGenerator/Instructor/JobManager/delete_form.html.ep
index 944a84c44e..9bba8c8c7d 100644
--- a/templates/ContentGenerator/Instructor/JobManager/delete_form.html.ep
+++ b/templates/ContentGenerator/Instructor/JobManager/delete_form.html.ep
@@ -1,13 +1,14 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for delete_select => maketext('Delete which jobs?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			delete_select => maketext('Delete which jobs?'),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.delete.scope' => [
-					[ maketext('no jobs')       => 'none', selected => undef ],
-					[ maketext('selected jobs') => 'selected' ]
-				],
-				id => 'delete_select', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.delete.scope' => [ [ maketext('no jobs') => 'none', selected => undef ],
+					[ maketext('selected jobs') => 'selected' ] ],
+				id    => 'delete_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/JobManager/filter_form.html.ep b/templates/ContentGenerator/Instructor/JobManager/filter_form.html.ep
index 98d0fe2970..7d47e47504 100644
--- a/templates/ContentGenerator/Instructor/JobManager/filter_form.html.ep
+++ b/templates/ContentGenerator/Instructor/JobManager/filter_form.html.ep
@@ -1,28 +1,34 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for filter_select => maketext('Show which jobs?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			filter_select => maketext('Show which jobs?'),
+			class         => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.filter.scope' => [
+			<%= select_field
+				'action.filter.scope' => [
 					[ maketext('all jobs')                          => 'all' ],
 					[ maketext('selected jobs')                     => 'selected' ],
 					[ maketext('jobs that match on selected field') => 'match_regex', selected => undef ]
 				],
-				id => 'filter_select', class => 'form-select form-select-sm' =%>
+				id    => 'filter_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="filter_elements">
 		<div class="row mb-2">
-			<%= label_for 'filter_type_select' => maketext('What field should filtered jobs match on?'),
-				class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+			<%= label_for
+				'filter_type_select' => maketext('What field should filtered jobs match on?'),
+				class                => 'col-form-label col-form-label-sm col-sm-auto' =%>
 			<div class="col-auto">
-				<%= select_field 'action.filter.field' => [
-						[ maketext('Id')    => 'id', selected => undef ],
-						$courseID eq $ce->{admin_course_id} ? [ maketext('Course Id')    => 'courseID' ] : (),
+				<%= select_field
+					'action.filter.field' => [
+						[ maketext('Id') => 'id', selected => undef ],
+						$courseID eq $ce->{admin_course_id} ? [ maketext('Course Id') => 'courseID' ] : (),
 						[ maketext('Task')  => 'task' ],
 						[ maketext('State') => 'state' ]
 					],
-					id => 'filter_type_select', class => 'form-select form-select-sm' =%>
+					id    => 'filter_type_select',
+					class => 'form-select form-select-sm' =%>
 			</div>
 		</div>
 		<div class="row mb-2">
@@ -30,8 +36,11 @@
 				<%= maketext('Filter by what text?') %><span class="required-field">*</span>
 			<% end =%>
 			<div class="col-auto">
-				<%= text_field 'action.filter.text' => '', id => 'filter_text', 'aria-required' => 'true',
-					class => 'form-control form-control-sm' =%>
+				<%= text_field
+					'action.filter.text' => '',
+					id                   => 'filter_text',
+					'aria-required'      => 'true',
+					class                => 'form-control form-control-sm' =%>
 			</div>
 		</div>
 	</div>
diff --git a/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep b/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep
index aa6707afac..c2e21c7c20 100644
--- a/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep
+++ b/templates/ContentGenerator/Instructor/JobManager/sort_button.html.ep
@@ -1,6 +1,9 @@
 % if ($primarySortField eq $field) {
-	<button type="button" data-sort-priority="primary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="primary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		1
 		% if ($primarySortOrder eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
@@ -11,8 +14,11 @@
 		% }
 	</button>
 % } elsif ($secondarySortField eq $field) {
-	<button type="button" data-sort-priority="secondary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="secondary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		2
 		% if ($secondarySortOrder eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
@@ -23,8 +29,11 @@
 		% }
 	</button>
 % } elsif ($ternarySortField eq $field) {
-	<button type="button" data-sort-priority="ternary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="ternary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		3
 		% if ($ternarySortOrder eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
diff --git a/templates/ContentGenerator/Instructor/JobManager/sort_form.html.ep b/templates/ContentGenerator/Instructor/JobManager/sort_form.html.ep
index 5505d718d4..c4262b5dcf 100644
--- a/templates/ContentGenerator/Instructor/JobManager/sort_form.html.ep
+++ b/templates/ContentGenerator/Instructor/JobManager/sort_form.html.ep
@@ -2,29 +2,35 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_1 => maketext('Sort by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_1 => maketext('Sort by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary' => [
+					<%= select_field
+						'action.sort.primary' => [
 							map { [
 								maketext($_->[1]) => $_->[0],
 								$_->[0] eq 'created' ? (selected => undef) : ()
 							] } @$fields
 						],
-						id => 'sort_select_1', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_1 => maketext('Ordered') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_1 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_1', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.primary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
@@ -32,29 +38,32 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_2 => maketext('Then by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_2 => maketext('Then by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary' => [
-							map { [
-								maketext($_->[1]) => $_->[0],
-								$_->[0] eq 'task' ? (selected => undef) : ()
-							] } @$fields
-						],
-						id => 'sort_select_2', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.secondary' =>
+						[ map { [ maketext($_->[1]) => $_->[0], $_->[0] eq 'task' ? (selected => undef) : () ] }
+							@$fields ],
+						id    => 'sort_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_2 => maketext('Ordered') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_2 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_2', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.secondary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
@@ -62,29 +71,32 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_3 => maketext('Then by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_3 => maketext('Then by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.ternary' => [
-							map { [
-								maketext($_->[1]) => $_->[0],
-								$_->[0] eq 'state' ? (selected => undef) : ()
-							] } @$fields
-						],
-						id => 'sort_select_3', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.ternary' =>
+						[ map { [ maketext($_->[1]) => $_->[0], $_->[0] eq 'state' ? (selected => undef) : () ] }
+							@$fields ],
+						id    => 'sort_select_3',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_3 => maketext('Ordered') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_3 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.ternary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_3', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.ternary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_3',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/LTIUpdate.html.ep b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
index ed37539383..f86e27f0fa 100644
--- a/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
+++ b/templates/ContentGenerator/Instructor/LTIUpdate.html.ep
@@ -23,7 +23,10 @@
 % # Status table
 <div class="table-responsive">
 	<table class="table table-bordered w-auto">
-		<tr><th><%= maketext('LTI Grade Mode') %></th><td><%= $ce->{LTIGradeMode} %></td></tr>
+		<tr>
+			<th><%= maketext('LTI Grade Mode') %></th>
+			<td><%= $ce->{LTIGradeMode} %></td>
+		</tr>
 		<tr>
 			<th><%= maketext('Update Interval') %></th>
 			<td><%= $updateInterval > -1 ? $c->format_interval($updateInterval) : maketext('Never') %></td>
@@ -31,9 +34,9 @@
 		<tr>
 			<th><%= maketext('Last Full Update') %></th>
 			<td>
-				<%= $lastUpdate
-					? $c->formatDateTime($lastUpdate, $ce->{studentDateDisplayFormat})
-					: maketext('Never') =%>
+				<%=
+					$lastUpdate ? $c->formatDateTime($lastUpdate, $ce->{studentDateDisplayFormat}) : maketext('Never')
+				=%>
 			</td>
 		</tr>
 		% if ($updateInterval > -1) {
@@ -51,28 +54,31 @@
 	<div class="row mb-3">
 		<%= label_for updateUserID => maketext('Update user:'), class => 'col-auto col-form-label fw-bold' =%>
 		<div class="col-auto">
-			<%= select_field updateUserID => [
+			<%= select_field
+				updateUserID => [
 					[
 						maketext('All Users') => '',
-						selected             => undef,
+						selected              => undef,
 						$ce->{LTIGradeMode} eq 'homework' ? (data => { sets => join(':', @$sets) }) : (),
 					],
 					$ce->{LTIGradeMode} eq 'homework'
 					? (map { [ $_ => $_, data => { sets => join(':', sort @{ $userSets->{$_} }) } ] } @$users)
 					: (@$users)
 				],
-				id => 'updateUserID', class => 'form-select' =%>
+				id    => 'updateUserID',
+				class => 'form-select' =%>
 		</div>
 	</div>
 	% if ($ce->{LTIGradeMode} eq 'homework') {
 		<div class="row">
 			<div class="col-auto">
 				<%= label_for updateSetID => maketext('Update selected sets:'), class => 'col-form-label fw-bold' =%>
-				<%= select_field updateSetID => [ map { [ format_set_name_display($_) => $_ ] } @$sets ],
-					id       => 'updateSetID',
-					class    => 'form-select',
-					multiple => undef,
-					size     => 10 =%>
+				<%= select_field
+					updateSetID => [ map { [ format_set_name_display($_) => $_ ] } @$sets ],
+					id          => 'updateSetID',
+					class       => 'form-select',
+					multiple    => undef,
+					size        => 10 =%>
 			</div>
 		</div>
 		<div class="row mb-3">
@@ -86,6 +92,8 @@
 			</div>
 		</div>
 	% }
-	<%= submit_button maketext('Update Grades'), id => 'updateLTI', name => 'updateLTI',
+	<%= submit_button maketext('Update Grades'),
+		id    => 'updateLTI',
+		name  => 'updateLTI',
 		class => 'btn btn-primary mb-3' =%>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
index ad3cdcaaa2..f356f87891 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor.html.ep
@@ -1,14 +1,14 @@
 % use Mojo::URL;
 % use Mojo::Util qw(url_escape);
 %
-% use WeBWorK::Utils qw(not_blank x getAssetURL);
-% use WeBWorK::Utils::Files qw(readFile);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils                  qw(not_blank x getAssetURL);
+% use WeBWorK::Utils::Files           qw(readFile);
+% use WeBWorK::Utils::Sets            qw(format_set_name_display);
 % use WeBWorK::HTML::CodeMirrorEditor qw(generate_codemirror_html output_codemirror_static_files);
 %
 % content_for js => begin
 	<%= output_codemirror_static_files($c) =%>
-	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),           defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/PGProblemEditor/pgproblemeditor.js'), defer => undef =%>
 % end
 %
@@ -51,7 +51,8 @@
 %
 % my $fileInfo = begin
 	<div class="mb-2">
-		<%= tag 'div', class => 'set-file-info' . ($c->isTempEditFilePath($c->{inputFilePath}) ? ' temporaryFile' : ''),
+		<%= tag 'div',
+			class => 'set-file-info' . ($c->isTempEditFilePath($c->{inputFilePath}) ? ' temporaryFile' : ''),
 			begin =%>
 			<i>
 				<%== $c->{file_type} eq 'problem'
@@ -59,15 +60,23 @@
 						'Editing <strong>problem [_1] of set [_2]</strong> in file "[_3]".',
 						$c->{prettyProblemNumber},
 						tag('span', dir => 'ltr', format_set_name_display($setName)),
-						tag('span', dir => 'ltr', class => 'current-file',
-							data => { tmp_file => $c->shortPath($c->{tempFilePath}) },
-							$c->shortPath($c->{inputFilePath}))
+						tag(
+							'span',
+							dir   => 'ltr',
+							class => 'current-file',
+							data  => { tmp_file => $c->shortPath($c->{tempFilePath}) },
+							$c->shortPath($c->{inputFilePath})
 						)
+					)
 					: maketext(
 						$titles{ $c->{file_type} },
-						tag('span', dir => 'ltr', class => 'current-file',
-							data => { tmp_file => $c->shortPath($c->{tempFilePath}) },
-							$c->shortPath($c->{inputFilePath}))
+						tag(
+							'span',
+							dir   => 'ltr',
+							class => 'current-file',
+							data  => { tmp_file => $c->shortPath($c->{tempFilePath}) },
+							$c->shortPath($c->{inputFilePath})
+						)
 					) =%>
 			</i>
 		<% end =%>
@@ -75,8 +84,14 @@
 % end
 <%= $fileInfo->() %>
 %
-<%= form_for current_route, method => 'POST', id => 'editor', name => 'editor',
-	enctype => 'application/x-www-form-urlencoded', class => 'col-12', novalidate => undef, begin =%>
+<%= form_for current_route,
+	method     => 'POST',
+	id         => 'editor',
+	name       => 'editor',
+	enctype    => 'application/x-www-form-urlencoded',
+	class      => 'col-12',
+	novalidate => undef,
+	begin =%>
 	<%= $c->hidden_authen_fields =%>
 	<%= hidden_field file_type => $c->{file_type} =%>
 	<%= hidden_field courseID => $c->{courseID} =%>
@@ -105,93 +120,88 @@
 		% # PG problem authoring resource links
 		<div class="mb-2">
 			<%= link_to maketext('Sample Problems') => url_for('sample_problem_index'),
-				target => 'techniques_window',
-				title  => maketext('Sample problem code with documentation.'),
-				class  => 'reference-link btn btn-sm btn-info',
-				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+				target                              => 'techniques_window',
+				title                               => maketext('Sample problem code with documentation.'),
+				class                               => 'reference-link btn btn-sm btn-info',
+				data                                => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
 			<%= link_to maketext('Math Objects') => $ce->{webworkURLs}{MathObjectsHelpURL},
-				target => 'math_objects',
-				title  => maketext('Wiki summary page for MathObjects'),
-				class  => 'reference-link btn btn-sm btn-info',
-				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+				target                           => 'math_objects',
+				title                            => maketext('Wiki summary page for MathObjects'),
+				class                            => 'reference-link btn btn-sm btn-info',
+				data                             => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
 			% # PG POD served locally
 			<%= link_to maketext('POD') => url_for('pod_index'),
-				target => 'pod_docs',
-				title  => maketext('Documentation from source code for PG modules and macro files.'),
-				class  => 'reference-link btn btn-sm btn-info',
-				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+				target                  => 'pod_docs',
+				title                   => maketext('Documentation from source code for PG modules and macro files.'),
+				class                   => 'reference-link btn btn-sm btn-info',
+				data                    => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
 			% # PGML lab problem rendered as an unattached problem in a new window.
 			% my $pgml_lab_source = readFile("$ce->{webworkDirs}{assets}/pg/PGMLLab/PGML-lab.pg");
-			<%= tag 'button', type => 'button',
-				title  => maketext(
-					'PG markdown syntax used to format WeBWorK questions. '
-					. 'This interactive lab can help you to learn the techniques.'
-				),
+			<%= tag 'button',
+				type  => 'button',
+				title => maketext('PG markdown syntax used to format WeBWorK questions. '
+					. 'This interactive lab can help you to learn the techniques.'),
 				class => 'reference-link pgml-lab btn btn-sm btn-info',
 				data  => { source => url_escape($pgml_lab_source), bs_toggle => 'tooltip', bs_placement => 'top' },
 				'PGML' =%>
 			<%= link_to maketext('Author Info') => $ce->{webworkURLs}{AuthorHelpURL},
-				target => 'author_info',
-				title  => maketext('Top level of author information on the wiki.'),
-				class  => 'reference-link btn btn-sm btn-info',
-				data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+				target                          => 'author_info',
+				title                           => maketext('Top level of author information on the wiki.'),
+				class                           => 'reference-link btn btn-sm btn-info',
+				data                            => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
 			% # Only show the report bugs in problem button if editing an OPL or Contrib problem.
 			% if ($ce->{webworkURLs}{OPLBugReporter}
 				% && $c->{editFilePath} =~ m|^$ce->{courseDirs}{templates}/([^/]*)/|
 				% && ($1 eq 'Library' || $1 eq 'Contrib'))
 			% {
 				<%= link_to maketext('Report Bugs in this Problem') =>
-						Mojo::URL->new($ce->{webworkURLs}{OPLBugReporter})
-							->query(
-								title => $c->getRelativeSourceFilePath($c->{editFilePath}),
-								body  => "Problem Seed: " . (param('action.view.seed') // $c->{problemSeed})
-							),
+					Mojo::URL->new($ce->{webworkURLs}{OPLBugReporter})->query(
+						title => $c->getRelativeSourceFilePath($c->{editFilePath}),
+						body  => "Problem Seed: " . (param('action.view.seed') // $c->{problemSeed})
+					),
 					target => 'bug_report',
-					title  => maketext(
-						'Report bugs in a WeBWorK question/problem using this link. '
+					title  => maketext('Report bugs in a WeBWorK question/problem using this link. '
 						. 'The very first time you do this you will need to register with an email address so that '
-						. 'information on the bug fix can be reported back to you.'
-					),
-					class  => 'reference-link btn btn-sm btn-info',
-					data   => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
+						. 'information on the bug fix can be reported back to you.'),
+					class => 'reference-link btn btn-sm btn-info',
+					data  => { bs_toggle => 'tooltip', bs_placement => 'top' } =%>
 			% }
 		</div>
 	% }
 	<div id="pgedit-container" class="mb-2">
 		<div class="pgedit-inner-container">
 			<div class="pgedit-panel code order-last order-lg-first">
-				<%= generate_codemirror_html(
-					$c,
-					'problemContents',
-					$problemContents,
-					{ course_info => 'html', hardcopy_theme => 'xml' }->{ $c->{file_type} } // 'pg'
-				) =%>
+				<%= generate_codemirror_html($c, 'problemContents', $problemContents,
+					{ course_info => 'html', hardcopy_theme => 'xml' }->{ $c->{file_type} } // 'pg') =%>
 			</div>
-            <div class="pgedit-resizer horizontal-resizer"
-                tabindex="0"
-                role="separator"
-                aria-hidden="vertical"
-                aria-label="horizontally resize panels"
-            >
+			<div
+				class="pgedit-resizer horizontal-resizer"
+				tabindex="0"
+				role="separator"
+				aria-hidden="vertical"
+				aria-label="horizontally resize panels"
+			>
 				<i class="fa-solid fa-grip-lines-vertical fa-lg" aria-hidden="true"></i>
 			</div>
 			<div class="pgedit-panel render mb-lg-0 order-first order-lg-last">
 				<div class="p-0" id="pgedit-render-area">
-					<div class="placeholder d-flex flex-column justify-content-center
-						 align-items-center bg-secondary-subtle h-100">
+					<div
+						class="placeholder d-flex flex-column justify-content-center
+						 align-items-center bg-secondary-subtle h-100"
+					>
 						<div class="fs-1"><%= maketext('Loading...') %></div>
 						<i class="fa-solid fa-spinner fa-spin fa-2x"></i>
 					</div>
 				</div>
 			</div>
 		</div>
-        <div
-            class="pgedit-resizer vertical-resizer"
-            tabindex="0"
-            role="separator"
-            aria-orientation="horizontal"
-            aria-label="vertically resize panels"
-        >
+		<div
+			class="pgedit-resizer vertical-resizer"
+			tabindex="0"
+			role="separator"
+			aria-orientation="horizontal"
+			aria-label="vertically resize panels"
+		>
 			<i class="fa-solid fa-grip-lines fa-lg" aria-hidden="true"></i>
 		</div>
 	</div>
@@ -206,16 +216,15 @@
 		% my $disabled =
 			% ($actionID eq 'revert' && (!defined($c->{tempFilePath}) || !-e $c->{tempFilePath}) && !$c->getBackupTimes)
 			% || ($actionID eq 'save' && $line_contents eq '')
-			% || ($actionID eq 'add_problem' && $c->{is_pg} && $line_contents eq '')
-				% ? ' disabled' : '';
+			% || ($actionID eq 'add_problem' && $c->{is_pg} && $line_contents eq '') ? ' disabled' : '';
 		%
 		% if (($line_contents && $line_contents ne '') || $disabled) {
 			% unless ($default_choice) { $active = ' active'; $default_choice = $actionID; }
 			% content_for 'tab-list' => begin
 				<li class="nav-item" role="presentation">
 					<%= link_to maketext($actionFormTitles->{$actionID}) => "#$actionID",
-						class           => "nav-link action-link$active$disabled",
-						id              => "$actionID-tab",
+						class                                            => "nav-link action-link$active$disabled",
+						id                                               => "$actionID-tab",
 						data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
 						role            => 'tab',
 						'aria-controls' => $actionID,
@@ -223,8 +232,12 @@
 				</li>
 			% end
 			% content_for 'tab-content' => begin
-				<div class="tab-pane fade <%= $active ? "show$active" : '' %>"
-					id="<%= $actionID %>" role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+				<div
+					class="tab-pane fade <%= $active ? "show$active" : '' %>"
+					id="<%= $actionID %>"
+					role="tabpanel"
+					aria-labelledby="<%= $actionID %>-tab"
+				>
 					<%= $line_contents %>
 				</div>
 			% end
@@ -233,11 +246,15 @@
 	%
 	<%= hidden_field action => $default_choice, id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	<div>
-		<%= submit_button maketext($actionFormTitles->{$default_choice}), name => 'submit', id => 'take_action',
+		<%= submit_button maketext($actionFormTitles->{$default_choice}),
+			name  => 'submit',
+			id    => 'take_action',
 			class => 'btn btn-primary' =%>
 	</div>
 <% end =%>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
index 04a008d9f5..aafd0a79cc 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/add_problem_form.html.ep
@@ -4,27 +4,31 @@
 %
 <div>
 	<div class="row align-items-center mb-2">
-		<%= label_for action_add_problem_target_set_id => maketext('Add to what set?'),
-			class => 'col-form-label col-auto' =%>
+		<%= label_for
+			action_add_problem_target_set_id => maketext('Add to what set?'),
+			class                            => 'col-form-label col-auto' =%>
 		<div class="col-auto">
 			<%= select_field 'action.add_problem.target_set' => [
-					map {
-						[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
-					} @{ $c->{globalSets} }
+				map {
+					[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
+				} @{ $c->{globalSets} }
 				],
-				id => 'action_add_problem_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
-				dir => 'ltr' =%>
+				id    => 'action_add_problem_target_set_id',
+				class => 'form-select form-select-sm d-inline w-auto',
+				dir   => 'ltr' =%>
 		</div>
 	</div>
 	<div class="row align-items-center mb-2">
-		<%= label_for action_add_problem_file_type_id => maketext('Add as what filetype?'),
-			class => 'col-form-label col-auto' =%>
+		<%= label_for
+			action_add_problem_file_type_id => maketext('Add as what filetype?'),
+			class                           => 'col-form-label col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.add_problem.file_type' => [
-					map { [ $_ =~ s/_/ /gr => $_, $c->{file_type} eq $_ ? (selected => undef) : () ] }
-					('problem', 'set_header', 'hardcopy_header')
-				],
-				id => 'action_add_problem_file_type_id', class => 'form-select form-select-sm d-inline w-auto' =%>
+			<%= select_field
+				'action.add_problem.file_type' =>
+				[ map { [ $_ =~ s/_/ /gr => $_, $c->{file_type} eq $_ ? (selected => undef) : () ] }
+					('problem', 'set_header', 'hardcopy_header') ],
+				id    => 'action_add_problem_file_type_id',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
 		</div>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep
index f606f8aee4..ef7c5b4e8e 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/code_maintenance_form.html.ep
@@ -1,46 +1,68 @@
 % last unless $c->{is_pg};
 <div>
 	<div class="form-check">
-		<%= radio_button 'action.code_maintenance' => 'tidyPGCode',
-			id => 'action_code_maintenance_perltidy', class => 'form-check-input', checked => undef  =%>
+		<%= radio_button
+			'action.code_maintenance' => 'tidyPGCode',
+			id                        => 'action_code_maintenance_perltidy',
+			class                     => 'form-check-input',
+			checked                   => undef =%>
 		<%= label_for 'action_code_maintenance_perltidy', class => 'form-check-label', begin =%>
 			<%== maketext('Reformat the code using perltidy.') =%>
 		<% end =%>
-		<a class="help-popup" data-bs-content="<%== maketext('Perltidy is a reformatting '
-			. 'function that attempts to format code in a standard way.  It does not change '
-			. 'the functionality of the code and in general is desired to have a common problem layout.') =%>"
-			data-bs-placement="top" data-bs-toggle="popover" role="button">
+		<a
+			class="help-popup"
+			data-bs-content="<%== maketext('Perltidy is a reformatting '
+					. 'function that attempts to format code in a standard way.  It does not change '
+					. 'the functionality of the code and in general is desired to have a common problem layout.') =%>"
+			data-bs-placement="top"
+			data-bs-toggle="popover"
+			role="button"
+		>
 			<i aria-hidden="true" class="fas fa-question-circle"></i>
 			<span class="visually-hidden"><%= maketext('Perltidy Help') %></span>
 		</a>
 	</div>
 	% if ($c->{file_type} !~ /header/) {
 		<div class="form-check">
-			<%= radio_button 'action.code_maintenance' => 'convertCodeToPGML',
-				id => 'action_code_maintenance_convert_PGML', class => 'form-check-input'=%>
+			<%= radio_button
+				'action.code_maintenance' => 'convertCodeToPGML',
+				id                        => 'action_code_maintenance_convert_PGML',
+				class                     => 'form-check-input' =%>
 			<%= label_for 'action_code_maintenance_convert_PGML', class => 'form-check-label', begin =%>
 				<%== maketext('Convert the code to PGML') =%>
 			<% end =%>
-			<a class="help-popup" data-bs-content="<%== maketext('This option converts the text blocks '
-				. 'in the problem code to PGML and updates the loadMacros to include PGML and drop others. '
-				. 'This can be used as a first pass of the conversion, however the author will still need '
-				. 'to ensure the problem functions.  One area of attention should be the answer blanks, '
-				. 'which may not be converted correctly.') =%>"
-				data-bs-placement="top" data-bs-toggle="popover" role="button">
+			<a
+				class="help-popup"
+				data-bs-content="<%== maketext('This option converts the text blocks '
+						. 'in the problem code to PGML and updates the loadMacros to include PGML and drop others. '
+						. 'This can be used as a first pass of the conversion, however the author will still need '
+						. 'to ensure the problem functions.  One area of attention should be the answer blanks, '
+						. 'which may not be converted correctly.') =%>"
+				data-bs-placement="top"
+				data-bs-toggle="popover"
+				role="button"
+			>
 				<i aria-hidden="true" class="fas fa-question-circle"></i>
 				<span class="visually-hidden"><%= maketext('PGML Conversion Help') %></span>
 			</a>
 		</div>
 		<div class="form-check">
-			<%= radio_button 'action.code_maintenance' => 'runPGCritic',
-				id => 'action_code_maintenance_run_pgcritic', class => 'form-check-input'=%>
+			<%= radio_button
+				'action.code_maintenance' => 'runPGCritic',
+				id                        => 'action_code_maintenance_run_pgcritic',
+				class                     => 'form-check-input' =%>
 			<%= label_for 'action_code_maintenance_run_pgcritic', class => 'form-check-label', begin =%>
 				<%== maketext('Analyze code with PG Critic') =%>
 			<% end =%>
-			<a class="help-popup" data-bs-content="<%== maketext('This option analyzes the code with PG Critic '
-				. 'which gives suggestions on using modern PG constructs and ensures that the code conforms '
-				. 'to current best-practices.') =%>"
-				data-bs-placement="top" data-bs-toggle="popover" role="button">
+			<a
+				class="help-popup"
+				data-bs-content="<%== maketext('This option analyzes the code with PG Critic '
+						. 'which gives suggestions on using modern PG constructs and ensures that the code conforms '
+						. 'to current best-practices.') =%>"
+				data-bs-placement="top"
+				data-bs-toggle="popover"
+				role="button"
+			>
 				<i aria-hidden="true" class="fas fa-question-circle"></i>
 				<span class="visually-hidden"><%= maketext('PG Critic Help') %></span>
 			</a>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
index 7da5e8d800..5383f518ee 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/file_chooser.html.ep
@@ -1,13 +1,20 @@
 <h2 class="my-3">Choose File to Edit</h2>
 %
-<%= form_for current_route, method => 'POST', name => 'pg-editor-file-chooser',
-	class => 'needs-validation', novalidate => undef, begin =%>
+<%= form_for current_route,
+	method     => 'POST',
+	name       => 'pg-editor-file-chooser',
+	class      => 'needs-validation',
+	novalidate => undef,
+	begin =%>
 	<%= hidden_field courseID => $c->{courseID} =%>
 	<div class="row align-items-center mb-3">
 		<div class="col-auto">
 			<div class="form-check">
-				<%= radio_button file_type => 'blank_problem',
-					id => 'new_problem', checked => undef, class => 'form-check-input' %>
+				<%= radio_button
+					file_type => 'blank_problem',
+					id        => 'new_problem',
+					checked   => undef,
+					class     => 'form-check-input' %>
 				<%= label_for new_problem => maketext('New problem template'), class => 'form-check-label' =%>
 			</div>
 		</div>
@@ -15,16 +22,22 @@
 	<div class="row align-items-center mb-3">
 		<div class="col-auto">
 			<div class="form-check">
-				<%= radio_button file_type => 'source_path_for_problem_file',
-					id => 'file_path', class => 'form-check-input' %>
+				<%= radio_button
+					file_type => 'source_path_for_problem_file',
+					id        => 'file_path',
+					class     => 'form-check-input' %>
 				<%= label_for file_path => maketext('File:'), class => 'form-check-label' =%>
 			</div>
 		</div>
 		<div class="col-auto" dir="ltr">
 			<div class="editor-save-path input-group input-group-sm">
 				<%= label_for source_file_path => '[TMPL]/', class => 'input-group-text' =%>
-				<%= text_field sourceFilePath => '',
-					id => 'source_file_path', class => 'form-control form-control-sm', size => 60, dir  => 'ltr' =%>
+				<%= text_field
+					sourceFilePath => '',
+					id             => 'source_file_path',
+					class          => 'form-control form-control-sm',
+					size           => 60,
+					dir            => 'ltr' =%>
 				<div class="invalid-feedback">
 					<%= maketext('Please enter a file with path relative to the course templates directory.') %>
 				</div>
@@ -34,19 +47,25 @@
 	<div class="row align-items-center mb-3">
 		<div class="col-auto">
 			<div class="form-check">
-				<%= radio_button file_type => 'sample_problem',
-					id => 'sample_problem', class => 'form-check-input' %>
+				<%= radio_button
+					file_type => 'sample_problem',
+					id        => 'sample_problem',
+					class     => 'form-check-input' %>
 				<%= label_for sample_problem => maketext('Sample problem:'), class => 'form-check-label' =%>
 			</div>
 		</div>
 		<div class="col-auto">
 			<div class="col-auto">
-				<%= select_field sampleProblemFile => [
-						[maketext('Choose Sample Problem') => '', selected => undef, disabled => undef],
-						map { [ $sampleProblemMetadata->{$_}{name} => "$sampleProblemMetadata->{$_}{dir}/$_" ] }
-							sort { $sampleProblemMetadata->{$a}{name} cmp $sampleProblemMetadata->{$b}{name} }
-							keys %$sampleProblemMetadata
-					], id => 'sample_problem_file', class => 'form-select', 'aria-labelledby' => 'sample_problem' =%>
+				<%= select_field
+					sampleProblemFile => [
+						[ maketext('Choose Sample Problem') => '', selected => undef, disabled => undef ],
+						map  { [ $sampleProblemMetadata->{$_}{name} => "$sampleProblemMetadata->{$_}{dir}/$_" ] }
+						sort { $sampleProblemMetadata->{$a}{name} cmp $sampleProblemMetadata->{$b}{name} }
+						keys %$sampleProblemMetadata
+					],
+					id                => 'sample_problem_file',
+					class             => 'form-select',
+					'aria-labelledby' => 'sample_problem' =%>
 				<div class="invalid-feedback"><%= maketext('Please select a problem.') %></div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
index c3796749cc..52a10b3bde 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/hardcopy_form.html.ep
@@ -3,11 +3,13 @@
 <div>
 	% if ($c->{file_type} !~ /header/) {
 		<div class="row align-items-center">
-			<%= label_for action_hardcopy_seed_id => maketext('Using what seed?'),
-				class => 'col-form-label col-auto mb-2' =%>
+			<%= label_for
+				action_hardcopy_seed_id => maketext('Using what seed?'),
+				class                   => 'col-form-label col-auto mb-2' =%>
 			<div class="col-auto mb-2">
 				<%= text_field 'action.hardcopy.seed' => value => $c->{problemSeed},
-					id => 'action_hardcopy_seed_id', class => 'form-control form-control-sm' =%>
+					id                                => 'action_hardcopy_seed_id',
+					class                             => 'form-control form-control-sm' =%>
 			</div>
 			<div class="col-auto mb-2">
 				<button id="randomize_hardcopy_seed_id" class="btn btn-info btn-sm" type="button">
@@ -17,16 +19,16 @@
 		</div>
 	% }
 	<div class="row align-items-center mb-2">
-		<%= label_for 'action_hardcopy_format_id' , class => 'col-form-label col-auto', begin =%>
+		<%= label_for 'action_hardcopy_format_id', class => 'col-form-label col-auto', begin =%>
 			<%= maketext('Using which hardcopy format?') =%>
 			<%= link_to '#',
 				class => 'help-popup',
 				data  => {
 					bs_content => maketext(
 						'If "PDF" is selected, then a PDF file will be generated for download, unless there are '
-							. 'errors.  If errors occur generating a PDF file or "TeX Source" is selected then a '
-							. 'zip file will be generated for download that contains the TeX source file and '
-							. 'resources needed for generating the PDF file using LaTeX.'
+						. 'errors.  If errors occur generating a PDF file or "TeX Source" is selected then a '
+						. 'zip file will be generated for download that contains the TeX source file and '
+						. 'resources needed for generating the PDF file using LaTeX.'
 					),
 					bs_placement => 'top',
 					bs_toggle    => 'popover'
@@ -39,19 +41,20 @@
 			<% end =%>
 		<% end =%>
 		<div class="col-auto">
-			<%= select_field 'action.hardcopy.format' => [
-					[ maketext('PDF') => 'pdf', selected => undef ],
-					[ maketext('TeX Source') => 'tex' ]
-				],
+			<%= select_field
+				'action.hardcopy.format' =>
+				[ [ maketext('PDF') => 'pdf', selected => undef ], [ maketext('TeX Source') => 'tex' ] ],
 				id    => 'action_hardcopy_format_id',
 				class => 'form-select form-select-sm d-inline w-auto' =%>
 		</div>
 	</div>
 	<div class="row align-items-center mb-2">
-		<%= label_for action_hardcopy_theme_id => maketext('Using which hardcopy theme?'),
-			class => 'col-form-label col-auto' =%>
+		<%= label_for
+			action_hardcopy_theme_id => maketext('Using which hardcopy theme?'),
+			class                    => 'col-form-label col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.hardcopy.theme' => [
+			<%= select_field
+				'action.hardcopy.theme' => [
 					map { [
 						$hardcopyLabels->{$_} => $_,
 						$_ eq $c->ce->{hardcopyThemePGEditor} ? (selected => undef) : ()
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep
index 33de2acdcf..4e907ad16f 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/pg_critic.html.ep
@@ -18,22 +18,26 @@
 						<%== maketext(
 							'See [_1].',
 							link_to(
-								($_->policy =~ s/^Perl::Critic::Policy:://r)
-									=> pod_viewer => { filePath => 'lib/' . ($_->policy =~ s/::/\//gr) . '.pm' },
+								($_->policy =~ s/^Perl::Critic::Policy:://r) => pod_viewer =>
+									{ filePath => 'lib/' . ($_->policy =~ s/::/\//gr) . '.pm' },
 								target => '_blank'
 							)
 						) =%>
 					</div>
 					% if (ref($_->explanation->{sampleProblems}) eq 'ARRAY' && @{ $_->explanation->{sampleProblems} }) {
 						<div>
-							<%== maketext('Related sample [plural,_1,problem]:',
-								scalar(@{ $_->explanation->{sampleProblems} })) %>
-							<%= c(map {
-								link_to(
-									$_->[0] => sample_problem_viewer => { filePath => $_->[1] },
-									target => '_blank'
-								)
-							} @{ $_->explanation->{sampleProblems} })->join(', ') =%>
+							<%== maketext(
+								'Related sample [plural,_1,problem]:',
+								scalar(@{ $_->explanation->{sampleProblems} })
+							) %>
+							<%= c(
+								map {
+									link_to(
+										$_->[0] => sample_problem_viewer => { filePath => $_->[1] },
+										target  => '_blank'
+									)
+								} @{ $_->explanation->{sampleProblems} }
+							)->join(', ') =%>
 						</div>
 					% }
 				</li>
@@ -47,8 +51,10 @@
 				<li class="list-group-item">
 					<div><%= $_->to_string %></div>
 					<div>
-						See <%= link_to(
-							($_->policy =~ s/^Perl::Critic::Policy:://r) => 'https://metacpan.org/pod/' . $_->policy,
+						See
+						<%= link_to(
+							($_->policy =~ s/^Perl::Critic::Policy:://r) => 'https://metacpan.org/pod/'
+								. $_->policy,
 							target => '_blank'
 						) %>.
 					</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep
index 6ddf11ef4a..d868e73b68 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/revert_form.html.ep
@@ -1,8 +1,6 @@
 % if (!-r $c->{editFilePath}) {
-	<%== maketext(
-		'Error: The original file [_1] cannot be read.',
-		tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))
-	) =%>
+	<%== maketext('Error: The original file [_1] cannot be read.',
+		tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
 	% next;
 % }
 %
@@ -16,8 +14,12 @@
 		</div>
 
 		<div class="form-check mb-2<%= $foundTempFile ? '' : ' d-none' %>" id="revert-to-tmp-container">
-			<%= radio_button 'action.revert.type' => 'revert', id => 'action_revert_type_revert_id',
-				checked => undef, class => 'form-check-input', $foundTempFile ? () : (disabled => undef) =%>
+			<%= radio_button
+				'action.revert.type' => 'revert',
+				id                   => 'action_revert_type_revert_id',
+				checked              => undef,
+				class                => 'form-check-input',
+				$foundTempFile ? () : (disabled => undef) =%>
 			<%= label_for 'action_revert_type_revert_id', class => 'form-check-label', begin =%>
 				<%== maketext('Revert to [_1]', tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
 			<% end =%>
@@ -27,50 +29,52 @@
 			<div class="col-auto">
 				% param('action.revert.type', 'backup')
 					% if !$foundTempFile && (!param('action.revert.type') || param('action.revert.type') eq 'revert');
-				<%= radio_button 'action.revert.type' => 'backup', id => 'action_revert_type_backup_id',
-					class => 'form-check-input' =%>
+				<%= radio_button
+					'action.revert.type' => 'backup',
+					id                   => 'action_revert_type_backup_id',
+					class                => 'form-check-input' =%>
 				<%= label_for 'action_revert_type_backup_id', class => 'form-check-label ms-2', begin =%>
 					<%= scalar(@backupTimes) == 1
-						? maketext(
-							'Restore backup from [_1]',
-							$c->formatDateTime($backupTimes[0], $ce->{studentDateDisplayFormat})
-						) : maketext('Restore backup from') =%>
+						? maketext('Restore backup from [_1]',
+							$c->formatDateTime($backupTimes[0], $ce->{studentDateDisplayFormat}))
+						: maketext('Restore backup from') =%>
 				<% end =%>
 			</div>
 			% if (scalar(@backupTimes) == 1) {
 				<%= hidden_field 'action.revert.backup.time' => $backupTimes[0] =%>
 			% } else {
 				<div class="col-auto">
-					<%= select_field 'action.revert.backup.time' => [
-						map { [ $c->formatDateTime($_, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes
-					],
-					id    => 'action_revert_backup_time_id',
-					class => 'form-select form-select-sm d-inline w-auto' =%>
+					<%= select_field
+						'action.revert.backup.time' =>
+						[ map { [ $c->formatDateTime($_, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes ],
+						id    => 'action_revert_backup_time_id',
+						class => 'form-select form-select-sm d-inline w-auto' =%>
 				</div>
 			% }
 		</div>
 
 		<div class="row align-items-center mb-2">
 			<div class="col-auto">
-				<%= radio_button 'action.revert.type' => 'delete', id => 'action_revert_type_delete_id',
-					class => 'form-check-input' =%>
+				<%= radio_button
+					'action.revert.type' => 'delete',
+					id                   => 'action_revert_type_delete_id',
+					class                => 'form-check-input' =%>
 				<%= label_for "action_revert_type_delete_id", class => 'form-check-label ms-2', begin =%>
 					<%= scalar(@backupTimes) == 1
-						? maketext(
-							'Delete backup from [_1]',
-							$c->formatDateTime($backupTimes[0], $ce->{studentDateDisplayFormat})
-						) : maketext('Delete backup from') =%>
+						? maketext('Delete backup from [_1]',
+							$c->formatDateTime($backupTimes[0], $ce->{studentDateDisplayFormat}))
+						: maketext('Delete backup from') =%>
 				<% end =%>
 			</div>
 			% if (scalar(@backupTimes) == 1) {
 				<%= hidden_field 'action.revert.delete.time' => $backupTimes[0] =%>
 			% } else {
 				<div class="col-auto">
-					<%= select_field 'action.revert.delete.time' => [
-						map { [ $c->formatDateTime($_, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes
-					],
-					id    => 'action_revert_delete_number_id',
-					class => 'form-select form-select-sm d-inline w-auto' =%>
+					<%= select_field
+						'action.revert.delete.time' =>
+						[ map { [ $c->formatDateTime($_, $ce->{studentDateDisplayFormat}) => $_ ] } @backupTimes ],
+						id    => 'action_revert_delete_number_id',
+						class => 'form-select form-select-sm d-inline w-auto' =%>
 				</div>
 			% }
 		</div>
@@ -78,11 +82,12 @@
 % } else {
 	<div class="mb-2<%= $foundTempFile ? '' : ' d-none' %>" id="revert-to-tmp-container">
 		<%== maketext('Revert to [_1]', tag('span', dir => 'ltr', $c->shortPath($c->{editFilePath}))) =%>
-		<%= hidden_field 'action.revert.type' => 'revert', id => 'action_revert_type_revert_id',
+		<%= hidden_field
+			'action.revert.type' => 'revert',
+			id                   => 'action_revert_type_revert_id',
 			$foundTempFile ? () : (disabled => undef) =%>
 	</div>
 	<div class="mb-2 d-none" id="show-backups-comment">
 		<%== maketext('Reload the page to see backup files that have been made.') =%>
 	</div>
-
 % }
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
index 8fa25eaaf4..a73b1e715b 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_as_form.html.ep
@@ -1,18 +1,18 @@
 % use File::Basename qw(dirname basename);
 %
 % use WeBWorK::Utils::JITAR qw(jitar_id_to_seq);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets  qw(format_set_name_display);
 %
 % # Don't show the save as form when editing an existing course info file.
 % last if $c->{file_type} eq 'course_info' && -e $c->{editFilePath};
 %
 % my $isTemplate      = $c->{file_type} eq 'blank_problem' || $c->{file_type} eq 'sample_problem';
 % my $isHardcopyTheme = $c->{file_type} eq 'hardcopy_theme';
-% my $shortFilePath   =
-	% $c->{file_type} eq 'blank_problem' ? 'newProblem.pg'
+% my $shortFilePath =
+	% $c->{file_type} eq 'blank_problem'    ? 'newProblem.pg'
 	% : $c->{file_type} eq 'sample_problem' ? basename($c->{editFilePath})
-	% : $isHardcopyTheme ? 'hardcopyThemes/' . ($c->{editFilePath} =~ s|^.*\/||r)
-		% : ($c->{editFilePath} =~ s|^$ce->{courseDirs}{templates}/||r) =~ s|^$ce->{webworkDirs}{assets}/pg/||r;
+	% : $isHardcopyTheme                    ? 'hardcopyThemes/' . ($c->{editFilePath} =~ s|^.*\/||r)
+	% :   ($c->{editFilePath} =~ s|^$ce->{courseDirs}{templates}/||r) =~ s|^$ce->{webworkDirs}{assets}/pg/||r;
 %
 % # Suggest that modifications be saved to the "local" subdirectory if its not in a writable directory
 % $shortFilePath = "local/$shortFilePath" unless $isTemplate || $isHardcopyTheme || -w dirname($c->{editFilePath});
@@ -26,15 +26,19 @@
 %
 <div>
 	<div class="row align-items-center mb-2">
-		<%= label_for action_save_as_target_file_id => maketext('Save file to:'),
-			class => 'col-form-label col-auto' =%>
+		<%= label_for
+			action_save_as_target_file_id => maketext('Save file to:'),
+			class                         => 'col-form-label col-auto' =%>
 		<div class="col-auto d-inline-flex" dir="ltr">
 			<div class="editor-save-path input-group input-group-sm">
 				<%= label_for action_save_as_target_file_id => '[TMPL]/', class => 'input-group-text' =%>
-				<%= text_field 'action.save_as.target_file' => $shortFilePath,
-					id => 'action_save_as_target_file_id', class => 'form-control form-control-sm',
-					size => 60, dir  => 'ltr',
-					data => { error_message => maketext('Please enter a filename.') },
+				<%= text_field
+					'action.save_as.target_file' => $shortFilePath,
+					id                           => 'action_save_as_target_file_id',
+					class                        => 'form-control form-control-sm',
+					size                         => 60,
+					dir                          => 'ltr',
+					data                         => { error_message => maketext('Please enter a filename.') },
 					# Don't allow changing the file name for course info files.
 					# The filename needs to be what is set in the course environment.
 					$c->{file_type} eq 'course_info' ? (readonly => undef) : () =%>
@@ -52,71 +56,95 @@
 		</div>
 		% if ($fileIsAssociatedWithSet) {
 			<div class="form-check">
-				<%= radio_button 'action.save_as.saveMode' => 'rename', id => 'action_save_as_saveMode_rename_id',
-					checked => undef, class => 'form-check-input' =%>
+				<%= radio_button
+					'action.save_as.saveMode' => 'rename',
+					id                        => 'action_save_as_saveMode_rename_id',
+					checked                   => undef,
+					class                     => 'form-check-input' =%>
 				<%= label_for 'action_save_as_saveMode_rename_id', class => 'form-check-label', begin =%>
-					<%== maketext('Replace current problem [_1] of set [_2]',
-						tag('strong',
+					<%== maketext(
+						'Replace current problem [_1] of set [_2]',
+						tag(
+							'strong',
 							$c->{set} && $c->{set}->assignment_type eq 'jitar'
 							? join('.', jitar_id_to_seq($c->{problemID}))
-							: $c->{problemID}),
+							: $c->{problemID}
+						),
 						tag('strong', tag('span', dir => 'ltr', format_set_name_display($c->{setID})))
 					) =%>
 				<% end =%>
 			</div>
 		% }
 		<div class="form-check">
-			<%= radio_button 'action.save_as.saveMode' => 'add_to_set_as_new_problem',
-				id => 'action_save_as_saveMode_new_problem_id', class => 'form-check-input' =%>
-			<%= label_for action_save_as_saveMode_new_problem_id => maketext('Append to end of'),
-				class => 'form-check-label' %>
+			<%= radio_button
+				'action.save_as.saveMode' => 'add_to_set_as_new_problem',
+				id                        => 'action_save_as_saveMode_new_problem_id',
+				class                     => 'form-check-input' =%>
+			<%= label_for
+				action_save_as_saveMode_new_problem_id => maketext('Append to end of'),
+				class                                  => 'form-check-label' %>
 			<%= label_for action_save_as_target_set_id => maketext('set:'), class => 'form-check-label' =%>
 			<div class="d-inline align-middle">
-				<%= select_field 'action.save_as.targetSet' => [
+				<%= select_field
+					'action.save_as.targetSet' => [
 						[ maketext('Select a Set') => '', disabled => undef, selected => undef ],
-						map {
-							[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
-						} @{ $c->{globalSets} }
+						map { [
+							format_set_name_display($_) => $_,
+							$_ eq ($c->{setID} // '') ? (selected => undef) : ()
+						] } @{ $c->{globalSets} }
 					],
-					id   => 'action_save_as_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
-					data => { error_message => maketext('Please select a set.') },
-					dir  => 'ltr' =%>
+					id    => 'action_save_as_target_set_id',
+					class => 'form-select form-select-sm d-inline w-auto',
+					data  => { error_message => maketext('Please select a set.') },
+					dir   => 'ltr' =%>
 			</div>
 		</div>
 		<div class="form-check">
-			<%= radio_button 'action.save_as.saveMode' => 'new_independent_file',
-				id => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-input',
+			<%= radio_button
+				'action.save_as.saveMode' => 'new_independent_file',
+				id                        => 'action_save_as_saveMode_independent_problem_id',
+				class                     => 'form-check-input',
 				$fileIsAssociatedWithSet ? () : (checked => undef) =%>
-			<%= label_for action_save_as_saveMode_independent_problem_id => maketext('Create unattached problem'),
-				class => 'form-check-label' =%>
+			<%= label_for
+				action_save_as_saveMode_independent_problem_id => maketext('Create unattached problem'),
+				class                                          => 'form-check-label' =%>
 		</div>
 	% } elsif ($c->{file_type} =~ /header/) {
 		% my $headerLabel = $c->{file_type} eq 'hardcopy_header' ? maketext('hardcopy header') : maketext('set header');
 		<div class="form-check">
-			<%= radio_button 'action.save_as.saveMode' => 'set_as_header_for_set',
-				id => 'action_save_as_saveMode_set_header_id', class => 'form-check-input',
+			<%= radio_button
+				'action.save_as.saveMode' => 'set_as_header_for_set',
+				id                        => 'action_save_as_saveMode_set_header_id',
+				class                     => 'form-check-input',
 				$fileIsAssociatedWithSet ? (checked => undef) : () =%>
-			<%= label_for action_save_as_saveMode_set_header_id => maketext('Set as [_1] for', $headerLabel),
-				class => 'form-check-label' %>
+			<%= label_for
+				action_save_as_saveMode_set_header_id => maketext('Set as [_1] for', $headerLabel),
+				class                                 => 'form-check-label' %>
 			<%= label_for action_save_as_target_set_id => maketext('set:'), class => 'form-check-label' =%>
 			<div class="d-inline align-middle">
-				<%= select_field 'action.save_as.targetSet' => [
+				<%= select_field
+					'action.save_as.targetSet' => [
 						[ maketext('Select a Set') => '', disabled => undef, selected => undef ],
-						map {
-							[ format_set_name_display($_) => $_, $_ eq ($c->{setID} // '') ? (selected => undef) : () ]
-						} @{ $c->{globalSets} }
+						map { [
+							format_set_name_display($_) => $_,
+							$_ eq ($c->{setID} // '') ? (selected => undef) : ()
+						] } @{ $c->{globalSets} }
 					],
-					id   => 'action_save_as_target_set_id', class => 'form-select form-select-sm d-inline w-auto',
-					data => { error_message => maketext('Please select a set.') },
-					dir  => 'ltr' =%>
+					id    => 'action_save_as_target_set_id',
+					class => 'form-select form-select-sm d-inline w-auto',
+					data  => { error_message => maketext('Please select a set.') },
+					dir   => 'ltr' =%>
 			</div>
 		</div>
 		<div class="form-check">
-			<%= radio_button 'action.save_as.saveMode' => 'new_independent_file',
-				id => 'action_save_as_saveMode_independent_problem_id', class => 'form-check-input',
+			<%= radio_button
+				'action.save_as.saveMode' => 'new_independent_file',
+				id                        => 'action_save_as_saveMode_independent_problem_id',
+				class                     => 'form-check-input',
 				$fileIsAssociatedWithSet ? () : (checked => undef) =%>
-			<%= label_for action_save_as_saveMode_independent_problem_id => maketext('Create unattached header file'),
-				class => 'form-check-label' =%>
+			<%= label_for
+				action_save_as_saveMode_independent_problem_id => maketext('Create unattached header file'),
+				class                                          => 'form-check-label' =%>
 		</div>
 	% }
 </div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
index 5fc90e6ea5..fc4d746893 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/save_form.html.ep
@@ -8,7 +8,10 @@
 	</div>
 	% unless ($c->{file_type} eq 'hardcopy_theme') {
 		<div class="form-check mb-2">
-			<%= check_box newWindowSave => 1, id => 'newWindowSave', class => 'form-check-input',
+			<%= check_box
+				newWindowSave => 1,
+				id            => 'newWindowSave',
+				class         => 'form-check-input',
 				$c->{file_type} eq 'hardcopy_header' ? (checked => undef) : () =%>
 			<%= label_for newWindowSave => maketext('Open in new window'), class => 'form-check-label' =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
index af826cb70e..2db0ca6651 100644
--- a/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
+++ b/templates/ContentGenerator/Instructor/PGProblemEditor/view_form.html.ep
@@ -5,11 +5,14 @@
 	% if ($c->{is_pg}) {
 		% if ($c->{file_type} !~ /header/) {
 			<div class="row align-items-center">
-				<%= label_for action_view_seed_id => maketext('Using what seed?'),
-					class => 'col-form-label col-auto mb-2' =%>
+				<%= label_for
+					action_view_seed_id => maketext('Using what seed?'),
+					class               => 'col-form-label col-auto mb-2' =%>
 				<div class="col-auto mb-2">
-					<%= text_field 'action.view.seed' => $c->{problemSeed},
-						id => 'action_view_seed_id', class => 'form-control form-control-sm' =%>
+					<%= text_field
+						'action.view.seed' => $c->{problemSeed},
+						id                 => 'action_view_seed_id',
+						class              => 'form-control form-control-sm' =%>
 				</div>
 				<div class="col-auto mb-2">
 					<button id="randomize_view_seed_id" class="btn btn-info btn-sm" type="button">
@@ -19,13 +22,18 @@
 			</div>
 		% }
 		<div class="row align-items-center mb-2">
-			<%= label_for action_view_displayMode_id => maketext('Using what display mode?'),
-				class => 'col-form-label col-auto' =%>
+			<%= label_for
+				action_view_displayMode_id => maketext('Using what display mode?'),
+				class                      => 'col-form-label col-auto' =%>
 			<div class="col-auto">
-				<%= select_field 'action.view.displayMode' => [
-					map { [ $_ => $_, $_ eq $c->{displayMode} ? (selected => undef) : () ] }
-						@{ $ce->{pg}{displayModes}}, @{ $ce->{pg}{additionalPGEditorDisplayModes}}
-				], id => 'action_view_displayMode_id', class => 'form-select form-select-sm d-inline w-auto' =%>
+				<%= select_field
+					'action.view.displayMode' => [
+						map { [ $_ => $_, $_ eq $c->{displayMode} ? (selected => undef) : () ] }
+						@{ $ce->{pg}{displayModes} },
+						@{ $ce->{pg}{additionalPGEditorDisplayModes} }
+					],
+					id    => 'action_view_displayMode_id',
+					class => 'form-select form-select-sm d-inline w-auto' =%>
 			</div>
 		</div>
 	% }
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
index 30b857c915..fc4cd493cc 100644
--- a/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemGrader.html.ep
@@ -60,38 +60,42 @@
 		<div class="input-group d-inline-flex flex-nowrap w-auto py-1 me-sm-3">
 			<%= label_for selected_student => maketext('Showing problem for:'), class => 'input-group-text' =%>
 			<%= select_field student_selector => [
-					map {
-						my $user = $_;
-						map { [
-							($user->{displayName}
+				map {
+					my $user = $_;
+					map { [
+						(
+							$user->{displayName}
 								. (
 									ref($_->{problem}) =~ /::ProblemVersion/
 									? maketext(' (version [_1])', $_->{problem}->version_id)
 									: ''
 								)
-							) => $user->user_id,
-							data => {
-								source_file  => $_->{problem}->source_file || $problem->source_file,
-								problem_seed => $_->{problem}->problem_seed,
-								last_answer  => $_->{problem}->last_answer,
-								ref($_->{problem}) =~ /::ProblemVersion/
-									? (
-										version_id    => $_->{problem}->version_id,
-										answer_prefix => sprintf('Q%04d_', $_->{problem}->problem_id)
-									)
-									: (),
-							}
-						] } @{ $user->{data} }
-					} @$users
+						) => $user->user_id,
+						data => {
+							source_file  => $_->{problem}->source_file || $problem->source_file,
+							problem_seed => $_->{problem}->problem_seed,
+							last_answer  => $_->{problem}->last_answer,
+							ref($_->{problem}) =~ /::ProblemVersion/
+							? (
+								version_id    => $_->{problem}->version_id,
+								answer_prefix => sprintf('Q%04d_', $_->{problem}->problem_id)
+								)
+							: (),
+						}
+					] }
+						@{ $user->{data} }
+				} @$users
 				],
-				id => 'student_selector', class => 'form-select' =%>
+				id    => 'student_selector',
+				class => 'form-select' =%>
 		</div>
 		<div class="input-group d-inline-flex flex-nowrap w-auto py-1">
 			<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
-			<%= select_field 'problem_displaymode' => [
-					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
-				],
-				id => 'problem_displaymode', class => 'form-select' =%>
+			<%= select_field
+				'problem_displaymode' =>
+				[ grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} } ],
+				id    => 'problem_displaymode',
+				class => 'form-select' =%>
 		</div>
 	</div>
 </div>
@@ -119,8 +123,11 @@
 					<th id="mark-all-correct-header" class="text-center">
 						<%= label_for 'select-all' => maketext('Mark Correct') =%>
 						<br>
-						<%= check_box 'select-all' => 'on', id => 'select-all', class => 'select-all form-check-input',
-							data => { select_group => 'mark_correct' } =%>
+						<%= check_box
+							'select-all' => 'on',
+							id           => 'select-all',
+							class        => 'select-all form-check-input',
+							data         => { select_group => 'mark_correct' } =%>
 					</th>
 					% unless ($ce->{problemGraderScore} eq 'Point') {
 						<th id="score-header"><%= maketext('Score (%)') %></th>
@@ -138,26 +145,24 @@
 					%
 					% for (@{ $user->{data} }) {
 						% next unless defined $_->{problem};
-						% my $versionID = ref($_->{problem}) =~ /::ProblemVersion/ ? $_->{problem}->version_id : 0;
+						% my $versionID   = ref($_->{problem}) =~ /::ProblemVersion/ ? $_->{problem}->version_id : 0;
 						% my @answerTypes = split(',', $_->{problem}->flags =~ s/:needs_grading$//r);
 						% my $problemLink;
 						% if ($versionID) {
-							% $problemLink = $c->systemLink(
-								% url_for('gateway_quiz', setID => "$setID,v$versionID"),
-								% params => { effectiveUser => $userID, currentPage => $_->{pageNumber} }
-							% )->fragment("prob$_->{problemNumber}");
+							% $problemLink = $c->systemLink(url_for('gateway_quiz', setID => "$setID,v$versionID"),
+								% params => { effectiveUser => $userID, currentPage => $_->{pageNumber} })
+								% ->fragment("prob$_->{problemNumber}");
 						% } else {
-							% $problemLink = $c->systemLink(
-								% url_for('problem_detail'),
-								% params => { effectiveUser => $userID }
-							% )->fragment('problem_body');
+							% $problemLink =
+								% $c->systemLink(url_for('problem_detail'), params => { effectiveUser => $userID })
+								% ->fragment('problem_body');
 						% }
 						<tr>
 							% if ($haveSections) {
 								<td class="text-center restricted-width-col"><%= $user->section %></td>
 							% }
 							% $problemNeedsGrading = 1 if $_->{problem}->flags =~ /:needs_grading$/;
-							<td class="<%= $_->{problem}->flags =~ /:needs_grading$/ ? 'needs-grading' : ''%>">
+							<td class="<%= $_->{problem}->flags =~ /:needs_grading$/ ? 'needs-grading' : '' %>">
 								<%= link_to $problemLink, target => 'WW_View', begin =%>
 									<div class="<%= $ce->status_abbrev_to_name($user->status) || '' %>">
 										<%= $user->{displayName} =%>
@@ -167,21 +172,25 @@
 									% }
 								<% end =%>
 							</td>
-							<td class="problem-answers"
-								data-source-file="<%= $_->{problem}->source_file || $problem->source_file %>">
+							<td
+								class="problem-answers"
+								data-source-file="<%= $_->{problem}->source_file || $problem->source_file %>"
+							>
 								% if (defined $_->{past_answer} ) {
 									% my @scores  = split(//,   $_->{past_answer}->scores);
 									% my @answers = split(/\t/, $_->{past_answer}->answer_string);
 									%
 									% for (my $i = 0; $i <= $#answers; $i++) {
-										<div class="<%= join(
-											' ',
-											'past-answer',
-											# Color the answer if it is not an essay answer.
-											$answerTypes[$i] && $answerTypes[$i] eq 'essay'
-												? ()
-												: $scores[$i] ? 'correct' : 'incorrect'
-										) %>">
+										<div
+											class="<%= join(
+												' ',
+												'past-answer',
+												# Color the answer if it is not an essay answer.
+												$answerTypes[$i] && $answerTypes[$i] eq 'essay' ? ()
+												: $scores[$i]                                   ? 'correct'
+												:                                                 'incorrect'
+											) %>"
+										>
 											% if ($answerTypes[$i] && $answerTypes[$i] eq 'essay') {
 												% # If the answer is an essay answer then display it line by line.
 												% my @lines = split /\n/, $answers[$i];
@@ -208,18 +217,24 @@
 							</td>
 							<td class="text-center restricted-width-col">
 								% param("$userID.$versionID.mark_correct", undef);
-								<%= check_box "$userID.$versionID.mark_correct" => '1',
-									class             => 'mark_correct form-check-input',
-									'aria-labelledby' => 'mark-all-correct-header' =%>
+								<%= check_box
+									"$userID.$versionID.mark_correct" => '1',
+									class                             => 'mark_correct form-check-input',
+									'aria-labelledby'                 => 'mark-all-correct-header' =%>
 							</td>
 							% unless ($ce->{problemGraderScore} eq 'Point') {
 								<td class="restricted-width-col">
 									% param("$userID.$versionID.score", undef);
-									<%= number_field "$userID.$versionID.score" => wwRound(0, $_->{problem}->status * 100),
-										id    => "$userID.$versionID.score",
+									<%= number_field
+										"$userID.$versionID.score" => wwRound(0, $_->{problem}->status * 100),
+										id                         => "$userID.$versionID.score",
 										class => 'problem-score form-control form-control-sm restricted-width-col',
-										style => 'width:6.5rem;', min => 0, max => 100, step => 1,
-										autocomplete => 'off', 'aria-labelledby' => 'score-header' =%>
+										style => 'width:6.5rem;',
+										min   => 0,
+										max   => 100,
+										step  => 1,
+										autocomplete      => 'off',
+										'aria-labelledby' => 'score-header' =%>
 								</td>
 							% }
 							% unless ($ce->{problemGraderScore} eq 'Percent') {
@@ -229,12 +244,14 @@
 								<td class="restricted-width-col">
 									% if ($ce->{problemGraderScore} eq 'Point') {
 										% param("$userID.$versionID.score", wwRound(0, $_->{problem}->status * 100));
-										<%= hidden_field "$userID.$versionID.score" => 0,
-											id => "$userID.$versionID.score" %>
+										<%= hidden_field
+											"$userID.$versionID.score" => 0,
+											id                         => "$userID.$versionID.score" %>
 									% }
 									% param("$userID.$versionID.points", undef);
-									<%= number_field "$userID.$versionID.points" => round_nearest_stepsize(
-											$_->{problem}->status * $problemValue, $thisStepSize),
+									<%= number_field
+										"$userID.$versionID.points" =>
+										round_nearest_stepsize($_->{problem}->status * $problemValue, $thisStepSize),
 										id    => "$userID.$versionID.points",
 										class => 'problem-points form-control form-control-sm restricted-width-col',
 										style => 'width:6.5rem;',
@@ -243,8 +260,8 @@
 										step  => $thisStepSize,
 										autocomplete      => 'off',
 										'aria-labelledby' => $useUserValue
-											? "point-label-$userID.$versionID"
-											: 'point-header' =%>
+										? "point-label-$userID.$versionID"
+										: 'point-header' =%>
 									% if ($useUserValue) {
 										<div id="point-label-<%= "$userID.$versionID" =%>" class="fw-bold">
 											<%= maketext('Points (0 - [_1])', $problemValue) =%>
@@ -254,12 +271,15 @@
 							% }
 							<td class="grader-comment-column">
 								% if (defined $_->{past_answer}) {
-									<%= text_area "$userID.$versionID.comment" => $_->{past_answer}->comment_string,
-										id => "${userID}_${versionID}_comment",
-										rows  => 3, class => 'form-control latexentryfield',
-										'aria-labelledby' => 'comment-header' =%>
-									<%= hidden_field "MaThQuIlL_${userID}_${versionID}_comment" => '',
-										id => "MaThQuIlL_${userID}_${versionID}_comment",
+									<%= text_area
+										"$userID.$versionID.comment" => $_->{past_answer}->comment_string,
+										id                           => "${userID}_${versionID}_comment",
+										rows                         => 3,
+										class                        => 'form-control latexentryfield',
+										'aria-labelledby'            => 'comment-header' =%>
+									<%= hidden_field
+										"MaThQuIlL_${userID}_${versionID}_comment" => '',
+										id   => "MaThQuIlL_${userID}_${versionID}_comment",
 										data => { eqn_editor_btn_after => 'true' } =%>
 								% }
 							</td>
@@ -269,14 +289,14 @@
 			</tbody>
 		</table>
 		% if ($problemNeedsGrading) {
-			<div class='problem-grader-legend-key mb-3'>
-				<span class='needs-grading fw-bold p-2'><%= maketext('Name') %></span>
+			<div class="problem-grader-legend-key mb-3">
+				<span class="needs-grading fw-bold p-2"><%= maketext('Name') %></span>
 				\( = \)
 				<%= maketext('Problem has an essay answer that needs to be graded.') =%>
 			</div>
 		% }
-		<div id="alt-source-key" class='problem-grader-legend-key mb-3 d-none'>
-			<span class='alt-source p-2'><%= maketext('Latest Answers') %></span>
+		<div id="alt-source-key" class="problem-grader-legend-key mb-3 d-none">
+			<span class="alt-source p-2"><%= maketext('Latest Answers') %></span>
 			\( = \)
 			<%= maketext('Problem has a different source file than the currently rendered problem.') =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep b/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep
index c06270d982..6c2fec83f0 100644
--- a/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemGrader/siblings.html.ep
@@ -16,8 +16,7 @@
 					$_ eq $problem->problem_id
 					? (class => 'nav-link active')
 					: (href => $c->systemLink(url_for(current_route, problemID => $_)), class => 'nav-link'),
-					maketext('Problem [_1]', $set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_)
-				=%>
+					maketext('Problem [_1]', $set->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_) =%>
 			</li>
 		% }
 	</ul>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
index c291ffbe12..a55358101f 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail.html.ep
@@ -1,7 +1,7 @@
-% use WeBWorK::Utils qw(sortByName getAssetURL);
+% use WeBWorK::Utils        qw(sortByName getAssetURL);
 % use WeBWorK::Utils::Files qw(listFilesRecursive);
 % use WeBWorK::Utils::JITAR qw(seq_to_jitar_id jitar_id_to_seq);
-% use WeBWorK::Utils::Sets qw(get_test_problem_position format_set_name_display);
+% use WeBWorK::Utils::Sets  qw(get_test_problem_position format_set_name_display);
 %
 % content_for css => begin
 	<%= stylesheet getAssetURL($ce, 'node_modules/flatpickr/dist/flatpickr.min.css') =%>
@@ -16,12 +16,13 @@
 		<%= javascript getAssetURL(
 			$ce,
 			'node_modules/flatpickr/dist/l10n/'
-		   	. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr))
-		   	. '.js'
-		), defer => undef =%>
+				. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr)) . '.js'
+			),
+			defer => undef =%>
 	% }
-	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-		defer => undef =%>
+	<%=
+		javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'), defer => undef
+	=%>
 	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
 		defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'), defer => undef =%>
@@ -66,17 +67,13 @@
 % if (stash('forUsers')) {
 	% if (@editForUser && @$unassignedUsers) {
 		<div class="alert alert-danger p-1 mb-2">
-			<%== maketext(
-				'The following users are NOT assigned to this set and will be ignored: [_1]',
-				tag('b', join(', ', @$unassignedUsers))
-			) =%>
+			<%== maketext('The following users are NOT assigned to this set and will be ignored: [_1]',
+				tag('b', join(', ', @$unassignedUsers))) =%>
 		</div>
 	% } elsif (!@editForUser) {
 		<div class="alert alert-danger p-1 mb-2">
-			<%== maketext(
-				'None of the selected users are assigned to this set: [_1]',
-				tag('b', join(', ', @$unassignedUsers))
-			) =%>
+			<%== maketext('None of the selected users are assigned to this set: [_1]',
+				tag('b', join(', ', @$unassignedUsers))) =%>
 		</div>
 		<div class="alert alert-danger p-1 mb-2">
 			<%= maketext('Global set data will be shown instead of user specific data') =%>
@@ -127,18 +124,15 @@
 						dir => 'ltr',
 						format_set_name_display($setID . ($editingSetVersion ? ",v$editingSetVersion" : ''))
 					),
-					c(
-						tag('br'),
-						tag('strong', $userLinks->join(tag('br')))
-					)->join('')
+					c(tag('br'), tag('strong', $userLinks->join(tag('br'))))->join('')
 				) =%>
 			</div>
 			<div class="col-md-6 mt-md-0 mt-2">
 				<%= link_to $c->systemLink($setDetailPage), begin =%>
 					<%== maketext(
-							'Edit set [_1] for ALL students assigned to this set.',
-							tag('strong', dir => 'ltr', format_set_name_display($setID))
-						) => $c->systemLink($setDetailPage) =%>
+						'Edit set [_1] for ALL students assigned to this set.',
+						tag('strong', dir => 'ltr', format_set_name_display($setID))
+					) => $c->systemLink($setDetailPage) =%>
 				<% end =%>
 				% # Handy messages when editing gateway sets.
 				% if ($isGatewaySet && !$editingSetVersion) {
@@ -163,7 +157,7 @@
 			</div>
 			<div class="col-md-6 mt-md-0 mt-2">
 				% my $link = link_to(maketext('individual user settings') =>
-					% $c->systemLink(url_for 'instructor_users_assigned_to_set'));
+						% $c->systemLink(url_for 'instructor_users_assigned_to_set'));
 				<%== maketext('Edit [_1] for set [_2].',
 					$link, tag('span', dir => 'ltr', format_set_name_display($setID))) =%>
 			</div>
@@ -180,7 +174,6 @@
 </div>
 %
 <%= form_for current_route, method => 'POST', id => 'problem_set_form', name => 'problem_set_form', begin =%>
-	%
 	% for (@editForUser) {
 		<%= hidden_field editForUser => $_ =%>
 	% }
@@ -204,7 +197,7 @@
 			<div class="card-title fw-bold"><%= maketext('Set Parameters') %></div>
 			<div class="card-text">
 				<%= $c->fieldTable($userToShow, $setID, undef, $setRecord,
-				   	$editingSetVersion
+					$editingSetVersion
 					? $db->getSetVersion($userToShow, $setID, $editingSetVersion)
 					: $db->getUserSet($userToShow, $setID)) =%>
 			</div>
@@ -218,10 +211,15 @@
 			<%= hidden_field "set.$setID.description" => $setRecord->description, id => "set.$setID.description" =%>
 			<%= $setRecord->description || maketext('No Description') =%>
 		% } else {
-			<%= label_for "set.$setID.description" => maketext('Set Description'),
-				class => 'form-label fw-bold fs-4' =%>
-			<%= text_area "set.$setID.description" => $setRecord->description,
-				id => "set.$setID.description", rows => 5, cols => 62, class => 'form-control' =%>
+			<%= label_for
+				"set.$setID.description" => maketext('Set Description'),
+				class                    => 'form-label fw-bold fs-4' =%>
+			<%= text_area
+				"set.$setID.description" => $setRecord->description,
+				id                       => "set.$setID.description",
+				rows                     => 5,
+				cols                     => 62,
+				class                    => 'form-control' =%>
 		% }
 	</div>
 	%
@@ -237,7 +235,8 @@
 								<table>
 									<tr>
 										<td>
-											<%= label_for "set.$setID.$headerType" =>
+											<%= label_for
+												"set.$setID.$headerType" =>
 												maketext($field_properties->{$headerType}{name}),
 												class => 'form-label' =%>
 										</td>
@@ -245,9 +244,12 @@
 									<tr>
 										<td>
 											<%= link_to $c->systemLink(
-													url_for('instructor_problem_editor_withset_withproblem',
-														setID => $setID, problemID => 0),
-													params => { file_type => $headerType }
+												url_for(
+													'instructor_problem_editor_withset_withproblem',
+													setID     => $setID,
+													problemID => 0
+												),
+												params => { file_type => $headerType }
 												),
 												class  => 'psd_edit btn btn-secondary btn-sm',
 												target => 'WW_Editor',
@@ -261,11 +263,11 @@
 												<span class="visually-hidden"><%= maketext('Edit') =%></span>
 											<% end =%>
 											<%= link_to $c->systemLink(url_for(
-													{
-														set_header      => 'problem_list',
-														hardcopy_header => 'hardcopy_preselect_set'
-													}->{$headerType},
-													setID => $setID
+												{
+													set_header      => 'problem_list',
+													hardcopy_header => 'hardcopy_preselect_set'
+												}->{$headerType},
+												setID => $setID
 												)),
 												class  => 'psd_view btn btn-secondary btn-sm',
 												target => 'WW_View',
@@ -287,30 +289,26 @@
 									% # Browse available header/problem files
 									<div>
 										% my $skip = join("|", keys %{ $ce->{courseFiles}{problibs} });
-										<%= text_field "set.$setID.$headerType" =>
-												$setRecord->{$headerType} || 'defaultHeader',
-											id    => "set.$setID.$headerType",
-											class => 'combo-box-text form-control mb-1' =%>
-										<%= select_field "set.$setID.$headerType" => [
+										<%= text_field
+											"set.$setID.$headerType" => $setRecord->{$headerType} || 'defaultHeader',
+											id                       => "set.$setID.$headerType",
+											class                    => 'combo-box-text form-control mb-1' =%>
+										<%= select_field
+											"set.$setID.$headerType" => [
 												[
 													maketext('Use Default Header File') => 'defaultHeader',
-													($setRecord->{$headerType} || 'defaultHeader') eq 'defaultHeader'
-													? (selected => undef)
-													: ()
+													($setRecord->{$headerType} || 'defaultHeader') eq
+													'defaultHeader' ? (selected => undef) : ()
 												],
 												map { [
 													$_ => $_,
-													$setRecord->{$headerType} && $setRecord->{$headerType} eq $_
-													? (selected => undef)
-													: ()
+													$setRecord->{$headerType}
+													&& $setRecord->{$headerType} eq $_ ? (selected => undef) : ()
 												] } sortByName(
 													undef,
 													listFilesRecursive(
 														$ce->{courseDirs}{templates},
-														qr/header.*\.pg$/i,
-														qr/^(?:$skip)$/,
-														0,
-														1
+														qr/header.*\.pg$/i, qr/^(?:$skip)$/, 0, 1
 													)
 												)
 											],
@@ -327,8 +325,9 @@
 	% } else {
 		<p>
 			<b>
-				<%= maketext(
-					'Screen and Hardcopy set header information cannot be overridden for individual students.') =%>
+				<%=
+					maketext('Screen and Hardcopy set header information cannot be overridden for individual students.')
+				=%>
 			</b>
 		</p>
 	% }
@@ -359,8 +358,9 @@
 					<div class="input-group-text">
 						<%= check_box excludeCorrect => 0, id => 'excludeCorrect', class => 'form-check-input mt-0' =%>
 					</div>
-					<%= label_for excludeCorrect => maketext('if status less than 1'),
-						class => "form-check-label input-group-text mt-0" =%>
+					<%= label_for
+						excludeCorrect => maketext('if status less than 1'),
+						class          => "form-check-label input-group-text mt-0" =%>
 				</div>
 			% }
 			% if (!@editForUser) {
@@ -385,10 +385,10 @@
 			% }
 			<div class="input-group d-inline-flex flex-nowrap w-auto py-1">
 				<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
-				<%= select_field 'problem_displaymode' => [
-						grep { exists $display_modes->{$_} } @{ $ce->{pg}{displayModes} }
-					],
-					id => 'problem_displaymode', class => 'form-select w-auto flex-grow-0' =%>
+				<%= select_field
+					'problem_displaymode' => [ grep { exists $display_modes->{$_} } @{ $ce->{pg}{displayModes} } ],
+					id                    => 'problem_displaymode',
+					class                 => 'form-select w-auto flex-grow-0' =%>
 			</div>
 		</div>
 		%
@@ -404,10 +404,9 @@
 					% ? (
 						% $userProblemVersions->{$problemID} && $userProblemVersions->{$problemID}->source_file
 						% ? $userProblemVersions->{$problemID}->source_file
-						% : (
-							% $userProblems->{$problemID} && $userProblems->{$problemID}->source_file
-							% ? $userProblems->{$problemID}->source_file : $globalProblems->{$problemID}->source_file
-						% )
+						% : ($userProblems->{$problemID} && $userProblems->{$problemID}->source_file
+							% ? $userProblems->{$problemID}->source_file
+							% : $globalProblems->{$problemID}->source_file)
 					% )
 					% : $globalProblems->{$problemID}->source_file;
 				%
@@ -436,11 +435,14 @@
 					% $lastProblemNumber = pop @seq;
 					% $parentID          = seq_to_jitar_id(@seq) if @seq;
 					% my $button = begin
-						<button class="pdr_collapse me-2 collapsed btn btn-sm p-0"
+						<button
+							class="pdr_collapse me-2 collapsed btn btn-sm p-0"
 							data-expand-text="<%= maketext('Expand Nested Problems') %>"
 							data-collapse-text="<%= maketext('Collapse Nested Problems') %>"
 							data-bs-toggle="collapse"
-							aria-expanded="false" type="button">
+							aria-expanded="false"
+							type="button"
+						>
 							<i class="fas fa-chevron-right" data-bs-toggle="tooltip"></i>
 						</button>
 					% end
@@ -462,40 +464,49 @@
 								<div class="pdr_handle me-2 text-nowrap" id="pdr_handle_<%= $problemID %>">
 									<span class="pdr_problem_number"><%= $problemNumber %></span>
 									% if (!@editForUser) {
-										<i class="<%= $isJitarSet ? 'fas fa-arrows-alt' : 'fas fa-arrows-alt-v' %>"
-											data-bs-title="<%= maketext('Move') %>" data-bs-toggle="tooltip">
+										<i
+											class="<%= $isJitarSet ? 'fas fa-arrows-alt' : 'fas fa-arrows-alt-v' %>"
+											data-bs-title="<%= maketext('Move') %>"
+											data-bs-toggle="tooltip"
+										>
 										</i>
 									% }
 								</div>
 								<%= $collapseButton =%>
-								<%= hidden_field "prob_num_$problemID" => $lastProblemNumber,
-									id => "prob_num_$problemID" =%>
-								<%= hidden_field "prob_parent_id_$problemID" => $parentID,
-									id => "prob_parent_id_$problemID" =%>
+								<%= hidden_field
+									"prob_num_$problemID" => $lastProblemNumber,
+									id                    => "prob_num_$problemID" =%>
+								<%= hidden_field
+									"prob_parent_id_$problemID" => $parentID,
+									id                          => "prob_parent_id_$problemID" =%>
 								%
 								% # Show the "Render Problem", "Edit Problem", and "Open in New Window" links if there
 								% # is a well defined problem to view. This is when editing a homework set, editing a
 								% # gateway set version, or editing a gateway set and the problem is not drawing from
 								% # grouping set.  Really the only case needed here is that of a group problem.
 								% if (!$isGatewaySet || $editingSetVersion || $problemFile !~ /^group/) {
-									<button id="pdr_render_<%= $problemID %>"
+									<button
+										id="pdr_render_<%= $problemID %>"
 										class="pdr_render btn btn-secondary btn-sm"
-										data-bs-toggle="tooltip" data-bs-placement="top"
+										data-bs-toggle="tooltip"
+										data-bs-placement="top"
 										data-bs-title="<%= maketext('Render Problem') %>"
-										type="button">
+										type="button"
+									>
 										<i class="icon far fa-image" aria-hidden="true"></i>
 										<span class="visually-hidden"><%= maketext('Render') %></span>
 									</button>
 									<%= link_to $c->systemLink(url_for(
-											'instructor_problem_editor_withset_withproblem',
-											setID => $setID, problemID => $problemID
+										'instructor_problem_editor_withset_withproblem',
+										setID     => $setID,
+										problemID => $problemID
 										)),
 										class  => 'psd_edit btn btn-secondary btn-sm',
 										target => 'WW_Editor',
 										data   => {
 											bs_toggle    => 'tooltip',
-										   	bs_placement => 'top',
-										   	bs_title     => maketext('Edit Problem')
+											bs_placement => 'top',
+											bs_title     => maketext('Edit Problem')
 										},
 										begin =%>
 										<i class="icon fas fa-pencil-alt" aria-hidden="true"></i>
@@ -508,11 +519,13 @@
 										% if ($editingSetVersion) {
 											% my ($problemNumber, $pageNumber) =
 												% get_test_problem_position($db, $problemToShow);
-											% $problemLink = $c->systemLink(url_for('gateway_quiz',
-													% setID => $problemToShow->set_id
-														% . ',v' . $problemToShow->version_id,
+											% $problemLink = $c->systemLink(
+												% url_for(
+													% 'gateway_quiz',
+													% setID => $problemToShow->set_id . ',v'
+														% . $problemToShow->version_id,
 													% problemID => $problemToShow->problem_id
-												%),
+												% ),
 												% params => {
 													% effectiveUser => $editForUser[0],
 													% currentPage   => $pageNumber
@@ -520,24 +533,31 @@
 											% )->fragment("prob$problemNumber");
 										% } else {
 											% $problemLink = $c->systemLink(
-												% url_for('gateway_quiz', setID => 'Undefined_Set', problemID => '1'),
+												% url_for(
+													% 'gateway_quiz',
+													% setID     => 'Undefined_Set',
+													% problemID => '1'
+												% ),
 												% params => {
-													% effectiveUser  =>
-														% @editForUser == 1 ? $editForUser[0] : param('user'),
-													% problemSeed => $problemToShow ? $problemToShow->problem_seed : '',
-													% sourceFilePath => $problemToShow && $problemToShow->source_file
-														% ? $problemToShow->source_file
-														% : $globalProblems->{$problemID}->source_file
+													% effectiveUser => @editForUser == 1 ? $editForUser[0]
+													% : param('user'),
+													% problemSeed => $problemToShow ? $problemToShow->problem_seed
+													% : '',
+													% sourceFilePath => $problemToShow
+														% && $problemToShow->source_file ? $problemToShow->source_file
+													% : $globalProblems->{$problemID}->source_file
 												% }
-											% )
+											% );
 										% }
 									% } else {
 										% $problemLink = $c->systemLink(
 											% url_for('problem_detail', setID => $setID, problemID => $problemID),
 											% params => {
-												% effectiveUser => @editForUser == 1 ? $editForUser[0] : param('user')
+												% effectiveUser => @editForUser == 1
+												% ? $editForUser[0]
+												% : param('user')
 											% }
-										% )
+										% );
 									% }
 									<%= link_to $problemLink,
 										class  => 'psd_view btn btn-secondary btn-sm',
@@ -554,9 +574,9 @@
 								% }
 								% if ($authz->hasPermissions(param('user'), 'problem_grader')) {
 									<%= link_to $c->systemLink(url_for(
-											'instructor_problem_grader',
-										   	setID     => $setID,
-										   	problemID => $problemID
+										'instructor_problem_grader',
+										setID     => $setID,
+										problemID => $problemID
 										)),
 										class => "pdr_grader btn btn-secondary btn-sm",
 										data  => {
@@ -575,20 +595,27 @@
 							</div>
 							<div class="<%= @editForUser ? 'col-md-6' : 'col-md-5' %> col-9 order-md-3 order-4">
 								<%= $source_file_parts[2] =%>
-								<%= hidden_field "problem_${problemID}_default_source_file" =>
+								<%= hidden_field
+									"problem_${problemID}_default_source_file" =>
 									$globalProblems->{$problemID}->source_file,
 									id => "problem_${problemID}_default_source_file" =%>
 							</div>
 							% if (!@editForUser) {
-								<div class="accordion col-md-1 col-2 d-flex align-items-center justify-content-end
-									order-md-last order-2">
-									<button class="accordion-button pdr_detail_collapse ps-0 w-auto"
-										type="button" aria-expanded="true" aria-controls="pdr_details_<%= $problemID %>"
+								<div
+									class="accordion col-md-1 col-2 d-flex align-items-center justify-content-end
+									order-md-last order-2"
+								>
+									<button
+										class="accordion-button pdr_detail_collapse ps-0 w-auto"
+										type="button"
+										aria-expanded="true"
+										aria-controls="pdr_details_<%= $problemID %>"
 										aria-label="<%= maketext('Collapse Problem Details') %>"
-										data-bs-toggle="collapse" data-bs-target="#pdr_details_<%= $problemID %>"
+										data-bs-toggle="collapse"
+										data-bs-target="#pdr_details_<%= $problemID %>"
 										data-expand-text="<%= maketext('Expand Problem Details') %>"
-										data-collapse-text="<%= maketext('Collapse Problem Details') %>">
-									</button>
+										data-collapse-text="<%= maketext('Collapse Problem Details') %>"
+									></button>
 								</div>
 							% }
 						</div>
@@ -597,38 +624,41 @@
 								<div class="col-md-6 d-flex flex-row order-md-first order-last">
 									% if (!@editForUser) {
 										<div class="form-check form-check-inline form-control-sm">
-											<%= check_box deleteProblem => $problemID, id =>
-												"delete-problem-$problemID", class => 'form-check-input' =%>
-											<%= label_for "delete-problem-$problemID" => maketext('Delete it?'),
-												class => 'form-check-label' =%>
+											<%= check_box
+												deleteProblem => $problemID,
+												id            => "delete-problem-$problemID",
+												class         => 'form-check-input' =%>
+											<%= label_for
+												"delete-problem-$problemID" => maketext('Delete it?'),
+												class                       => 'form-check-label' =%>
 										</div>
 									% }
 									% if (@editForUser != 1) {
 										<div class="form-check form-check-inline form-control-sm">
-											<%= check_box markCorrect => $problemID,
-												id    => "problem.${problemID}.mark_correct",
-												class => 'form-check-input' =%>
-											<%= label_for "problem.${problemID}.mark_correct" =>
-													maketext('Mark Correct?'),
-												class => 'form-check-label' =%>
+											<%= check_box
+												markCorrect => $problemID,
+												id          => "problem.${problemID}.mark_correct",
+												class       => 'form-check-input' =%>
+											<%= label_for
+												"problem.${problemID}.mark_correct" => maketext('Mark Correct?'),
+												class                               => 'form-check-label' =%>
 										</div>
 									% }
 								</div>
 								% if (@editForUser) {
-									<div class="<%= @editForUser ? 'col-md-6' : 'col-md-5'
-										%> offset-md-0 col-9 offset-3 font-sm order-md-last order-first">
+									<div
+										class="<%=
+											@editForUser ? 'col-md-6' : 'col-md-5'
+										%> offset-md-0 col-9 offset-3 font-sm order-md-last order-first"
+									>
 										<%= $source_file_parts[3] =%>
 									</div>
 								% }
 							</div>
 							<div class="row">
 								<div class="col-lg-5">
-									<%= $c->fieldTable(
-										$userToShow, $setID, $problemID,
-										$globalProblems->{$problemID},
-										$problemToShow,
-										$setRecord->assignment_type
-									) =%>
+									<%= $c->fieldTable($userToShow, $setID, $problemID, $globalProblems->{$problemID},
+										$problemToShow, $setRecord->assignment_type) =%>
 								</div>
 								<div class="font-sm col-lg-7">
 									% if ($repeatFile) {
@@ -653,7 +683,7 @@
 					% my $nestedIDHash = {};
 					%
 					% for (my $i = 0; $i <= $#$problemIDList; $i++) {
-						% my @id_seq = jitar_id_to_seq($problemIDList->[$i]);
+						% my @id_seq  = jitar_id_to_seq($problemIDList->[$i]);
 						% my $hashref = $nestedIDHash;
 						% for my $num (@id_seq) {
 							% $hashref->{$num} = {} unless defined $hashref->{$num};
@@ -681,15 +711,17 @@
 			<div class="input-group-text">
 				<%= check_box auto_render => 1, id => 'auto_render', class => 'form-check-input mt-0' =%>
 			</div>
-			<%= label_for auto_render => maketext('Automatically render problems on page load'),
-				class => 'input-group-text' =%>
+			<%= label_for
+				auto_render => maketext('Automatically render problems on page load'),
+				class       => 'input-group-text' =%>
 		</div>
 		<div class="input-group mb-2">
 			<div class="input-group-text">
 				<%= check_box force_renumber => '1', id => 'force_renumber', class => 'form-check-input mt-0' =%>
 			</div>
-			<%= label_for force_renumber => maketext('Force problems to be numbered consecutively from one'),
-				class => 'input-group-text' =%>
+			<%= label_for
+				force_renumber => maketext('Force problems to be numbered consecutively from one'),
+				class          => 'input-group-text' =%>
 		</div>
 	% } else {
 		<p><b><%= maketext("This set doesn't contain any problems yet.") %></b></p>
@@ -703,8 +735,9 @@
 			</div>
 			<%= label_for add_blank_problem => maketext('Add'), class => 'input-group-text' =%>
 			<%= text_field add_n_problems => 1, id => 'add_n_problems', class => 'form-control flex-grow-0' =%>
-			<%= label_for add_n_problems => maketext('blank problem template(s) to end of homework set'),
-				class => 'input-group-text' =%>
+			<%= label_for
+				add_n_problems => maketext('blank problem template(s) to end of homework set'),
+				class          => 'input-group-text' =%>
 		</div>
 	% }
 	%
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep
index d8ff4fc25b..fa27d2643d 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/attempts_row.html.ep
@@ -4,8 +4,10 @@
 	<td>
 		<%= text_field "problem.$problemID.attempts",
 			($problemRecord->num_correct || 0) + ($problemRecord->num_incorrect || 0),
-			id => "problem.$problemID.attempts.id", class => 'form-control-plaintext form-control-sm',
-			readonly => undef, size => 5 =%>
+			id       => "problem.$problemID.attempts.id",
+			class    => 'form-control-plaintext form-control-sm',
+			readonly => undef,
+			size     => 5 =%>
 	</td>
 	<td></td>
 </tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep
index ac864b5b68..89b5544e40 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/ip_locations_row.html.ep
@@ -1,24 +1,31 @@
 <tr class="align-top">
 	<td>
-		<%= label_for "set.$setID.selected_ip_locations_id" => maketext('Restrict Locations'),
+		<%= label_for
+			"set.$setID.selected_ip_locations_id" => maketext('Restrict Locations'),
 			$forUsers
-				? (id => "set.$setID.selected_ip_locations.label", class => 'form-check-label')
-				: (class => 'form-label') =%>
+			? (id => "set.$setID.selected_ip_locations.label", class => 'form-check-label')
+			: (class => 'form-label') =%>
 	</td>
 	<td></td>
 	<td>
-		<%= select_field "set.$setID.selected_ip_locations" => [
+		<%= select_field
+			"set.$setID.selected_ip_locations" => [
 				$forUsers ? [ maketext('Set Default') => '', %$defaultLocations ? () : (selected => undef) ] : (),
 				map { [ $_ => $_, $defaultLocations->{$_} ? (selected => undef) : () ] } @$locations
 			],
-			id => "set.$setID.selected_ip_locations_id", size => 5, multiple => undef,
-			class => 'form-select form-select-sm' =%>
+			id       => "set.$setID.selected_ip_locations_id",
+			size     => 5,
+			multiple => undef,
+			class    => 'form-select form-select-sm' =%>
 	</td>
 	% if ($forUsers) {
 		<td>
-			<%= text_area "set.$setID.selected_ip_locations.class_value" => join("\n", @$globalLocations),
-				readonly => undef, rows => 5, class => 'form-control form-control-sm',
-				'aria-labelledby' => "set.$setID.selected_ip_locations.label" =%>
+			<%= text_area
+				"set.$setID.selected_ip_locations.class_value" => join("\n", @$globalLocations),
+				readonly                                       => undef,
+				rows                                           => 5,
+				class                                          => 'form-control form-control-sm',
+				'aria-labelledby'                              => "set.$setID.selected_ip_locations.label" =%>
 		</td>
 	% }
 </tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep
index 7a67929e0a..d10040962f 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetDetail/restricted_login_proctor_password_row.html.ep
@@ -9,23 +9,28 @@
 %
 <tr>
 	<td>
-		<%= label_for "set.$setID.restricted_login_proctor_password" =>
-			maketext('Password') =%>
+		<%= label_for "set.$setID.restricted_login_proctor_password" => maketext('Password') =%>
 	</td>
 	<td>
-		<a class="help-popup" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
-			data-bs-content="<%= maketext(
-				'Provide a password to have a single password for all students to start a proctored test. '
+		<a
+			class="help-popup"
+			role="button"
+			tabindex="0"
+			data-bs-placement="top"
+			data-bs-toggle="popover"
+			data-bs-content="<%= maketext('Provide a password to have a single password for all students to start a proctored test. '
 					. 'Alternatively, leave this blank if you would like to have a proctor level user enter '
-					. 'their username and password on the student\'s screen for authentication.'
-			) =%>">
+					. 'their username and password on the student\'s screen for authentication.') =%>"
+		>
 			<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 			<span class="visually-hidden"><%= maketext('Proctor Password Help') =%></span>
 		</a>
 	</td>
 	<td>
-		<%= text_field "set.$setID.restricted_login_proctor_password" => '',
-			id => "set.$setID.restricted_login_proctor_password", size => 10,
-			class => 'form-control form-control-sm' =%>
+		<%= text_field
+			"set.$setID.restricted_login_proctor_password" => '',
+			id                                             => "set.$setID.restricted_login_proctor_password",
+			size                                           => 10,
+			class                                          => 'form-control form-control-sm' =%>
 	</td>
 </tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
index bdeb11e0bd..43a07ad9bb 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList.html.ep
@@ -13,18 +13,19 @@
 		<%= javascript getAssetURL(
 			$ce,
 			'node_modules/flatpickr/dist/l10n/'
-		   	. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr))
-		   	. '.js'
-		), defer => undef =%>
+				. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr)) . '.js'
+			),
+			defer => undef =%>
 	% }
-	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-		defer => undef =%>
+	<%=
+		javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'), defer => undef
+	=%>
 	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
 		defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'),         defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'),         defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/ProblemSetList/problemsetlist.js'), defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),           defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
 % end
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
@@ -44,7 +45,11 @@
 	% last;
 % }
 %
-<%= form_for current_route, method => 'post', id => 'problemsetlist', name => 'problemsetlist', class  => 'font-sm',
+<%= form_for current_route,
+	method => 'post',
+	id     => 'problemsetlist',
+	name   => 'problemsetlist',
+	class  => 'font-sm',
 	begin =%>
 	<%= $c->hidden_authen_fields =%>
 	%
@@ -79,12 +84,11 @@
 	%
 	% for my $actionID (@$formsToShow) {
 		% next
-			% if $actionID eq 'lms_roster_sync' && (
-				% !$ce->{LTIVersion}
+			% if $actionID eq 'lms_roster_sync'
+			% && (!$ce->{LTIVersion}
 				% || $ce->{LTIVersion} ne 'v1p3'
 				% || $ce->{LTIGradeMode} ne 'homework'
-				% || !$db->getSettingValue('LTILineitemsURL')
-			% );
+				% || !$db->getSettingValue('LTILineitemsURL'));
 		% # Check permissions
 		% next if $formPerms->{$actionID} && !$authz->hasPermissions(param('user'), $formPerms->{$actionID});
 		%
@@ -95,17 +99,21 @@
 		% content_for 'tab-list' => begin
 			<li class="nav-item" role="presentation">
 				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
-					class           => "nav-link action-link$active$disabled",
-					id              => "$actionID-tab",
-					role            => 'tab',
+					class                                      => "nav-link action-link$active$disabled",
+					id                                         => "$actionID-tab",
+					role                                       => 'tab',
 					data            => { action => $actionID, bs_toggle => 'tab', bs_target => "#$actionID" },
 					'aria-controls' => $actionID,
 					'aria-selected' => $active ? 'true' : 'false' =%>
 			</li>
 		% end
 		% content_for 'tab-content' => begin
-			<div class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>" id="<%= $actionID %>"
-				role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+			<div
+				class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>"
+				id="<%= $actionID %>"
+				role="tabpanel"
+				aria-labelledby="<%= $actionID %>-tab"
+			>
 				<%= include "ContentGenerator/Instructor/ProblemSetList/${actionID}_form" =%>
 			</div>
 		% end
@@ -113,19 +121,19 @@
 	%
 	<%= hidden_field action => $default_choice, id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	<div>
 		<%= submit_button maketext($formTitles->{$default_choice}),
-			id => 'take_action', class => 'btn btn-primary mb-3' =%>
+			id    => 'take_action',
+			class => 'btn btn-primary mb-3' =%>
 	</div>
 	%
 	<p class="mb-2">
-		<%= maketext('Showing [_1] out of [_2] sets.',
-			scalar @{ $c->{visibleSetIDs} },
-			scalar @{ $c->{allSetIDs} }
-		) =%>
+		<%= maketext('Showing [_1] out of [_2] sets.', scalar @{ $c->{visibleSetIDs} }, scalar @{ $c->{allSetIDs} }) =%>
 	</p>
 	%
 	<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_table' =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep
index 8b869d9867..a197c9ef8f 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/create_form.html.ep
@@ -4,19 +4,27 @@
 			<%= maketext('Name the new set') =%><span class="required-field">*</span>:
 		<% end =%>
 		<div class="col-auto">
-			<%= text_field 'action.create.name' => '', id => 'create_text', maxlength => '100',
-				'aria-required' => 'true', class => 'form-control form-control-sm', dir => 'ltr' =%>
+			<%= text_field
+				'action.create.name' => '',
+				id                   => 'create_text',
+				maxlength            => '100',
+				'aria-required'      => 'true',
+				class                => 'form-control form-control-sm',
+				dir                  => 'ltr' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for create_select => maketext("Create as what type of set?"),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			create_select => maketext("Create as what type of set?"),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.create.type' => [
+			<%= select_field
+				'action.create.type' => [
 					[ maketext('a new empty set')                       => 'empty', selected => undef ],
 					[ maketext('a duplicate of the first selected set') => 'copy' ]
 				],
-				id => 'create_select', class => 'form-select form-select-sm' =%>
+				id    => 'create_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="create_file_err_msg" class="alert alert-danger p-1 mb-2 d-inline-flex d-none">
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep
index 11fd4d84d8..26573609e5 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/delete_form.html.ep
@@ -3,14 +3,15 @@
 		<em><%= maketext('Warning: Deletion destroys all set-related data and is not undoable!') =%></em>
 	</div>
 	<div class="row mb-2">
-		<%= label_for delete_select => maketext('Delete selected sets?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			delete_select => maketext('Delete selected sets?'),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.delete.confirm' => [
-					[ maketext('No')  => 'no', selected => undef ],
-					[ maketext('Yes') => 'yes' ]
-				],
-				id => 'delete_select', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.delete.confirm' =>
+				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ] ],
+				id    => 'delete_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="delete_confirm_err_msg" class="alert alert-danger p-1 d-inline-flex d-none">
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep
index 736e59461f..a5f8c8f15b 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/edit_form.html.ep
@@ -1,10 +1,12 @@
 <div class="row mb-2">
 	<%= label_for edit_select => maketext('Edit which sets?'), class => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.edit.scope' => [
+		<%= select_field
+			'action.edit.scope' => [
 				[ maketext('all course sets') => 'all' ],
 				[ maketext('selected sets')   => 'selected', selected => undef ]
 			],
-			id => 'edit_select', class => 'form-select form-select-sm' =%>
+			id    => 'edit_select',
+			class => 'form-select form-select-sm' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep
index 12dd2478a8..4083126769 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/export_form.html.ep
@@ -1,11 +1,14 @@
 <div class="row mb-2">
-	<%= label_for export_select => maketext('Prepare which sets for export?'),
-		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<%= label_for
+		export_select => maketext('Prepare which sets for export?'),
+		class         => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.export.scope' => [
+		<%= select_field
+			'action.export.scope' => [
 				[ maketext('all course sets') => 'all' ],
 				[ maketext('selected sets')   => 'selected', selected => undef ],
 			],
-			id => 'export_select', class => 'form-select form-select-sm' =%>
+			id    => 'export_select',
+			class => 'form-select form-select-sm' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep
index 1cdfcfb183..a84e371d29 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/filter_form.html.ep
@@ -1,16 +1,19 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for filter_select => maketext('Show which sets?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			filter_select => maketext('Show which sets?'),
+			class         => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.filter.scope' => [
+			<%= select_field
+				'action.filter.scope' => [
 					[ maketext('all course sets')              => 'all' ],
 					[ maketext('selected sets')                => 'selected' ],
 					[ maketext('enter matching set IDs below') => 'match_ids', selected => undef ],
 					[ maketext('sets visible to students')     => 'visible' ],
 					[ maketext('sets hidden from students')    => 'unvisible' ]
 				],
-				id => 'filter_select', class => 'form-select form-select-sm' =%>
+				id    => 'filter_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="filter_elements" class="row mb-2">
@@ -19,8 +22,12 @@
 			<span class="required-field">*</span>
 		<% end =%>
 		<div class="col-auto">
-			<%= text_field 'action.filter.set_ids' => '', id => 'filter_text', 'aria-required' => 'true',
-				class => 'form-control form-control-sm', dir => 'ltr' =%>
+			<%= text_field
+				'action.filter.set_ids' => '',
+				id                      => 'filter_text',
+				'aria-required'         => 'true',
+				class                   => 'form-control form-control-sm',
+				dir                     => 'ltr' =%>
 		</div>
 	</div>
 	<div id="filter_err_msg" class="alert alert-danger p-1 mb-2 d-inline-flex d-none">
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
index 60bff0fd19..19ea5705d6 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/import_form.html.ep
@@ -1,59 +1,76 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for import_amt_select => maketext('Import how many sets?'),
-			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<%= label_for
+			import_amt_select => maketext('Import how many sets?'),
+			class             => 'col-form-label col-form-label-sm col-md-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.number' => [
-					[ maketext('a single set') => 1, selected => undef ],
-					[ maketext('multiple sets') => 8 ]
-				],
-				id => 'import_amt_select', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.import.number' =>
+				[ [ maketext('a single set') => 1, selected => undef ], [ maketext('multiple sets') => 8 ] ],
+				id    => 'import_amt_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row align-items-center mb-2">
-		<%= label_for import_source_select => maketext('Import from where?'),
-			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<%= label_for
+			import_source_select => maketext('Import from where?'),
+			class                => 'col-form-label col-form-label-sm col-md-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.source' => [
-					[ maketext('Select filename below') => '', selected => undef, disabled => undef ],
-					@$setDefList
-				],
-				id => 'import_source_select', class => 'form-select form-select-sm', dir => 'ltr',
-				size => param('action.import.number') || 1,
+			<%= select_field
+				'action.import.source' =>
+				[ [ maketext('Select filename below') => '', selected => undef, disabled => undef ], @$setDefList ],
+				id    => 'import_source_select',
+				class => 'form-select form-select-sm',
+				dir   => 'ltr',
+				size  => param('action.import.number')
+				|| 1,
 				data => {
 					select_multiple_text => maketext('Select filenames below'),
-					select_single_text => maketext('Select filename below')
+					select_single_text   => maketext('Select filename below')
 				},
-				defined param('action.import.number') && param('action.import.number') ne '1'
-				? (multiple => undef)
-				: () =%>
+				defined param('action.import.number')
+				&& param('action.import.number') ne '1' ? (multiple => undef) : () =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for import_text => maketext('Import sets with names') . ':',
-			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<%= label_for
+			import_text => maketext('Import sets with names') . ':',
+			class       => 'col-form-label col-form-label-sm col-md-auto' =%>
 		<div class="col-auto">
-			<%= text_field 'action.import.name' => '', id => 'import_text', class => 'form-control form-control-sm',
-				dir => 'ltr', data => { multiple_files_text => maketext('(taken from filenames)') } =%>
+			<%= text_field
+				'action.import.name' => '',
+				id                   => 'import_text',
+				class                => 'form-control form-control-sm',
+				dir                  => 'ltr',
+				data                 => { multiple_files_text => maketext('(taken from filenames)') } =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for import_date_shift => maketext('Shift dates so that the earliest is') . ':',
-			class => 'col-form-label col-form-label-sm col-md-auto' =%>
+		<%= label_for
+			import_date_shift => maketext('Shift dates so that the earliest is') . ':',
+			class             => 'col-form-label col-form-label-sm col-md-auto' =%>
 		<div class="col-auto">
 			<div class="input-group input-group-sm flatpickr">
-				<%= text_field 'action.import.start.date' => '',
-					id => 'import_date_shift', size => '27', class => 'form-control',
-					data => {
-						input => undef,
+				<%= text_field
+					'action.import.start.date' => '',
+					id                         => 'import_date_shift',
+					size                       => '27',
+					class                      => 'form-control',
+					data                       => {
+						input      => undef,
 						done_text  => maketext('Done'),
 						today_text => maketext('Today'),
 						now_text   => maketext('Now'),
 						locale     => $ce->{language},
 						timezone   => $ce->{siteDefaults}{timezone}
 					} =%>
-				<a class="btn btn-secondary btn-sm" data-toggle role="button" tabindex="0"
-					aria-label="<%= maketext('Pick date and time') =%>">
+				<a
+					class="btn btn-secondary btn-sm"
+					data-toggle
+					role="button"
+					tabindex="0"
+					aria-label="<%= maketext('Pick date and time') =%>"
+				>
 					<i class="fas fa-calendar-alt"></i>
 				</a>
 			</div>
@@ -61,14 +78,17 @@
 	</div>
 	% if ($authz->hasPermissions(param('user'), 'assign_problem_sets')) {
 		<div class="row mb-2">
-			<%= label_for import_users_select => maketext('Assign this set to which users?'),
-				class => 'col-form-label col-form-label-sm col-md-auto' =%>
+			<%= label_for
+				import_users_select => maketext('Assign this set to which users?'),
+				class               => 'col-form-label col-form-label-sm col-md-auto' =%>
 			<div class="col-auto">
-				<%= select_field 'action.import.assign' => [
+				<%= select_field
+					'action.import.assign' => [
 						[ maketext('all current users')          => 'all' ],
 						[ maketext('only') . ' ' . param('user') => param('user'), selected => undef ]
 					],
-					id => 'import_users_select', class => 'form-select form-select-sm' =%>
+					id    => 'import_users_select',
+					class => 'form-select form-select-sm' =%>
 			</div>
 		</div>
 	% }
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/lms_date_sync_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/lms_date_sync_form.html.ep
index 0e82adb910..814d4aac3d 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/lms_date_sync_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/lms_date_sync_form.html.ep
@@ -1,24 +1,28 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for lms_date_sync_select => maketext('Synchronize dates for which sets?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			lms_date_sync_select => maketext('Synchronize dates for which sets?'),
+			class                => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.lms_date_sync.scope' => [
+			<%= select_field
+				'action.lms_date_sync.scope' => [
 					[ maketext('all course sets') => 'all' ],
 					[ maketext('selected sets')   => 'selected', selected => undef ]
 				],
-				id => 'lms_date_sync_select', class => 'form-select form-select-sm' =%>
+				id    => 'lms_date_sync_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for lms_date_sync_direction => maketext('Synchronize dates in which direction?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			lms_date_sync_direction => maketext('Synchronize dates in which direction?'),
+			class                   => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.lms_date_sync.direction' => [
-					[ maketext('to the LMS')   => 'to', selected => undef ],
-					[ maketext('from the LMS') => 'from' ]
-				],
-				id => 'lms_date_sync_direction', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.lms_date_sync.direction' =>
+				[ [ maketext('to the LMS') => 'to', selected => undef ], [ maketext('from the LMS') => 'from' ] ],
+				id    => 'lms_date_sync_direction',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="d-inline-block alert alert-info p-1 mb-2">
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep
index 7314cd96a9..dcfe7bef45 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/publish_form.html.ep
@@ -1,24 +1,28 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for publish_select => maketext('Choose which sets to be affected') . ':',
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			publish_select => maketext('Choose which sets to be affected') . ':',
+			class          => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.publish.scope' => [
+			<%= select_field
+				'action.publish.scope' => [
 					[ maketext('all course sets') => 'all' ],
 					[ maketext('selected sets')   => 'selected', selected => undef ]
 				],
-				id => 'publish_select', class => 'form-select form-select-sm' =%>
+				id    => 'publish_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for publish_visibility_select => maketext('Choose visibility of the sets to be affected') . ':',
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			publish_visibility_select => maketext('Choose visibility of the sets to be affected') . ':',
+			class                     => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.publish.value' => [
-					[ maketext('Hidden')  => 0 ],
-					[ maketext('Visible') => 1, selected => undef ]
-			],
-			id => 'publish_visibility_select', class => 'form-select form-select-sm d-inline w-auto' =%>
+			<%= select_field
+				'action.publish.value' =>
+				[ [ maketext('Hidden') => 0 ], [ maketext('Visible') => 1, selected => undef ] ],
+				id    => 'publish_visibility_select',
+				class => 'form-select form-select-sm d-inline w-auto' =%>
 		</div>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep
index d4896d21dd..6fac720cdb 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/score_form.html.ep
@@ -1,11 +1,14 @@
 <div class="row mb-2">
-	<%= label_for score_select => maketext('Score which sets?'),
-		class => 'col-form-label col-form-label-sm col-auto' =%>
+	<%= label_for
+		score_select => maketext('Score which sets?'),
+		class        => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.score.scope' => [
+		<%= select_field
+			'action.score.scope' => [
 				[ maketext('all course sets') => 'all' ],
 				[ maketext('selected sets')   => 'selected', selected => undef ]
 			],
-			id => 'score_select', class => 'form-select form-select-sm' =%>
+			id    => 'score_select',
+			class => 'form-select form-select-sm' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep
index 6b6e53b589..2a9a547a58 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_field.html.ep
@@ -1,7 +1,8 @@
 % if ($type eq 'date') {
 	% if ($c->{editMode}) {
 		<div class="input-group input-group-sm flex-nowrap flatpickr">
-			<%= text_field $name => $value,
+			<%= text_field
+				$name       => $value,
 				id          => "${name}_id",
 				class       => 'form-control w-auto ' . ($name =~ /\.open_date/ ? ' datepicker-group' : ''),
 				size        => 22,
@@ -17,8 +18,13 @@
 					timezone   => $ce->{siteDefaults}{timezone}
 				},
 				'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header' =%>
-			<a class="btn btn-secondary btn-sm" data-toggle role="button" tabindex="0"
-				aria-label="<%= maketext('Pick date and time') %>">
+			<a
+				class="btn btn-secondary btn-sm"
+				data-toggle
+				role="button"
+				tabindex="0"
+				aria-label="<%= maketext('Pick date and time') %>"
+			>
 				<i class="fas fa-calendar-alt"></i>
 			</a>
 		</div>
@@ -31,7 +37,10 @@
 	% if ($c->{editMode}) {
 		% # If the checkbox is checked it returns a 1, if it is unchecked it returns nothing
 		% # in which case the hidden field overrides the parameter with a 0.
-		<%= check_box $name => 1, id => "${name}_id", class => 'form-check-input',
+		<%= check_box
+			$name             => 1,
+			id                => "${name}_id",
+			class             => 'form-check-input',
 			'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header',
 			$value ? (checked => undef) : () =%>
 		<%= hidden_field $name => 0 =%>
@@ -43,9 +52,12 @@
 	% # This is a fallback in case someone tries add a type without learning this system.
 	% if ($c->{editMode}) {
 		<div class="input-group input-group-sm flex-nowrap">
-			<%= text_field $name => $value, id => "${name}_id", class  => 'form-control w-auto',
+			<%= text_field
+				$name             => $value,
+				id                => "${name}_id",
+				class             => 'form-control w-auto',
 				'aria-labelledby' => ($name =~ s/^.*\.([^.]*)$/$1/r) . '_header',
-				size => 10 =%>
+				size              => 10 =%>
 		</div>
 	% } else {
 		<%= $value =%>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
index ee4381389b..ca76423f4a 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_row.html.ep
@@ -1,8 +1,8 @@
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
-% my $visibleClass   = $set->visible ? 'font-visible' : 'font-hidden';
-% my $set_id         = $set->set_id;
-% my $prettySetID    = format_set_name_display($set_id);
+% my $visibleClass = $set->visible ? 'font-visible' : 'font-hidden';
+% my $set_id       = $set->set_id;
+% my $prettySetID  = format_set_name_display($set_id);
 % my $iconClass;
 % my $iconTitle;
 % if ($set->assignment_type() =~ /gateway/) {
@@ -14,68 +14,74 @@
 % }
 %
 <tr>
-%
-% if ($c->{editMode}) {
-	<td><%= check_box apply_date_sets => $set_id, class => 'form-check-input' =%></td>
-	<td dir="ltr">
-		% if ($iconClass) {
-			<i class="<%= $iconClass =%>" title="<%= $iconTitle =%>" alt="<%= $iconTitle =%>"></i>
-		% }
-		<%= link_to $prettySetID => $c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
-	</td>
-% } else {
-	<td>
-		% param(selected_sets => [ param('selected_sets'), $set_id ]) if $setSelected;
-		<%= check_box selected_sets => $set_id, id => "${set_id}_id", class => 'form-check-input' =%>
-	</td>
-	<td>
-		<div class="d-flex justify-content-between gap-1" dir="ltr">
-			<%= label_for "${set_id}_id", begin =%>
-				<span class="set-label set-id-tooltip <%= $visibleClass %>" data-bs-toggle="tooltip"
-					data-bs-placement="right" data-bs-title="<%= $set->description %>">
-					% if ($iconClass) {
-						<i class="<%= $iconClass =%>" title="<%= $iconTitle =%>" alt="<%= $iconTitle =%>"></i>
-					% }
-					<%= $prettySetID =%>
-				</span>
-			<% end =%>
-			% if ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
-				<%= link_to $c->systemLink(
+	% if ($c->{editMode}) {
+		<td><%= check_box apply_date_sets => $set_id, class => 'form-check-input' =%></td>
+		<td dir="ltr">
+			% if ($iconClass) {
+				<i class="<%= $iconClass =%>" title="<%= $iconTitle =%>" alt="<%= $iconTitle =%>"></i>
+			% }
+			<%= link_to $prettySetID => $c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
+		</td>
+	% } else {
+		<td>
+			% param(selected_sets => [ param('selected_sets'), $set_id ]) if $setSelected;
+			<%= check_box selected_sets => $set_id, id => "${set_id}_id", class => 'form-check-input' =%>
+		</td>
+		<td>
+			<div class="d-flex justify-content-between gap-1" dir="ltr">
+				<%= label_for "${set_id}_id", begin =%>
+					<span
+						class="set-label set-id-tooltip <%= $visibleClass %>"
+						data-bs-toggle="tooltip"
+						data-bs-placement="right"
+						data-bs-title="<%= $set->description %>"
+					>
+						% if ($iconClass) {
+							<i class="<%= $iconClass =%>" title="<%= $iconTitle =%>" alt="<%= $iconTitle =%>"></i>
+						% }
+						<%= $prettySetID =%>
+					</span>
+				<% end =%>
+				% if ($authz->hasPermissions(param('user'), 'modify_problem_sets')) {
+					<%= link_to $c->systemLink(
 						url_for('instructor_set_list', setID => $set_id),
 						params => { editMode => 1, visible_sets => $set_id }
-					),
-					class => 'set-id-tooltip',
-					'aria-label' => maketext('Edit Set Data'),
-					data  => {
-						bs_toggle => 'tooltip',
-						bs_placement => 'right',
-						bs_title => maketext('Edit Set Data')
-					},
-					begin =%>
-					<i class="fas fa-pencil-alt" aria-hidden="true"></i>
-				<% end =%>
-			% }
-		</div>
-	</td>
-	%# Problems link
-	<td>
-		<%= link_to $db->countGlobalProblems($set_id) =>
-			$c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
-	</td>
-	% # Users link
-	<td>
-		<%= link_to $db->countSetUsers($set_id) . "/$c->{totalUsers}" =>
-			$c->systemLink(url_for('instructor_users_assigned_to_set', setID => $set_id)) =%>
-	</td>
-% }
-%
-% for my $field (@$fieldNames) {
-	% next unless defined $fieldTypes->{$field};
-	<td>
-		<div class="d-inline-block w-100 text-center text-nowrap <%= $visibleClass %>">
-			<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_field',
-				name => "set.$set_id.$field", value => $set->$field, type => $fieldTypes->{$field} =%>
-		</div>
-	</td>
-% }
+						),
+						class        => 'set-id-tooltip',
+						'aria-label' => maketext('Edit Set Data'),
+						data         => {
+							bs_toggle    => 'tooltip',
+							bs_placement => 'right',
+							bs_title     => maketext('Edit Set Data')
+						},
+						begin =%>
+						<i class="fas fa-pencil-alt" aria-hidden="true"></i>
+					<% end =%>
+				% }
+			</div>
+		</td>
+		% # Problems link
+		<td>
+			<%= link_to $db->countGlobalProblems($set_id) =>
+				$c->systemLink(url_for('instructor_set_detail', setID => $set_id)) %>
+		</td>
+		% # Users link
+		<td>
+			<%= link_to $db->countSetUsers($set_id)
+				. "/$c->{totalUsers}" =>
+				$c->systemLink(url_for('instructor_users_assigned_to_set', setID => $set_id)) =%>
+		</td>
+	% }
+	%
+	% for my $field (@$fieldNames) {
+		% next unless defined $fieldTypes->{$field};
+		<td>
+			<div class="d-inline-block w-100 text-center text-nowrap <%= $visibleClass %>">
+				<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_field',
+					name  => "set.$set_id.$field",
+					value => $set->$field,
+					type  => $fieldTypes->{$field} =%>
+			</div>
+		</td>
+	% }
 </tr>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
index bb220e0a2c..c194dab017 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/set_list_table.html.ep
@@ -26,18 +26,25 @@
 		</div>
 		<label class="col-auto col-form-label col-form-label-sm" for="common-date">to</label>
 		<div class="col-auto input-group input-group-sm flatpickr flex-nowrap" style="max-width: 200px">
-			<%= text_field 'common-date' => '',
-				id => 'common-date', class => 'form-control',
-				data => {
-					input => undef,
+			<%= text_field
+				'common-date' => '',
+				id            => 'common-date',
+				class         => 'form-control',
+				data          => {
+					input      => undef,
 					done_text  => maketext('Done'),
 					today_text => maketext('Today'),
 					now_text   => maketext('Now'),
 					locale     => $ce->{language},
 					timezone   => $ce->{siteDefaults}{timezone}
 				} =%>
-			<a class="btn btn-secondary btn-sm" data-toggle role="button" tabindex="0"
-				aria-label="<%= maketext('Pick date and time') =%>">
+			<a
+				class="btn btn-secondary btn-sm"
+				data-toggle
+				role="button"
+				tabindex="0"
+				aria-label="<%= maketext('Pick date and time') =%>"
+			>
 				<i class="fas fa-calendar-alt"></i>
 			</a>
 		</div>
@@ -58,33 +65,40 @@
 	<%= maketext('Please select at least one set.') %>
 </div>
 <div class="table-responsive">
-	<table id="set_table_id" class="set_table table table-sm table-bordered caption-top font-sm <%=
-		$c->{editMode} ? 'align-middle' : '' %>">
+	<table
+		id="set_table_id"
+		class="set_table table table-sm table-bordered caption-top font-sm <%= $c->{editMode} ? 'align-middle' : '' %>"
+	>
 		%
-		<caption><%= maketext('Set List') %></caption>
+		<caption>
+			<%= maketext('Set List') %>
+		</caption>
 		%
 		<thead class="table-group-divider">
 			<tr>
 				<th>
 					<%= label_for 'select-all', begin =%>
-						<%= check_box 'select-all' => '', id => 'select-all',
-							class => 'select-all form-check-input set-id-tooltip',
+						<%= check_box
+							'select-all' => '',
+							id           => 'select-all',
+							class        => 'select-all form-check-input set-id-tooltip',
 							'aria-label' => maketext('Select all sets'),
-							data => {
+							data         => {
 								select_group => $c->{editMode} ? 'apply_date_sets' : 'selected_sets',
-								bs_toggle => 'tooltip',
+								bs_toggle    => 'tooltip',
 								bs_placement => 'right',
-								bs_title => maketext('Select all sets')
+								bs_title     => maketext('Select all sets')
 							} =%>
-							<i class="fa-solid fa-check-double" aria-hidden="true"></i>
-						<% end =%>
+						<i class="fa-solid fa-check-double" aria-hidden="true"></i>
+					<% end =%>
 				</th>
 				% for (@$fieldNames) {
 					<th id="<%= $_ %>_header">
 						% if (!$c->{editMode} && $sortableFields->{$_}) {
 							<div class="d-flex justify-content-between align-items-end gap-1">
-								<%= link_to $fieldHeaders{$_} => '#', class => 'sort-header',
-									data => { sort_field => $_ } =%>
+								<%= link_to $fieldHeaders{$_} => '#',
+									class                     => 'sort-header',
+									data                      => { sort_field => $_ } =%>
 								<%= include 'ContentGenerator/Instructor/ProblemSetList/sort_button', field => $_ =%>
 							</div>
 						% } else {
@@ -99,7 +113,8 @@
 			% my %selectedSetIDs = (map { $_ => 1 } @{ $c->{selectedSetIDs} });
 			% for (@$sets) {
 				<%= include 'ContentGenerator/Instructor/ProblemSetList/set_list_row',
-					set => $_, setSelected => $selectedSetIDs{ $_->set_id } =%>
+					set         => $_,
+					setSelected => $selectedSetIDs{ $_->set_id } =%>
 			% }
 		</tbody>
 	</table>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep
index 0fff3ab5d2..9a957f8853 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/sort_button.html.ep
@@ -1,6 +1,9 @@
 % if ($c->{primarySortField} eq $field) {
-	<button type="button" data-sort-priority="primary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="primary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		1
 		% if ($c->{primarySortOrder} eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
@@ -11,8 +14,11 @@
 		% }
 	</button>
 % } elsif ($c->{secondarySortField} eq $field) {
-	<button type="button" data-sort-priority="secondary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="secondary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		2
 		% if ($c->{secondarySortOrder} eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
diff --git a/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep b/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep
index d12c438d81..13b1a8f7cf 100644
--- a/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep
+++ b/templates/ContentGenerator/Instructor/ProblemSetList/sort_form.html.ep
@@ -2,13 +2,17 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_1 => maketext('Sort by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_1 => maketext('Sort by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary' => [
+					<%= select_field
+						'action.sort.primary' => [
 							[ maketext('Set Name')  => 'set_id' ],
 							[ maketext('Open Date') => 'open_date' ],
-							($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+							(
+								$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
 								? [ maketext('Reduced Scoring Date') => 'reduced_scoring_date' ]
 								: ()
 							),
@@ -16,20 +20,23 @@
 							[ maketext('Answer Date') => 'answer_date' ],
 							[ maketext('Visibility')  => 'visible' ]
 						],
-						id => 'sort_select_1', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_1 => maketext('Ordered') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_1 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_1', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.primary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
@@ -37,13 +44,17 @@
 	<div class="row mb-2">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_2 => maketext('Then by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_2 => maketext('Then by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary' => [
+					<%= select_field
+						'action.sort.secondary' => [
 							[ maketext('Set Name')  => 'set_id' ],
-							[ maketext('Open Date') => 'open_date', selected => undef],
-							($ce->{pg}{ansEvalDefaults}{enableReducedScoring}
+							[ maketext('Open Date') => 'open_date', selected => undef ],
+							(
+								$ce->{pg}{ansEvalDefaults}{enableReducedScoring}
 								? [ maketext('Reduced Scoring Date') => 'reduced_scoring_date' ]
 								: ()
 							),
@@ -51,20 +62,23 @@
 							[ maketext('Answer Date') => 'answer_date' ],
 							[ maketext('Visibility')  => 'visible' ]
 						],
-						id => 'sort_select_2', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_2 => maketext('Ordered'). ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_2 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_2', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.secondary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/Scoring.html.ep b/templates/ContentGenerator/Instructor/Scoring.html.ep
index c73c3b64b2..d9c262f136 100644
--- a/templates/ContentGenerator/Instructor/Scoring.html.ep
+++ b/templates/ContentGenerator/Instructor/Scoring.html.ep
@@ -1,5 +1,5 @@
 % use WeBWorK::Utils::Files qw(readFile);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets  qw(format_set_name_display);
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	<div class="alert alert-danger p-1 mb-0">
@@ -25,9 +25,13 @@
 				<div class="row">
 					<div class="col-sm-6 mb-2">
 						<%= label_for selectedSet => maketext('Selected sets:'), class => 'form-label' =%>
-						<%= select_field selectedSet =>
-								[ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ],
-							id => 'selectedSet', class => 'form-select', size => 10, multiple => undef, dir => 'ltr' =%>
+						<%= select_field
+							selectedSet => [ map { [ format_set_name_display($_) => $_ ] } @{ $c->{ra_set_ids} } ],
+							id          => 'selectedSet',
+							class       => 'form-select',
+							size        => 10,
+							multiple    => undef,
+							dir         => 'ltr' =%>
 					</div>
 					<div class="col-sm-6 mt-sm-5">
 						<div class="form-check">
@@ -59,10 +63,15 @@
 					</div>
 				</div>
 				<div class="d-flex flex-sm-nowrap flex-wrap">
-					<%= submit_button maketext('Score selected set(s) and save to:'), name => 'score-sets',
-						id => 'score-sets', class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2' =%>
-					<%= text_field scoringFileName => $c->{scoringFileName}, class => 'form-control form-control-sm',
-						size => '40', 'aria-labelledby' => 'score-sets' =%>
+					<%= submit_button maketext('Score selected set(s) and save to:'),
+						name  => 'score-sets',
+						id    => 'score-sets',
+						class => 'btn btn-primary btn-sm me-2 mb-sm-0 mb-2' =%>
+					<%= text_field
+						scoringFileName   => $c->{scoringFileName},
+						class             => 'form-control form-control-sm',
+						size              => '40',
+						'aria-labelledby' => 'score-sets' =%>
 				</div>
 			<% end =%>
 		</div>
@@ -86,10 +95,8 @@
 					<ul>
 						% for my $filename (@validFiles) {
 							<li>
-								<%= link_to $filename => $c->systemLink(
-									url_for('instructor_scoring_download'),
-									params => { getFile => $filename }
-								) =%>
+								<%= link_to $filename => $c->systemLink(url_for('instructor_scoring_download'),
+									params => { getFile => $filename }) =%>
 							</li>
 						% }
 					</ul>
diff --git a/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep b/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep
index c7b0f6ce4e..6fec5ed234 100644
--- a/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep
+++ b/templates/ContentGenerator/Instructor/SendMail/main_form.html.ep
@@ -12,41 +12,51 @@
 						<%= label_for 'openfilename', class => 'input-group-text', begin =%>
 							<strong><%= maketext('Message file:') %></strong>
 						<% end =%>
-						<%= select_field openfilename => [
+						<%= select_field
+							openfilename => [
 								[ None => '' ],
 								map { [ $_ => $_, $_ eq $c->{input_file} ? (selected => undef) : () ] }
 								$c->get_message_file_names
 							],
-							id => 'openfilename', class => 'form-select form-select-sm' =%>
+							id    => 'openfilename',
+							class => 'form-select form-select-sm' =%>
 					</div>
 					<div class="input-group input-group-sm mb-2">
 						<%= label_for 'merge_file', class => 'input-group-text', begin =%>
 							<strong><%= maketext('Merge file:') %></strong>
 						<% end =%>
-						<%= select_field merge_file => [
+						<%= select_field
+							merge_file => [
 								[ None => '' ],
 								map { [ $_ => $_, $_ eq $c->{merge_file} ? (selected => undef) : () ] }
 								$c->get_merge_file_names
 							],
-							id => 'merge_file', class => 'form-select form-select-sm' =%>
+							id    => 'merge_file',
+							class => 'form-select form-select-sm' =%>
 					</div>
 					<div class="row mb-1">
-						<%= label_for from => maketext('From:'),
+						<%= label_for
+							from  => maketext('From:'),
 							class => 'col-sm-3 col-form-label col-form-label-sm' =%>
 						<div class="col-sm-9">
-							<%= text_field from => $c->{from}, id => 'from',
+							<%= text_field
+								from => $c->{from},
+								id   => 'from',
 								$c->{from} && $c->{from} eq $c->{defaultPreviewUser}->rfc822_mailbox
-									? (readonly => undef, disabled => undef)
-									: (),
+								? (readonly => undef, disabled => undef)
+								: (),
 								class => 'form-control form-control-sm' =%>
 						</div>
 					</div>
 					<div class="row mb-2">
-						<%= label_for subject => maketext('Subject:'),
-							class => 'col-sm-3 col-form-label col-form-label-sm' =%>
+						<%= label_for
+							subject => maketext('Subject:'),
+							class   => 'col-sm-3 col-form-label col-form-label-sm' =%>
 						<div class="col-sm-9">
-							<%= text_field subject => $c->{subject}, id => 'subject',
-								class => 'form-control form-control-sm' =%>
+							<%= text_field
+								subject => $c->{subject},
+								id      => 'subject',
+								class   => 'form-control form-control-sm' =%>
 						</div>
 					</div>
 					<div class="form-check">
@@ -54,28 +64,38 @@
 						<%= label_for send_to_all => maketext('Send to all students'), class => 'form-check-label' =%>
 					</div>
 					<div class="form-check mb-2">
-						<%= radio_button send_to => 'studentID', id => 'send_to_selected', class => 'form-check-input',
+						<%= radio_button
+							send_to => 'studentID',
+							id      => 'send_to_selected',
+							class   => 'form-check-input',
 							checked => undef =%>
-							<%= label_for send_to_selected => maketext('Send to selected students'),
-								class => 'form-check-label' =%>
+						<%= label_for
+							send_to_selected => maketext('Send to selected students'),
+							class            => 'form-check-label' =%>
 					</div>
 					% if ($c->{preview_user}) {
 						<div class="input-group input-group-sm mb-2">
 							<%= submit_button maketext('Preview Message'),
-								name => 'previewMessage', class => 'btn btn-secondary btn-sm' =%>
+								name  => 'previewMessage',
+								class => 'btn btn-secondary btn-sm' =%>
 							<span class="input-group-text text-nowrap">
 								<strong><%= maketext('for') %></strong>&nbsp;
-								<span id="preview-user" data-default="<%=
-									$c->{defaultPreviewUser}->last_name . ', ' . $c->{defaultPreviewUser}->first_name
-									. ' (' . $c->{defaultPreviewUser}->user_id . ')' %>">
-									<%= $c->{preview_user}->last_name . ', ' . $c->{preview_user}->first_name
-										. ' (' . $c->{preview_user}->user_id . ')' =%>
+								<span
+									id="preview-user"
+									data-default="<%= $c->{defaultPreviewUser}->last_name . ', '
+										. $c->{defaultPreviewUser}->first_name . ' ('
+										. $c->{defaultPreviewUser}->user_id . ')' %>"
+								>
+									<%= $c->{preview_user}->last_name . ', '
+										. $c->{preview_user}->first_name . ' ('
+										. $c->{preview_user}->user_id . ')' =%>
 								</span>
 							</span>
 						</div>
 					% }
 					<div class="mb-2">
-						<%= submit_button maketext('Send Email'), name => 'sendEmail',
+						<%= submit_button maketext('Send Email'),
+							name  => 'sendEmail',
 							class => 'btn btn-secondary btn-sm d-inline w-auto' =%>
 					</div>
 					% # Insert a toast containing a list of available macros.
@@ -85,29 +105,71 @@
 						</button>
 					</div>
 					<div class="position-fixed top-0 end-0 p-3" style="z-index: 21">
-						<div id="insertable-macros" class="toast bg-white" role="alert" aria-live="polite"
-								aria-atomic="true">
+						<div
+							id="insertable-macros"
+							class="toast bg-white"
+							role="alert"
+							aria-live="polite"
+							aria-atomic="true"
+						>
 							<div class="toast-header">
 								<strong class="me-auto"><%= maketext('List of insertable macros') %></strong>
-								<button type="button" class="btn-close" data-bs-dismiss="toast" aria-label="Close">
-								</button>
+								<button
+									type="button"
+									class="btn-close"
+									data-bs-dismiss="toast"
+									aria-label="Close"
+								></button>
 							</div>
 							<div class="toast-body">
 								<table class="table table-bordered table-sm align-middle w-auto mb-0 mx-auto">
 									<thead>
-										<tr><th><%= maketext('Macro') %></th><th><%= maketext('Value') %></th></tr>
+										<tr>
+											<th><%= maketext('Macro') %></th>
+											<th><%= maketext('Value') %></th>
+										</tr>
 									</thead>
 									<tbody class="table-group-divider">
-										<tr><td>$SID</td><td><%= maketext('Student ID') %></td></tr>
-										<tr><td>$FN</td><td><%= maketext('First name') %></td></tr>
-										<tr><td>$LN</td><td><%= maketext('Last name') %></td></tr>
-										<tr><td>$SECTION</td><td><%= maketext('Section') %></td></tr>
-										<tr><td>$RECITATION</td><td><%= maketext('Recitation') %></td></tr>
-										<tr><td>$STATUS</td><td><%= maketext('Enrolled, Drop, etc.') %></td></tr>
-										<tr><td>$EMAIL</td><td><%= maketext('Email address') %></td></tr>
-										<tr><td>$LOGIN</td><td><%= maketext('Login') %></td></tr>
-										<tr><td>$COL[n]</td><td><%= maketext('nth column of merge file') %></td></tr>
-										<tr><td>$COL[-1]</td><td><%= maketext('Last column of merge file') %></td></tr>
+										<tr>
+											<td>$SID</td>
+											<td><%= maketext('Student ID') %></td>
+										</tr>
+										<tr>
+											<td>$FN</td>
+											<td><%= maketext('First name') %></td>
+										</tr>
+										<tr>
+											<td>$LN</td>
+											<td><%= maketext('Last name') %></td>
+										</tr>
+										<tr>
+											<td>$SECTION</td>
+											<td><%= maketext('Section') %></td>
+										</tr>
+										<tr>
+											<td>$RECITATION</td>
+											<td><%= maketext('Recitation') %></td>
+										</tr>
+										<tr>
+											<td>$STATUS</td>
+											<td><%= maketext('Enrolled, Drop, etc.') %></td>
+										</tr>
+										<tr>
+											<td>$EMAIL</td>
+											<td><%= maketext('Email address') %></td>
+										</tr>
+										<tr>
+											<td>$LOGIN</td>
+											<td><%= maketext('Login') %></td>
+										</tr>
+										<tr>
+											<td>$COL[n]</td>
+											<td><%= maketext('nth column of merge file') %></td>
+										</tr>
+										<tr>
+											<td>$COL[-1]</td>
+											<td><%= maketext('Last column of merge file') %></td>
+										</tr>
 									</tbody>
 								</table>
 							</div>
@@ -143,8 +205,8 @@
 		% my @rows;
 		% my $cols = 0;
 		% for my $user (@{ $c->{ra_user_records} }) {
-			% if ($rh_merge_data->{$user->student_id}) {
-				% my $this_row = $rh_merge_data->{$user->student_id};
+			% if ($rh_merge_data->{ $user->student_id }) {
+				% my $this_row = $rh_merge_data->{ $user->student_id };
 				% push(@rows, $this_row);
 				% $cols = scalar(@$this_row) if scalar(@$this_row) > $cols;
 			% }
@@ -163,8 +225,11 @@
 		<%= label_for 'email-body', class => 'form-label', begin =%>
 			<%= maketext("Email Body:") %><span class="required-field">*</span>
 		<% end =%>
-		<%= text_area body => $c->{r_text},
-			id => 'email-body', rows => $ce->{mail}{editor_window_rows}, class => 'form-control' %>
+		<%= text_area
+			body  => $c->{r_text},
+			id    => 'email-body',
+			rows  => $ce->{mail}{editor_window_rows},
+			class => 'form-control' %>
 	</div>
 	%
 	% # Save buttons
@@ -179,10 +244,15 @@
 				</div>
 			% }
 			<div class="input-group input-group-sm w-auto m-1">
-				<%= submit_button maketext('Save as') . ':', name => 'saveAs', id => 'saveAs',
+				<%= submit_button maketext('Save as') . ':',
+					name  => 'saveAs',
+					id    => 'saveAs',
 					class => 'btn btn-secondary btn-sm' =%>
-				<%= text_field savefilename => $c->{output_file} ? $c->{output_file} : 'default.msg',
-					size => 20, class => 'form-control form-control-sm', 'aria-labelledby' => 'saveAs' =%>
+				<%= text_field
+					savefilename      => $c->{output_file} ? $c->{output_file} : 'default.msg',
+					size              => 20,
+					class             => 'form-control form-control-sm',
+					'aria-labelledby' => 'saveAs' =%>
 			</div>
 		</div>
 	</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker.html.ep b/templates/ContentGenerator/Instructor/SetMaker.html.ep
index ef068c3d3f..f20f85b51c 100644
--- a/templates/ContentGenerator/Instructor/SetMaker.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker.html.ep
@@ -6,8 +6,10 @@
 	<%= javascript getAssetURL($ce, 'js/SetMaker/setmaker.js'), defer => undef =%>
 	%
 	% if ($authz->hasPermissions(scalar(param('user')), 'modify_tags')) {
-		<%= javascript "$ce->{webworkURLs}{htdocs}/js/TagWidget/tagwidget.js", id => 'tag-widget-script',
-			defer => undef, data => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
+		<%= javascript "$ce->{webworkURLs}{htdocs}/js/TagWidget/tagwidget.js",
+			id    => 'tag-widget-script',
+			defer => undef,
+			data  => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
 	% }
 % end
 %
@@ -33,8 +35,11 @@
 	<%= hidden_field total_probs => $c->{total_probs} =%>
 	%
 	<div class="library-browser-table">
-		<%= include('ContentGenerator/Instructor/SetMaker/top_row',
-			local_sets => $c->{all_db_sets}, browse_which => $c->{browse_which}) =%>
+		<%= include(
+			'ContentGenerator/Instructor/SetMaker/top_row',
+			local_sets   => $c->{all_db_sets},
+			browse_which => $c->{browse_which}
+		) =%>
 	</div>
 	%
 	% # Show problems
@@ -45,33 +50,40 @@
 			% # If this problem has children, then show the problem and all children.
 			<div id="mlt-table<%= $i + 1 %>" class="lb-mlt-group">
 				<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
-					sourceFileData => $sourceFileData, pg_file => $plist->[$i], cnt => $i + 1 =%>
+					sourceFileData => $sourceFileData,
+					pg_file        => $plist->[$i],
+					cnt            => $i + 1 =%>
 				% for (@{ $sourceFileData->{children} }) {
 					% ++$i;
 					% last if $i == @$plist;    # Protection in case of malformed data.
 					% $pg_files->[ $i + $c->{first_index} ]{filepath} =~ s|^$ce->{courseDirs}{templates}/?||;
 					<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
 						sourceFileData => $pg_files->[ $i + $c->{first_index} ],
-						pg_file => $plist->[$i], cnt => $i + 1 =%>
+						pg_file        => $plist->[$i],
+						cnt            => $i + 1 =%>
 				% }
 			</div>
 		% } else {
 			<%= include 'ContentGenerator/Instructor/SetMaker/problem_row',
-				sourceFileData => $sourceFileData, pg_file => $plist->[$i], cnt => $i + 1 =%>
+				sourceFileData => $sourceFileData,
+				pg_file        => $plist->[$i],
+				cnt            => $i + 1 =%>
 		% }
 	% }
 	%
 	% if (@$pg_files) {
 		<div class="my-2">
 			<span id="what_shown">
-				<span id="firstshown"><%= $c->{first_shown} + 1 %></span>-<span id="lastshown"><%=
-					$c->{last_shown} + 1 %></span>
+				<span id="firstshown"><%= $c->{first_shown} + 1 %></span>-<span id="lastshown"
+					><%= $c->{last_shown} + 1 %></span
+				>
 			</span>
 			<%= maketext('of') %>
 			<span id="totalshown"><%= $c->{total_probs} %></span>
 			<%= maketext('shown') %>
 			% if ($c->{first_index} > 0) {
-				<%= submit_button maketext('Previous page'), name => 'prev_page',
+				<%= submit_button maketext('Previous page'),
+					name  => 'prev_page',
 					class => 'btn btn-secondary btn-sm' =%>
 			% }
 			% if (1 + $c->{last_index} < @$pg_files) {
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep
index 30c842646c..fd58ce75a1 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_course_sets_panel.html.ep
@@ -5,15 +5,20 @@
 <div class="InfoPanel">
 	<div class="mb-2">
 		<%= label_for library_sets => maketext('Browse from:'), class => 'col-form-label-sm' =%>
-		<%= select_field library_sets => [
+		<%= select_field
+			library_sets => [
 				@$local_sets == 0 ? [ maketext('No sets in this course yet') => '' ]
 				: (
-					$selected_library eq '' ? [ maketext('Select a Homework Set') => '', selected => undef, disabled => 'disabled' ] : (),
+					$selected_library eq ''
+					? [ maketext('Select a Homework Set') => '', selected => undef, disabled => 'disabled' ]
+					: (),
 					map { [ format_set_name_display($_) => $_, $_ eq $selected_library ? (selected => undef) : () ] }
 					@$local_sets
 				)
 			],
-			id => 'library_sets', class => 'form-select form-select-sm d-inline w-auto', dir => 'ltr' =%>
+			id    => 'library_sets',
+			class => 'form-select form-select-sm d-inline w-auto',
+			dir   => 'ltr' =%>
 	</div>
 	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'view_course_set' =%>
 </div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep
index 442ac09bbe..f691c83f24 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel.html.ep
@@ -9,10 +9,11 @@
 	% || symlink($libraryRoot, "$ce->{courseDirs}{templates}/Library"))
 % {
 	% my $msg = begin
-	You are missing the directory <code>templates/Library</code>, which is needed for the Problem Library to function.
-	It should be a link pointing to <code><%= $libraryRoot %></code>, which you set in <code>conf/site.conf</code>.  An
-	attempt was made to create the link, but that failed. Check the permissions in your <code>templates</code>
-	directory.
+		You are missing the directory <code>templates/Library</code>, which is needed for the Problem Library to
+		function. It should be a link pointing to <code><%= $libraryRoot %></code>, which you set in
+		<code>conf/site.conf</code>. An attempt was made to create the link, but that failed. Check the permissions
+		in your <code>templates</code>
+		directory.
 	% end
 	% $c->addbadmessage($msg->());
 % }
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep
index bc3c24af09..78f9d75ba6 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_advanced.html.ep
@@ -8,69 +8,81 @@
 	<div class="row mb-1">
 		<div class="col-md-6 col-sm-8 mb-1 offset-md-3">
 			<div class="row mb-1">
-				<%= label_for library_subject => maketext('Subject:'),
-					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_subject => maketext('Subject:'),
+					class           => 'col-3 col-form-label col-form-label-sm' =%>
 				<div class="col-9">
-					<%= select_field library_subject => [
-							[ maketext('All Subjects') => '', selected => undef ],
-							getAllDBsubjects($c)
-						],
-						id => 'library_subject', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_subject =>
+						[ [ maketext('All Subjects') => '', selected => undef ], getAllDBsubjects($c) ],
+						id    => 'library_subject',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_chapter => maketext('Chapter:'),
-					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_chapter => maketext('Chapter:'),
+					class           => 'col-3 col-form-label col-form-label-sm' =%>
 				<div class="col-9">
-					<%= select_field library_chapter => [
-							[ maketext('All Chapters') => '', selected => undef ],
-							getAllDBchapters($c)
-						],
-						id => 'library_chapter', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_chapter =>
+						[ [ maketext('All Chapters') => '', selected => undef ], getAllDBchapters($c) ],
+						id    => 'library_chapter',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_section => maketext('Section:'),
-					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_section => maketext('Section:'),
+					class           => 'col-3 col-form-label col-form-label-sm' =%>
 				<div class="col-9">
-					<%= select_field library_section => [
-							[ maketext('All Sections') => '', selected => undef ],
-							getAllDBsections($c)
-						],
-						id => 'library_section', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_section =>
+						[ [ maketext('All Sections') => '', selected => undef ], getAllDBsections($c) ],
+						id    => 'library_section',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_textbook => maketext('Textbook:'),
-					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_textbook => maketext('Textbook:'),
+					class            => 'col-3 col-form-label col-form-label-sm' =%>
 				<div class="col-9">
-					<%= select_field library_textbook => [
+					<%= select_field
+						library_textbook => [
 							[ maketext('All Textbooks') => '', selected => undef ],
 							map { [ "$_->[1] by $_->[2] (edition $_->[3])" => $_->[0] ] } @{ getDBTextbooks($c) }
 						],
-						id => 'library_textbook', class => 'form-select form-select-sm' =%>
+						id    => 'library_textbook',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_textchapter => maketext('Text chapter:'),
-					class => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
+				<%= label_for
+					library_textchapter => maketext('Text chapter:'),
+					class               => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
 				<div class="col-9">
-					<%= select_field library_textchapter => [
+					<%= select_field
+						library_textchapter => [
 							[ maketext('All Chapters') => '', selected => undef ],
 							map { [ "$_->[1]. $_->[2]" => $_->[0] ] } @{ getDBTextbooks($c, 'textchapter') }
 						],
-						id => 'library_textchapter', class => 'form-select form-select-sm' =%>
+						id    => 'library_textchapter',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_textsection => maketext('Text section:'),
-					class => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
+				<%= label_for
+					library_textsection => maketext('Text section:'),
+					class               => 'col-3 col-form-label col-form-label-sm text-nowrap' =%>
 				<div class="col-9">
-					<%= select_field library_textsection => [
+					<%= select_field
+						library_textsection => [
 							[ maketext('All Sections') => '', selected => undef ],
 							map { [ "$_->[1]. $_->[2]" => $_->[0] ] } @{ getDBTextbooks($c, 'textsection') }
 						],
-						id => 'library_textsection', class => 'form-select form-select-sm' =%>
+						id    => 'library_textsection',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
@@ -90,20 +102,26 @@
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_keywords => maketext('Keywords:'),
-					class => 'col-3 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_keywords => maketext('Keywords:'),
+					class            => 'col-3 col-form-label col-form-label-sm' =%>
 				<div class="col-9">
-					<%= text_field library_keywords => '',
-						id => 'library_keywords', class => 'form-control form-control-sm' =%>
+					<%= text_field
+						library_keywords => '',
+						id               => 'library_keywords',
+						class            => 'form-control form-control-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center">
-			<%= submit_button maketext('Update Menus'), name => 'lib_select_subject',
+			<%= submit_button maketext('Update Menus'),
+				name  => 'lib_select_subject',
 				class => 'btn btn-secondary btn-sm mb-1 library-panel-btn' =%>
-			<%= submit_button maketext('Reset'), name => 'library_reset',
+			<%= submit_button maketext('Reset'),
+				name  => 'library_reset',
 				class => 'btn btn-secondary btn-sm mb-1 ms-sm-0 ms-2 library-panel-btn' =%>
-			<%= submit_button maketext('Basic Search'), name => 'library_basic',
+			<%= submit_button maketext('Basic Search'),
+				name  => 'library_basic',
 				class => 'btn btn-secondary btn-sm mb-2 ms-sm-0 ms-2 library-panel-btn' =%>
 			<%= include 'ContentGenerator/Instructor/SetMaker/library-include-checks' =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep
index 2f5bcc60e4..0335737c9c 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_library_panel_simple.html.ep
@@ -5,41 +5,45 @@
 	<div class="row mb-2">
 		<div class="col-md-6 col-sm-8 offset-md-3">
 			<div class="row mb-1">
-				<%= label_for library_subject => maketext('Subject:'),
-					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_subject => maketext('Subject:'),
+					class           => 'col-2 col-form-label col-form-label-sm' =%>
 				<div class="col-10">
-					<%= select_field library_subject => [
-							[ maketext('All Subjects') => '', selected => undef ],
-							getAllDBsubjects($c)
-						],
-						id => 'library_subject', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_subject =>
+						[ [ maketext('All Subjects') => '', selected => undef ], getAllDBsubjects($c) ],
+						id    => 'library_subject',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_chapter => maketext('Chapter:'),
-					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_chapter => maketext('Chapter:'),
+					class           => 'col-2 col-form-label col-form-label-sm' =%>
 				<div class="col-10">
-					<%= select_field library_chapter => [
-							[ maketext('All Chapters') => '', selected => undef ],
-							getAllDBchapters($c)
-						],
-						id => 'library_chapter', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_chapter =>
+						[ [ maketext('All Chapters') => '', selected => undef ], getAllDBchapters($c) ],
+						id    => 'library_chapter',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 			<div class="row mb-1">
-				<%= label_for library_section => maketext('Section:'),
-					class => 'col-2 col-form-label col-form-label-sm' =%>
+				<%= label_for
+					library_section => maketext('Section:'),
+					class           => 'col-2 col-form-label col-form-label-sm' =%>
 				<div class="col-10">
-					<%= select_field library_section => [
-							[ maketext('All Sections') => '', selected => undef ],
-							getAllDBsections($c)
-						],
-						id => 'library_section', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						library_section =>
+						[ [ maketext('All Sections') => '', selected => undef ], getAllDBsections($c) ],
+						id    => 'library_section',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-3 col-sm-4 mb-1 d-flex flex-sm-column justify-content-sm-start justify-content-center">
-			<%= submit_button maketext('Advanced Search'), name => 'library_advanced',
+			<%= submit_button maketext('Advanced Search'),
+				name  => 'library_advanced',
 				class => 'btn btn-secondary btn-sm library-panel-btn mb-2' =%>
 			<%= include 'ContentGenerator/Instructor/SetMaker/library-include-checks' =%>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep
index b3c825cc47..ab216a40da 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_local_panel.html.ep
@@ -6,27 +6,34 @@
 <div class="InfoPanel">
 	<div class="mb-2">
 		% my $courseFilesText = maketext('Course Files');
-		<%= label_for library_sets => maketext('[_1] Problems:', $lib eq '' ? $courseFilesText : $c->{problibs}{$lib}),
-			class => 'col-form-label-sm' =%>
-		<%= select_field library_sets => [
-				@$prob_dirs == 0 ? [ maketext('Found no directories containing problems') => '' ]
+		<%= label_for
+			library_sets => maketext('[_1] Problems:', $lib eq '' ? $courseFilesText : $c->{problibs}{$lib}),
+			class        => 'col-form-label-sm' =%>
+		<%= select_field
+			library_sets => [
+				@$prob_dirs == 0
+				? [ maketext('Found no directories containing problems') => '' ]
 				: (
 					$selected_library eq ''
-						? [ maketext('Select a Folder') => '', selected => undef, disabled => 'disabled' ]
-						: (),
-					$lib ? (
-						map { [ $_ =~ s/^$lib\/(.*)$/$1/r => $_, $_ eq $selected_library ? (selected => undef) : () ] }
-						@$prob_dirs
-					) : (
+					? [ maketext('Select a Folder') => '', selected => undef, disabled => 'disabled' ]
+					: (),
+					$lib
+					? (
+						map { [
+							$_ =~ s/^$lib\/(.*)$/$1/r => $_,
+							$_ eq $selected_library ? (selected => undef) : ()
+						] } @$prob_dirs
+					)
+					: (
 						map { [
 							$_ =~ s/^My Problems$/[templates folder]/r => $_,
 							$_ eq $selected_library ? (selected => undef) : ()
-						] }
-						@$prob_dirs
+						] } @$prob_dirs
 					)
 				)
 			],
-			id => 'library_sets', class => 'form-select form-select-sm d-inline w-auto' =%>
+			id    => 'library_sets',
+			class => 'form-select form-select-sm d-inline w-auto' =%>
 	</div>
 	<%= include 'ContentGenerator/Instructor/SetMaker/view_problems_line', internal_name => 'view_local_set' =%>
 </div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep b/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep
index 7c421cba4d..428207022c 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/browse_setdef_panel.html.ep
@@ -14,7 +14,8 @@
 <div class="InfoPanel">
 	<div class="mb-2">
 		<label class="col-form-label-sm"><%= maketext('Browse from:') %></label>
-		<%= select_field library_sets => [
+		<%= select_field
+			library_sets => [
 				[
 					maketext('Select a Set Definition File') => '',
 					$selected_library ? () : (selected => undef),
diff --git a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
index 216cd368a1..ab3ed4f2d7 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/problem_row.html.ep
@@ -10,16 +10,15 @@
 %
 % # Determine if the target set is a gateway assignment.
 % my $setRecord =
-	% (defined param('local_sets') && param('local_sets') ne '')
-	% ? $db->getGlobalSet(param('local_sets'))
-	% : undef;
+	% (defined param('local_sets') && param('local_sets') ne '') ? $db->getGlobalSet(param('local_sets')) : undef;
 % my $isGatewaySet = defined $setRecord && $setRecord->assignment_type =~ /gateway/;
 %
 % my $noshowclass = $sourceFileData->{morelt} ? "MLT$sourceFileData->{morelt}" : "NS$cnt";
 % if ($sourceFileData->{children}) {
 	% my $numchild = @{ $sourceFileData->{children} };
 	% content_for "mlt-$cnt" => begin
-		<%= tag('span',
+		<%= tag(
+			'span',
 			class    => 'lb-mlt-parent btn btn-sm btn-secondary',
 			id       => "mlt$cnt",
 			tabindex => 0,
@@ -46,48 +45,70 @@
 	% if ($stats->{students_attempted}) {
 		% content_for "global-problem-stats-$cnt" => begin
 			<div class="d-inline-block font-sm text-nowrap">
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Global Usage Data') %>"
-					data-bs-content="<%= maketext(
-						'Global data on problem usage is contributed by many institutions using '
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Global Usage Data') %>"
+					data-bs-content="<%= maketext('Global data on problem usage is contributed by many institutions using '
 							. 'WeBWorK all over the world. The Usage figure is the total number of  '
 							. 'individuals who have attempted this problem at least once. A high figure '
 							. 'represents a problem which has been assigned to many students and is  '
-							. 'both popular with instructors and likely bug free.'
-					) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
-					role="button">
+							. 'both popular with instructors and likely bug free.') %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-trigger="hover focus"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('GLOBAL Usage') . ': ' =%>
 				</span>
 				<%= $stats->{students_attempted} . ', ' =%>
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Global Attempts') %>"
-					data-bs-content="<%= maketext(
-						'The Attempts figure is the global average of the number of attempts '
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Global Attempts') %>"
+					data-bs-content="<%= maketext('The Attempts figure is the global average of the number of attempts '
 							. '(both correct and incorrect) individuals take on this problem.  '
 							. 'A high figure may represent a difficult problem.  Note that problems '
 							. 'with multiple parts may have higher average attempts since many students  '
 							. 'will submit an answer to each part before continuing and each such  '
-							. 'submittal counts as an attempt.'
-					) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
-					role="button">
+							. 'submittal counts as an attempt.') %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-trigger="hover focus"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('Attempts') . ': ' =%>
 				</span>
 				<%= wwRound(2, $stats->{average_attempts}) . ', ' =%>
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Global Status') %>"
-					data-bs-content="<%= tag('p', maketext(
-						'The Status figure is the global average of the Status '
-							. 'individuals have earned on this problem. The Status is the percentage '
-							. 'correct (from 0% to 100%) recorded for the problem.  A low figure may  '
-							. 'represent a difficult problem.  The Status is often fairly high since  '
-							. 'many students will work on a problem until they get it correct or nearly so.'
-					))
-					. tag('p', class => 'mb-0', maketext(
-						'Reviewing a problem and looking at both the average Attempts and  '
-							. 'average Status should give instructors valuable information about '
-							. 'the difficulty of the problem.'
-					)) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true"
-					data-bs-trigger="hover focus" tabindex="0" role="button">
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Global Status') %>"
+					data-bs-content="<%= tag(
+						'p',
+						maketext(
+							'The Status figure is the global average of the Status '
+								. 'individuals have earned on this problem. The Status is the percentage '
+								. 'correct (from 0% to 100%) recorded for the problem.  A low figure may  '
+								. 'represent a difficult problem.  The Status is often fairly high since  '
+								. 'many students will work on a problem until they get it correct or nearly so.'
+						)
+						)
+						. tag(
+							'p',
+							class => 'mb-0',
+							maketext(
+								'Reviewing a problem and looking at both the average Attempts and  '
+								. 'average Status should give instructors valuable information about '
+								. 'the difficulty of the problem.'
+							)
+						) %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-html="true"
+					data-bs-trigger="hover focus"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('Status') . ': ' =%>
 				</span>
 				<%= wwRound(0, 100 * $stats->{average_status}) =%>
@@ -102,52 +123,84 @@
 	% if ($stats->{students_attempted}) {
 		% content_for "local-problem-stats-$cnt" => begin
 			<div class="d-inline-block font-sm text-nowrap">
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Local Usage Data') %>"
-					data-bs-content="<%= tag('p', maketext(
-						'Local data on problem usage is generated and maintained by your institution. '
-							. 'The Usage figure is the total number of local '
-							. 'individuals who have attempted this problem at least once. A high figure '
-							. 'represents a problem which has been assigned to many students and is  '
-							. 'both popular with instructors and likely bug free.'
-					))
-					. tag('p', class => 'mb-0', maketext(
-						'Local data is generated when your systems admin runs the script '
-							. 'update-OPL-statistics.'
-					)) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" data-bs-html="true"
-					tabindex="0" role="button">
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Local Usage Data') %>"
+					data-bs-content="<%= tag(
+						'p',
+						maketext(
+							'Local data on problem usage is generated and maintained by your institution. '
+								. 'The Usage figure is the total number of local '
+								. 'individuals who have attempted this problem at least once. A high figure '
+								. 'represents a problem which has been assigned to many students and is  '
+								. 'both popular with instructors and likely bug free.'
+						)
+						)
+						. tag(
+							'p',
+							class => 'mb-0',
+							maketext(
+								'Local data is generated when your systems admin runs the script '
+								. 'update-OPL-statistics.'
+							)
+						) %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-trigger="hover focus"
+					data-bs-html="true"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('LOCAL Usage') . ': ' =%>
 				</span>
 				<%= $stats->{students_attempted} . ', ' =%>
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Local Attempts') %>"
-					data-bs-content="<%= maketext(
-						'The Attempts figure is the local average of the number of attempts '
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Local Attempts') %>"
+					data-bs-content="<%= maketext('The Attempts figure is the local average of the number of attempts '
 							. '(both correct and incorrect) individuals at your institution take on this problem. '
 							. 'A high figure may represent a difficult problem.  Note that problems '
 							. 'with multiple parts may have higher average attempts since many students  '
 							. 'will submit an answer to each part before continuing and each such  '
-							. 'submittal counts as an attempt.'
-					) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-trigger="hover focus" tabindex="0"
-					role="button">
+							. 'submittal counts as an attempt.') %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-trigger="hover focus"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('Attempts') . ': ' =%>
 				</span>
 				<%= wwRound(2, $stats->{average_attempts}) . ', ' =%>
-				<span class="info-button text-primary-emphasis" title="<%= maketext('Local Status') %>"
-					data-bs-content="<%= tag('p', maketext(
-						'The Status figure is the local average of the Status '
-							. 'individuals at your institution have earned on this problem. The Status is the '
-							. 'percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  '
-							. 'represent a difficult problem.  The Status is often fairly high since  '
-							. 'many students will work on a problem until they get it correct or nearly so.'
-					))
-					. tag('p', class => 'mb-0', maketext(
-						'Reviewing a problem and looking at both the average Attempts and  '
-							. 'average Status should give instructors valuable information about '
-							. 'the difficulty of the problem.'
-					)) %>"
-					data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true" data-bs-trigger="hover focus"
-					tabindex="0" role="button">
+				<span
+					class="info-button text-primary-emphasis"
+					title="<%= maketext('Local Status') %>"
+					data-bs-content="<%= tag(
+						'p',
+						maketext(
+							'The Status figure is the local average of the Status '
+								. 'individuals at your institution have earned on this problem. The Status is the '
+								. 'percentage correct (from 0% to 100%) recorded for the problem.  A low figure may  '
+								. 'represent a difficult problem.  The Status is often fairly high since  '
+								. 'many students will work on a problem until they get it correct or nearly so.'
+						)
+						)
+						. tag(
+							'p',
+							class => 'mb-0',
+							maketext(
+								'Reviewing a problem and looking at both the average Attempts and  '
+								. 'average Status should give instructors valuable information about '
+								. 'the difficulty of the problem.'
+							)
+						) %>"
+					data-bs-toggle="popover"
+					data-bs-placement="top"
+					data-bs-html="true"
+					data-bs-trigger="hover focus"
+					tabindex="0"
+					role="button"
+				>
 					<%= maketext('Status') . ': ' =%>
 				</span>
 				<%= wwRound(0, 100 * $stats->{average_status}) =%>
@@ -160,14 +213,23 @@
 	<div class="card p-2">
 		<div class="lb-problem-header d-flex flex-wrap justify-content-between">
 			<div class="lb-problem-add d-flex align-items-center mb-1">
-				<button class="add_me btn btn-primary btn-sm" type="button"
+				<button
+					class="add_me btn btn-primary btn-sm"
+					type="button"
 					data-bs-title="<%= maketext('Add problem to target set') %>"
-					data-source-file="<%= $sourceFileName %>" data-bs-toggle="tooltip" data-bs-placement="top">
+					data-source-file="<%= $sourceFileName %>"
+					data-bs-toggle="tooltip"
+					data-bs-placement="top"
+				>
 					<%= maketext('Add') %>
 				</button>
 				% if ($authz->hasPermissions(param('user'), 'modify_tags')) {
-					<button id="tagger<%= $cnt %>" class="tag-edit-btn btn btn-secondary btn-sm ms-2" type="button"
-						data-source-file="<%= "$ce->{courseDirs}{templates}/$sourceFileName" %>">
+					<button
+						id="tagger<%= $cnt %>"
+						class="tag-edit-btn btn btn-secondary btn-sm ms-2"
+						type="button"
+						data-source-file="<%= "$ce->{courseDirs}{templates}/$sourceFileName" %>"
+					>
 						<%= maketext('Edit Tags') =%>
 					</button>
 				% }
@@ -180,37 +242,51 @@
 				<%= content "mlt-$cnt" =%>
 				<span class="motag">
 					% if ($isMO) {
-						<span class="info-button btn btn-sm btn-secondary" title="<%= maketext('Uses Math Objects') %>"
+						<span
+							class="info-button btn btn-sm btn-secondary"
+							title="<%= maketext('Uses Math Objects') %>"
 							data-bs-content="<%= maketext(
 								'Some WeBWorK problems are programmed using what are called <i>Math Objects</i>. '
 									. 'These problems are preferred by some people because they '
 									. 'provide a more consistent collection of messages to faulty student '
-									. 'answers, particularly for answers which are way off base.'
-							) %>"
-							data-bs-toggle="popover" data-bs-placement="top" data-bs-html="true"
-							data-bs-trigger="hover focus" tabindex="0" role="button">
-							<%= image "$ce->{webworkURLs}{htdocs}/images/pi.svg",
-								alt => maketext('Uses Math Objects') =%>
+									. 'answers, particularly for answers which are way off base.') %>"
+							data-bs-toggle="popover"
+							data-bs-placement="top"
+							data-bs-html="true"
+							data-bs-trigger="hover focus"
+							tabindex="0"
+							role="button"
+						>
+							<%=
+								image "$ce->{webworkURLs}{htdocs}/images/pi.svg", alt => maketext('Uses Math Objects')
+							=%>
 						</span>
 					% }
 				</span>
 				% if (!$isstatic) {
-					<span class="rerandomize_problem_button btn btn-sm btn-secondary"
-						data-target-problem="<%= $cnt %>" data-bs-title="<%= maketext('Randomize') %>"
-						data-bs-toggle="tooltip" data-bs-placement="top" tabindex="0"
-						role="button" aria-label="rerandomize problem">
+					<span
+						class="rerandomize_problem_button btn btn-sm btn-secondary"
+						data-target-problem="<%= $cnt %>"
+						data-bs-title="<%= maketext('Randomize') %>"
+						data-bs-toggle="tooltip"
+						data-bs-placement="top"
+						tabindex="0"
+						role="button"
+						aria-label="rerandomize problem"
+					>
 						<i class="fas fa-random" aria-hidden="true"></i>
 					</span>
 				% }
 				<%= link_to $c->systemLink(
-						url_for('instructor_problem_editor_withset_withproblem',
-							setID     => 'Undefined_Set',
-						   	problemID => '1'
-						),
-						params => {
-							sourceFilePath => $sourceFileName,
-							problemSeed    => $c->{problem_seed}
-						}
+					url_for(
+						'instructor_problem_editor_withset_withproblem',
+						setID     => 'Undefined_Set',
+						problemID => '1'
+					),
+					params => {
+						sourceFilePath => $sourceFileName,
+						problemSeed    => $c->{problem_seed}
+					}
 					),
 					id     => "editit$cnt",
 					class  => 'btn btn-sm btn-secondary',
@@ -225,19 +301,21 @@
 					<span class="visually-hidden"><%= maketext('Edit') =%></span>
 				<% end =%>
 				<%= link_to $c->systemLink(
-						url_for($isGatewaySet ? 'gateway_quiz' : 'problem_detail',
-							setID => 'Undefined_Set',
-							$isGatewaySet ? () : (problemID => '1')
-						),
-						params => {
-							effectiveUser  => scalar(param('user')),
-							editMode       => 'SetMaker',
-							problemSeed    => $c->{problem_seed},
-							sourceFilePath => $sourceFileName,
-							displayMode    => (
-								!defined param('problem_displaymode') || param('problem_displaymode') eq 'None'
-							) ? $ce->{pg}{options}{displayMode} : param('problem_displaymode'),
-						}
+					url_for(
+						$isGatewaySet ? 'gateway_quiz' : 'problem_detail',
+						setID => 'Undefined_Set',
+						$isGatewaySet ? () : (problemID => '1')
+					),
+					params => {
+						effectiveUser  => scalar(param('user')),
+						editMode       => 'SetMaker',
+						problemSeed    => $c->{problem_seed},
+						sourceFilePath => $sourceFileName,
+						displayMode    =>
+							(!defined param('problem_displaymode') || param('problem_displaymode') eq 'None')
+						? $ce->{pg}{options}{displayMode}
+						: param('problem_displaymode'),
+					}
 					),
 					id     => "tryit$cnt",
 					class  => 'text-decoration-none btn btn-sm btn-secondary',
@@ -250,17 +328,26 @@
 					begin =%>
 					<i class="far fa-eye"></i>
 				<% end =%>
-				<span class="dont-show btn btn-sm btn-secondary" data-bs-title="<%= maketext('Hide this problem') %>"
-					data-row-cnt="<%= $cnt %>" data-bs-toggle="tooltip" data-bs-placement="top" tabindex="0"
-					role="button" aria-label="hide this problem">
+				<span
+					class="dont-show btn btn-sm btn-secondary"
+					data-bs-title="<%= maketext('Hide this problem') %>"
+					data-row-cnt="<%= $cnt %>"
+					data-bs-toggle="tooltip"
+					data-bs-placement="top"
+					tabindex="0"
+					role="button"
+					aria-label="hide this problem"
+				>
 					<i class="fas fa-times" aria-hidden="true"></i>
 				</span>
 			</div>
 		</div>
 		<div class="lb-problem-sub-header d-flex">
 			<div class="lb-problem-path font-sm flex-grow-1 flex-shrink-1"><%= $sourceFileName %></div>
-			<div class="lb-inset text-nowrap <%= $c->{isInSet}{$sourceFileName} ? '' : ' d-none' %>"
-				id="inset<%= $cnt %>">
+			<div
+				class="lb-inset text-nowrap <%= $c->{isInSet}{$sourceFileName} ? '' : ' d-none' %>"
+				id="inset<%= $cnt %>"
+			>
 				<i><b><%= maketext('(in target set)') %></b></i>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep b/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep
index 904e30342b..5451ee590c 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/top_row.html.ep
@@ -8,10 +8,12 @@
 		<%= label_for 'local_sets', class => 'col-form-label-sm', begin =%>
 			<%= maketext('Add problems to') %> <b><%= maketext('Target Set:') %></b>
 		<% end =%>
-		<%= select_field local_sets => [
+		<%= select_field
+			local_sets => [
 				@$local_sets == 0 ? [ maketext('No sets in this course yet') => '' ]
 				: (
-					$selected_set eq '' ? [ maketext('Select a Set from this Course') => '', selected => undef ] : (),
+					$selected_set eq '' ? [ maketext('Select a Set from this Course') => '', selected => undef ]
+					: (),
 					map { [ format_set_name_display($_) => $_, $_ eq $selected_set ? (selected => undef) : () ] }
 					@$local_sets
 				)
@@ -30,25 +32,36 @@
 	<%= submit_button maketext('Edit Target Set'), name => 'edit_local', class => 'btn btn-primary btn-sm mb-2' =%>
 </div>
 <div class="d-flex flex-wrap justify-content-center">
-	<%= submit_button maketext('Create a New Set in This Course:'), name => 'new_local_set', id => 'new_local_set',
+	<%= submit_button maketext('Create a New Set in This Course:'),
+		name  => 'new_local_set',
+		id    => 'new_local_set',
 		class => 'btn btn-primary btn-sm mb-2 mx-2' =%>
-	<%= text_field new_set_name => '', class => 'form-control form-control-sm d-inline w-auto mb-2',
-		'aria-labelledby' => 'new_local_set', placeholder => maketext('New set name'), size => 30, dir => 'ltr' =%>
+	<%= text_field
+		new_set_name      => '',
+		class             => 'form-control form-control-sm d-inline w-auto mb-2',
+		'aria-labelledby' => 'new_local_set',
+		placeholder       => maketext('New set name'),
+		size              => 30,
+		dir               => 'ltr' =%>
 </div>
 <hr class="mt-0 mb-2">
 <div class="d-flex justify-content-center">
 	<label class="col-form-label-sm mb-2 me-1"><%= maketext('Browse') %></label>
 	<div class="d-flex flex-wrap justify-content-center">
-		<%= submit_button maketext('Open Problem Library'), name => 'browse_opl',
+		<%= submit_button maketext('Open Problem Library'),
+			name  => 'browse_opl',
 			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
 			$browse_which eq 'browse_opl' ? (disabled => undef) : () =%>
-		<%= submit_button maketext('Course Files'), name => 'browse_local',
+		<%= submit_button maketext('Course Files'),
+			name  => 'browse_local',
 			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
 			$browse_which eq 'browse_local' ? (disabled => undef) : () =%>
-		<%= submit_button maketext('Course Sets'), name => 'browse_course_sets',
+		<%= submit_button maketext('Course Sets'),
+			name  => 'browse_course_sets',
 			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
 			$browse_which eq 'browse_course_sets' ? (disabled => undef) : () =%>
-		<%= submit_button maketext('Set Definition Files'), name => 'browse_setdefs',
+		<%= submit_button maketext('Set Definition Files'),
+			name  => 'browse_setdefs',
 			class => 'browse-lib-btn btn btn-secondary btn-sm mb-2 mx-1',
 			$browse_which eq 'browse_setdefs' ? (disabled => undef) : () =%>
 	</div>
@@ -60,7 +73,8 @@
 		<div class="d-flex flex-wrap justify-content-center">
 			% for (sort grep { -d "$ce->{courseDirs}{templates}/$_" } keys %{ $c->{problibs} }) {
 				<%= submit_button $c->{problibs}{$_},
-					name => "browse_$_", class => 'btn btn-secondary btn-sm ms-2 mb-2',
+					name  => "browse_$_",
+					class => 'btn btn-secondary btn-sm ms-2 mb-2',
 					($browse_which eq "browse_$_") ? (disabled => undef) : () =%>
 			% }
 		</div>
@@ -68,8 +82,9 @@
 % }
 <hr class="mt-0 mb-2">
 % if ($browse_which eq 'browse_local') {
-	<%= include 'ContentGenerator/Instructor/SetMaker/browse_local_panel',
-		selected_library => $c->{current_library_set} =%>
+	<%=
+		include 'ContentGenerator/Instructor/SetMaker/browse_local_panel', selected_library => $c->{current_library_set}
+	=%>
 % } elsif ($browse_which eq 'browse_course_sets') {
 	<%= include 'ContentGenerator/Instructor/SetMaker/browse_course_sets_panel',
 		selected_library => $c->{current_library_set} =%>
@@ -81,21 +96,25 @@
 % } else {
 	% # Other problem libraries
 	<%= include 'ContentGenerator/Instructor/SetMaker/browse_local_panel',
-		selected_library => $c->{current_library_set}, lib => $browse_which =%>
+		selected_library => $c->{current_library_set},
+		lib              => $browse_which =%>
 % }
 <hr class="mt-0 mb-2">
 <div class="d-flex flex-wrap justify-content-center">
 	<button class="library-action-btn add-all-btn btn btn-primary btn-sm mx-1 mb-2" type="button">
 		<%= maketext('Add All') =%>
 	</button>
-	<%= submit_button maketext('Clear Problem Display'), name => 'cleardisplay',
+	<%= submit_button maketext('Clear Problem Display'),
+		name  => 'cleardisplay',
 		class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
 	% if ($c->{first_index} > 0) {
-		<%= submit_button maketext('Previous page'), name => 'prev_page',
+		<%= submit_button maketext('Previous page'),
+			name  => 'prev_page',
 			class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
 	% }
 	% if (1 + $c->{last_index} < @$pg_files) {
-		<%= submit_button maketext('Next page'), name => 'next_page',
+		<%= submit_button maketext('Next page'),
+			name  => 'next_page',
 			class => 'library-action-btn btn btn-secondary btn-sm mx-1 mb-2' =%>
 	% }
 </div>
diff --git a/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep b/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep
index 8cb5b0cc26..382ce17b44 100644
--- a/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep
+++ b/templates/ContentGenerator/Instructor/SetMaker/view_problems_line.html.ep
@@ -4,25 +4,29 @@
 	<%= submit_button maketext('View Problems'), name => $internal_name, class => 'btn btn-secondary btn-sm mb-2' =%>
 	%
 	<div class="d-inline-block ms-2 mb-2">
-		<%= label_for 'problem_displaymode' => maketext('Display Mode:'),
-			class => 'col-form-label col-form-label-sm' =%>
+		<%= label_for
+			'problem_displaymode' => maketext('Display Mode:'),
+			class                 => 'col-form-label col-form-label-sm' =%>
 		<%= select_field 'problem_displaymode' => [
-				(
-					map { [ $_ => $_, $_ eq $ce->{pg}{options}{displayMode} ? (selected => undef) : () ] }
-					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
-				),
-				# Special display mode "None". This is illegal in other modules,
-				# but means don't render the problem in this module.
-				[ maketext('None') => 'None' ]
+			(
+				map  { [ $_ => $_, $_ eq $ce->{pg}{options}{displayMode} ? (selected => undef) : () ] }
+				grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
+			),
+			# Special display mode "None". This is illegal in other modules,
+			# but means don't render the problem in this module.
+			[ maketext('None') => 'None' ]
 			],
-			id => 'problem_displaymode', class => 'form-select form-select-sm d-inline w-auto' =%>
+			id    => 'problem_displaymode',
+			class => 'form-select form-select-sm d-inline w-auto' =%>
 		<%= hidden_field original_displayMode => param('problem_displaymode') || $ce->{pg}{options}{displayMode} =%>
 	</div>
 	% # Give a choice of the number of problems to show.
 	<div class="d-inline-block ms-2 mb-2">
 		<%= label_for max_shown => maketext('Max. Shown:'), class => 'col-form-label col-form-label-sm' =%>
-		<%= select_field max_shown => [ 5, 10, 15, [ 20 => 20, selected => undef ], 25, 30, 50, 'All' ],
-			id => 'max_shown', class => 'form-select form-select-sm d-inline w-auto' =%>
+		<%= select_field
+			max_shown => [ 5, 10, 15, [ 20 => 20, selected => undef ], 25, 30, 50, 'All' ],
+			id        => 'max_shown',
+			class     => 'form-select form-select-sm d-inline w-auto' =%>
 	</div>
 	% # Options for whether to show hints and solutions.
 	<div class="d-inline-block ms-2 mb-2">
diff --git a/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep b/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep
index 633b475ed9..cbf2681544 100644
--- a/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep
+++ b/templates/ContentGenerator/Instructor/ShowAnswers/instructor-selectors.html.ep
@@ -1,5 +1,5 @@
 % use WeBWorK::HTML::ScrollingRecordList qw(scrollingRecordList);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets               qw(format_set_name_display);
 %
 <%= form_for current_route, target => 'WW_Info', id => 'past-answer-form', method => 'POST', begin =%>
 	<%= $c->hidden_authen_fields =%>
@@ -22,14 +22,22 @@
 		</div>
 		<div class="col-sm-4 mb-2">
 			<div class="fw-bold text-center"><%= label_for selected_sets => maketext('Sets') %></div>
-			<%= select_field selected_sets => [ map { [ format_set_name_display($_) => $_ ] } @$expandedGlobalSetIDs ],
-				id => 'selected_sets', size => 24, multiple => undef, class => 'form-select form-select-sm',
-				dir => 'ltr' =%>
+			<%= select_field
+				selected_sets => [ map { [ format_set_name_display($_) => $_ ] } @$expandedGlobalSetIDs ],
+				id            => 'selected_sets',
+				size          => 24,
+				multiple      => undef,
+				class         => 'form-select form-select-sm',
+				dir           => 'ltr' =%>
 		</div>
 		<div class="col-sm-2 mb-2">
 			<div class="fw-bold text-center"><%= label_for selected_problems => maketext('Problems') %></div>
-			<%= select_field selected_problems => $globalProblemIDs, id => 'selected_problems', size => 24,
-				multiple => undef, class => 'form-select form-select-sm' =%>
+			<%= select_field
+				selected_problems => $globalProblemIDs,
+				id                => 'selected_problems',
+				size              => 24,
+				multiple          => undef,
+				class             => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	%
@@ -44,10 +52,8 @@
 		% if (param('createCSV') && -e "$ce->{courseDirs}{scoring}/$filename") {
 			<span class="fw-bold fs-5 mb-2">
 				<%= maketext('Download:') =%>
-				<%= link_to $filename => $c->systemLink(
-					url_for('instructor_scoring_download'),
-					params => { getFile => $filename }
-				) =%>
+				<%= link_to $filename =>
+					$c->systemLink(url_for('instructor_scoring_download'), params => { getFile => $filename }) =%>
 			</span>
 		% }
 	</div>
diff --git a/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep b/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep
index 2bb8fd59a5..5661b0c859 100644
--- a/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep
+++ b/templates/ContentGenerator/Instructor/ShowAnswers/past-answers-table.html.ep
@@ -6,11 +6,12 @@
 % for my $studentUser (sort keys %$records) {
 	% for my $setName (sort keys %{ $records->{$studentUser} }) {
 		% for my $problemNumber (sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName} }) {
-			% my @pastAnswerIDs = sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName}{$problemNumber} };
+			% my @pastAnswerIDs       = sort { $a <=> $b } keys %{ $records->{$studentUser}{$setName}{$problemNumber} };
 			% my $prettyProblemNumber = stash->{prettyProblemNumbers}{$setName}{$problemNumber};
 			<h2 class="fs-3">
-				<%== maketext('Past Answers for [_1], set [_2], problem [_3]',
-					$studentUser, tag('span', dir => 'ltr', format_set_name_display($setName)), $prettyProblemNumber
+				<%== maketext(
+					'Past Answers for [_1], set [_2], problem [_3]',              $studentUser,
+					tag('span', dir => 'ltr', format_set_name_display($setName)), $prettyProblemNumber
 				) =%>
 			</h2>
 			<div class="table-responsive">
@@ -32,8 +33,8 @@
 									<small>
 										<%= maketext(
 											'Seed: [_1]',
-											defined $record{seed} && $record{seed} ne ''
-												?  $record{seed} : maketext('unknown')
+											defined $record{seed}
+												&& $record{seed} ne '' ? $record{seed} : maketext('unknown')
 										) %>
 									</small>
 								</td>
@@ -46,13 +47,15 @@
 								%
 								% # Color the answer if the user is an instructor, there is an answer,
 								% # there is a score, and it is not an essay question.
-								<td class="<%= join(
-									' ',
-									'px-3',
-									$answerType eq 'essay' ? 'essay' : (),
-									$isInstructor && $answer ne '' && defined $score && $answerType ne 'essay'
-										? ($score ? 'correct' : 'incorrect') : ()
-								) %>">
+								<td
+									class="<%= join(' ',
+										'px-3',
+										$answerType eq 'essay' ? 'essay' : (),
+										$isInstructor
+											&& $answer ne ''
+											&& defined $score
+											&& $answerType ne 'essay' ? ($score ? 'correct' : 'incorrect') : ()) %>"
+								>
 									% if ($answer eq '') {
 										<small><i><%= maketext('empty') %></i></small>
 									% } else {
diff --git a/templates/ContentGenerator/Instructor/Stats.html.ep b/templates/ContentGenerator/Instructor/Stats.html.ep
index f1ee404562..5f60eebcbd 100644
--- a/templates/ContentGenerator/Instructor/Stats.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats.html.ep
@@ -1,4 +1,4 @@
-% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils       qw(getAssetURL);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
diff --git a/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
index 4b8c7c792c..04b7b0c38e 100644
--- a/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/problem_menu.html.ep
@@ -2,14 +2,15 @@
 %
 <div class="btn-group student-nav-filter-selector mx-2">
 	<%= link_to $c->{prettyID} ? maketext('Problem [_1]', $c->{prettyID}) : maketext('All problems') => '#',
-		id => 'problemMenu', class => 'btn btn-primary dropdown-toggle', role => 'button', 'aria-expanded' => 'false',
-		data => { bs_toggle => 'dropdown' } =%>
+		id                                                                                           => 'problemMenu',
+		class           => 'btn btn-primary dropdown-toggle',
+		role            => 'button',
+		'aria-expanded' => 'false',
+		data            => { bs_toggle => 'dropdown' } =%>
 	<ul class="dropdown-menu" role="menu" aria-labelledby="problemMenu">
 		<li>
-			<%= link_to maketext('All problems') => $c->systemLink(
-					url_for('instructor_set_statistics'),
-					params => param('filter') ? { filter => param('filter') } : {}
-				),
+			<%= link_to maketext('All problems') => $c->systemLink(url_for('instructor_set_statistics'),
+				params => param('filter') ? { filter => param('filter') } : {}),
 				class => join(' ', 'dropdown-item', $c->{prettyID} ? () : 'active') =%>
 		</li>
 		% for (@$problems) {
@@ -19,8 +20,8 @@
 				% : $_->problem_id;
 			<li>
 				<%= link_to maketext('Problem [_1]', $probID) => $c->systemLink(
-						url_for('instructor_problem_statistics', problemID => $_->problem_id),
-						params => param('filter') ? { filter => param('filter') } : {}
+					url_for('instructor_problem_statistics', problemID => $_->problem_id),
+					params => param('filter') ? { filter => param('filter') } : {}
 					),
 					class => join(' ', 'dropdown-item', $probID eq ($c->{prettyID} // '') ? 'active' : ()) =%>
 			</li>
diff --git a/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep
index 29d5a604ec..f310a63821 100644
--- a/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/problem_stats.html.ep
@@ -21,59 +21,81 @@
 	xTitle      => maketext('Percent Ranges'),
 	yTitle      => maketext('Number of Students'),
 	descText    => $isJitarSet && $topLevelJitar
-		? maketext(
-			'Histogram showing the percent grade of active students for problem [_1] and the adjusted '
-				. 'percent grade with review. The number of students in each percent range is: [_2]. '
-				. 'The number of students in each percent range after review is: [_3].',
-			$c->{prettyID},
-			join(', ', map { "$bucketLabels->[$_]:$buckets->[$_]" } 0 .. scalar(@$buckets) - 1),
-			join(', ', map { "$bucketLabels->[$_]:$jitarBars->[$_]" } 0 .. scalar(@$buckets) - 1)
+	? maketext(
+		'Histogram showing the percent grade of active students for problem [_1] and the adjusted '
+			. 'percent grade with review. The number of students in each percent range is: [_2]. '
+			. 'The number of students in each percent range after review is: [_3].',
+		$c->{prettyID},
+		join(', ', map {"$bucketLabels->[$_]:$buckets->[$_]"} 0 .. scalar(@$buckets) - 1),
+		join(', ', map {"$bucketLabels->[$_]:$jitarBars->[$_]"} 0 .. scalar(@$buckets) - 1)
 		)
-		: maketext(
-			'Histogram showing the grades of active students for problem [_1], where the number of '
-				. 'students in each percent range is: [_2]',
-			$c->{prettyID},
-			join(', ', map { "$bucketLabels->[$_]:$buckets->[$_]" } 0 .. scalar(@$buckets) - 1),
-		),
-	barWidth    => 35,
-	barSep      => 5,
-	isPercent   => 0,
-	leftMargin  => 40 + 5 * length(5 * $maxCount),
-	isJitarSet  => ($isJitarSet && $topLevelJitar),
-	jitarBars   => $jitarBars,
+	: maketext(
+		'Histogram showing the grades of active students for problem [_1], where the number of '
+			. 'students in each percent range is: [_2]',
+		$c->{prettyID},
+		join(', ', map {"$bucketLabels->[$_]:$buckets->[$_]"} 0 .. scalar(@$buckets) - 1),
+	),
+	barWidth   => 35,
+	barSep     => 5,
+	isPercent  => 0,
+	leftMargin => 40 + 5 * length(5 * $maxCount),
+	isJitarSet => ($isJitarSet && $topLevelJitar),
+	jitarBars  => $jitarBars,
 ) =%>
 %
 % # Display overall statistics
 <div class="table-responsive">
 	<table class="table table-bordered w-auto">
-		<tr><th><%= maketext('Point Value') %></th><td><%= $c->{problemRecord}->value =%></tr>
-		<tr><th><%= maketext('Average Percent') %></th><td><%= sprintf('%0.1f', 100 * $mean) %></tr>
-		<tr><th><%= maketext('Standard Deviation') %></th><td><%= sprintf('%0.1f', 100 * $stddev) %></td></tr>
-		<tr><th><%= maketext('Average Attempts') %></th><td><%= sprintf('%0.1f', $mean2) %></td></tr>
+		<tr>
+			<th><%= maketext('Point Value') %></th>
+			<td><%= $c->{problemRecord}->value =%></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Average Percent') %></th>
+			<td><%= sprintf('%0.1f', 100 * $mean) %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Standard Deviation') %></th>
+			<td><%= sprintf('%0.1f', 100 * $stddev) %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Average Attempts') %></th>
+			<td><%= sprintf('%0.1f', $mean2) %></td>
+		</tr>
 		<tr>
 			<th>
 				<%= maketext('Success Index') =%>
-				<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+				<a
+					class="help-popup ms-2"
+					role="button"
+					tabindex="0"
+					data-bs-placement="top"
+					data-bs-toggle="popover"
 					data-bs-content="<%= maketext(
 						'Success index is the square of the average score divided by the average number of attempts.'
-					) %>">
+					) %>"
+				>
 					<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 					<span class="visually-hidden"><%= maketext('Success Index Help') =%></span>
 				</a>
 			</th>
 			<td><%= sprintf('%0.1f', 100 * $successIndex) %></td>
 		</tr>
-		<tr><th><%= maketext('Active Students') %></th><td><%= $activeStudents %></td></tr>
-		<tr><th><%= maketext('Inactive Students') %></th><td><%= $inactiveStudents %></tr>
+		<tr>
+			<th><%= maketext('Active Students') %></th>
+			<td><%= $activeStudents %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Inactive Students') %></th>
+			<td><%= $inactiveStudents %></td>
+		</tr>
 	</table>
 </div>
 %
 % # Table showing percentile statistics for scores.
 <p>
-	<%= maketext(
-		'Percentile cutoffs for student\'s score and success index. '
-		. 'The 50% column shows the median number of attempts.'
-	) =%>
+	<%= maketext('Percentile cutoffs for student\'s score and success index. '
+			. 'The 50% column shows the median number of attempts.') =%>
 </p>
 %
 % my @tableHeaders = (maketext('Percent Score'));
@@ -84,9 +106,16 @@
 % }
 % my $successIndexHeader = begin
 	<%= maketext('Success Index') =%>
-	<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
+	<a
+		class="help-popup ms-2"
+		role="button"
+		tabindex="0"
+		data-bs-placement="top"
+		data-bs-toggle="popover"
 		data-bs-content="<%=
-			maketext('Success index is the square of the score divided by the number of attempts.') =%>">
+			maketext('Success index is the square of the score divided by the number of attempts.')
+		=%>"
+	>
 		<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 		<span class="visually-hidden"><%= maketext('Success Index Help') =%></span>
 	</a>
@@ -99,7 +128,7 @@
 <p>
 	<%= maketext('Percentile cutoffs for number of attempts. The 50% column shows the median number of attempts.') =%>
 </p>
-<%= $c->bracket_table([ 95, 75, 50, 25, 5, 1 ], [ $problemAttempts ], [ maketext('# of attempts') ], reverse => 1) =%>
+<%= $c->bracket_table([ 95, 75, 50, 25, 5, 1 ], [$problemAttempts], [ maketext('# of attempts') ], reverse => 1) =%>
 %
 % if ($c->{problemRecord}->source_file =~ /^group:/) {
 	<div class="alert alert-info">
@@ -119,15 +148,17 @@
 	<div class="btn-toolbar gap-3">
 		<div class="input-group pt-1">
 			<%= label_for problem_displaymode => maketext('Display Mode:'), class => 'input-group-text' =%>
-			<%= select_field 'problem_displaymode' => [
-					grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} }
-				],
-				id => 'problem_displaymode', class => 'form-select' =%>
+			<%= select_field
+				'problem_displaymode' =>
+				[ grep { exists WeBWorK::PG::DISPLAY_MODES()->{$_} } @{ $ce->{pg}{displayModes} } ],
+				id    => 'problem_displaymode',
+				class => 'form-select' =%>
 		</div>
 		<div class="btn-group pt-1">
 			<%= link_to maketext('Edit Problem') =>
-					$c->systemLink(url_for('instructor_problem_editor_withset_withproblem')),
-				class => 'btn btn-primary', target => 'WW_Editor' =%>
+				$c->systemLink(url_for('instructor_problem_editor_withset_withproblem')),
+				class  => 'btn btn-primary',
+				target => 'WW_Editor' =%>
 		</div>
 	</div>
 	<div id="problem_render_area" class="rpc_render_area mt-2"></div>
diff --git a/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep b/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep
index 0b37f07889..918abfaad2 100644
--- a/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/set_stats.html.ep
@@ -14,11 +14,15 @@
 		<tr>
 			<th>
 				<%= maketext('Status') =%>
-				<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
-					data-bs-content="<%= maketext(
-						'This gives the status and dates of the main set. '
-							. 'Individual students may have different settings.'
-					) %>">
+				<a
+					class="help-popup ms-2"
+					role="button"
+					tabindex="0"
+					data-bs-placement="top"
+					data-bs-toggle="popover"
+					data-bs-content="<%= maketext('This gives the status and dates of the main set. '
+							. 'Individual students may have different settings.') %>"
+				>
 					<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 					<span class="visually-hidden"><%= maketext('Set Status Help') =%></span>
 				</a>
@@ -27,7 +31,7 @@
 				% if (time < $c->{setRecord}->open_date) {
 					<%= maketext('Before Open Date') =%>
 				% } elsif ($c->{setRecord}->enable_reduced_scoring
-					% && time > $c->{setRecord}->reduced_scoring_date
+				% && time > $c->{setRecord}->reduced_scoring_date
 					% && time < $c->{setRecord}->due_date)
 				% {
 					<%= maketext('Reduced Scoring Period') =%>
@@ -42,12 +46,16 @@
 					(<%= maketext('Hidden') =%>)
 				% }
 				% if ($c->{setRecord}->assignment_type =~ /gateway/ && time > $c->{setRecord}->answer_date) {
-					<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top"
+					<a
+						class="help-popup ms-2"
+						role="button"
+						tabindex="0"
+						data-bs-placement="top"
 						data-bs-toggle="popover"
 						data-bs-content="<%= maketext(
 							'Answer availability for tests depends on multiple settings.  This only indicates the '
-								. 'template answer date has passed.  See Set Detail page for actual availability.'
-						) =%>">
+								. 'template answer date has passed.  See Set Detail page for actual availability.') =%>"
+					>
 						<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 						<span class="visually-hidden"><%= maketext('Answer Availability Help') =%></span>
 					</a>
@@ -56,7 +64,8 @@
 		</tr>
 		<tr>
 			<th><%= maketext('Number of Students') %></th>
-			<td><%= scalar(@$score_list) %></td></tr>
+			<td><%= scalar(@$score_list) %></td>
+		</tr>
 		<tr>
 			<th><%= maketext('Open Date') %></th>
 			<td><%= $c->formatDateTime($c->{setRecord}->open_date, $ce->{studentDateDisplayFormat}) %></td>
@@ -94,19 +103,26 @@
 	yTitle      => maketext('Number of Students'),
 	descText    => maketext(
 		'Histogram showing the overall set grades, where the number of students in each percent range is: [_1].',
-		join(', ', map { "$bucketLabels->[$_]:$buckets->[$_]" } 0 .. scalar(@$buckets) - 1)
+		join(', ', map {"$bucketLabels->[$_]:$buckets->[$_]"} 0 .. scalar(@$buckets) - 1)
 	),
-	barWidth    => 35,
-	barSep      => 5,
-	isPercent   => 0,
-	leftMargin  => 40 + 5 * length(5 * $maxCount),
+	barWidth   => 35,
+	barSep     => 5,
+	isPercent  => 0,
+	leftMargin => 40 + 5 * length(5 * $maxCount),
 ) =%>
 %
 % # Success index help icon.
 % my $successHelp = begin
-	<a class="help-popup ms-2" role="button" tabindex="0" data-bs-placement="top" data-bs-toggle="popover"
-		data-bs-content="<%= maketext(
-			'Success index is the square of the average score divided by the average number of attempts.') %>">
+	<a
+		class="help-popup ms-2"
+		role="button"
+		tabindex="0"
+		data-bs-placement="top"
+		data-bs-toggle="popover"
+		data-bs-content="<%=
+			maketext('Success index is the square of the average score divided by the average number of attempts.')
+		%>"
+	>
 		<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 		<span class="visually-hidden"><%= maketext('Success Index Help') =%></span>
 	</a>
@@ -115,9 +131,18 @@
 % # Display the overall average
 <div class="table-responsive">
 	<table class="table table-bordered w-auto">
-		<tr><th><%= maketext('Total Points') %></th><td><%= $totalValue %></td></tr>
-		<tr><th><%= maketext('Average Percent') %></th><td><%= sprintf('%0.1f', 100 * $mean) %></td></tr>
-		<tr><th><%= maketext('Standard Deviation') %></th><td><%= sprintf('%0.1f', 100 * $stddev) %></td></tr>
+		<tr>
+			<th><%= maketext('Total Points') %></th>
+			<td><%= $totalValue %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Average Percent') %></th>
+			<td><%= sprintf('%0.1f', 100 * $mean) %></td>
+		</tr>
+		<tr>
+			<th><%= maketext('Standard Deviation') %></th>
+			<td><%= sprintf('%0.1f', 100 * $stddev) %></td>
+		</tr>
 		<tr>
 			<th><%= maketext('Average Attempts Per Problem') %></th>
 			<td><%= sprintf('%0.1f', $overallAvgAttempts) %></td>
@@ -131,12 +156,13 @@
 %
 % # Table showing percentile statistics for scores and success indices.
 <p>
-	<%= maketext(
-		'The percentage of students receiving at least these scores. The median score is in the 50% column.') =%>
+	<%=
+		maketext('The percentage of students receiving at least these scores. The median score is in the 50% column.')
+	=%>
 </p>
 <%= $c->bracket_table(
-	[ 90, 80, 70, 60, 50, 40, 30, 20, 10 ],
-	[ $score_list, $index_list ],
+	[ 90,                        80, 70, 60, 50, 40, 30, 20, 10 ],
+	[ $score_list,               $index_list ],
 	[ maketext('Percent Score'), b(maketext('Success Index') . $successHelp->()) ],
 	showMax => 1,
 ) =%>
@@ -152,25 +178,23 @@
 	mainTitle   => maketext('Grade of Active Students'),
 	xTitle      => maketext('Problem Number'),
 	descText    => $isJitarSet
-		? maketext(
-			'Bar chart showing the average percent grade of active students for each problem and the adjusted '
-				. 'percent grade on top level problems with review. The average percent grade (as a decimal) for '
-				. 'each problem is: [_1]. The adjusted percent grade for top level problems with review is: [_2].',
-			join(', ', map { "$svgProblemLabels->[$_]:$svgProblemData->[$_]" } 0 .. scalar(@$svgProblemData) - 1),
-			join(
-				', ',
-				 map { $jitarBars->[$_] < 0 ? () : "$svgProblemLabels->[$_]:$jitarBars->[$_]" }
-					0 .. scalar(@$svgProblemData) - 1
-			)
+	? maketext(
+		'Bar chart showing the average percent grade of active students for each problem and the adjusted '
+			. 'percent grade on top level problems with review. The average percent grade (as a decimal) for '
+			. 'each problem is: [_1]. The adjusted percent grade for top level problems with review is: [_2].',
+		join(', ', map {"$svgProblemLabels->[$_]:$svgProblemData->[$_]"} 0 .. scalar(@$svgProblemData) - 1),
+		join(', ',
+			map { $jitarBars->[$_] < 0 ? () : "$svgProblemLabels->[$_]:$jitarBars->[$_]" }
+				0 .. scalar(@$svgProblemData) - 1)
 		)
-		: maketext(
-			'Bar chart showing the average percent grade of active students for each problem, '
-				. 'where the average percent grade (as a decimal) for each problem is: [_1].',
-			join(', ', map { "$svgProblemLabels->[$_]:$svgProblemData->[$_]" } 0 .. scalar(@$svgProblemData) - 1)
-		),
-	isJitarSet  => $isJitarSet,
-	jitarBars   => $isJitarSet ? $jitarBars : [],
-	barLinks    => [ map { $_->{statsLink} } @$problems ],
+	: maketext(
+		'Bar chart showing the average percent grade of active students for each problem, '
+			. 'where the average percent grade (as a decimal) for each problem is: [_1].',
+		join(', ', map {"$svgProblemLabels->[$_]:$svgProblemData->[$_]"} 0 .. scalar(@$svgProblemData) - 1)
+	),
+	isJitarSet => $isJitarSet,
+	jitarBars  => $isJitarSet ? $jitarBars : [],
+	barLinks   => [ map { $_->{statsLink} } @$problems ],
 ) =%>
 %
 % # Table showing individual problem stats.
diff --git a/templates/ContentGenerator/Instructor/Stats/siblings.html.ep b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
index 41bd165a6a..b35abce878 100644
--- a/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/siblings.html.ep
@@ -1,5 +1,5 @@
 % use WeBWorK::Utils::JITAR qw(jitar_id_to_seq);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets  qw(format_set_name_display);
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	% last;
@@ -12,7 +12,8 @@
 			% for (map { $_->[1] } $db->listGlobalProblemsWhere({ set_id => stash->{setID} }, 'problem_id')) {
 				<li class="nav-item">
 					<%= tag 'a',
-						$_ eq stash('problemID') ? (class => 'nav-link active')
+						$_ eq stash('problemID')
+						? (class => 'nav-link active')
 						: (
 							href => $c->systemLink(
 								url_for(current_route, problemID => $_),
@@ -21,14 +22,14 @@
 							class => 'nav-link'
 						),
 						maketext('Problem [_1]',
-							$c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_)
-					=%>
+							$c->{setRecord}->assignment_type eq 'jitar' ? join('.', jitar_id_to_seq($_)) : $_) =%>
 				</li>
 			% }
 		</ul>
 	% } else {
 		% # Shared with StudentProgress siblings.
-		<%= include 'ContentGenerator/Instructor/Stats/siblings_set_list',
-			set_link_route => 'instructor_set_statistics' =%>
+		<%=
+			include 'ContentGenerator/Instructor/Stats/siblings_set_list', set_link_route => 'instructor_set_statistics'
+		=%>
 	% }
 </div>
diff --git a/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep b/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep
index e69605b056..b883e31144 100644
--- a/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/siblings_set_list.html.ep
@@ -4,7 +4,8 @@
 	% for (map { $_->[0] } $db->listGlobalSetsWhere({}, 'set_id')) {
 		<li class="nav-item">
 			<%= tag 'a',
-				defined stash('setID') && $_ eq stash('setID') ? (class => 'nav-link active')
+				defined stash('setID') && $_ eq stash('setID')
+				? (class => 'nav-link active')
 				: (
 					href => $c->systemLink(
 						url_for($set_link_route, setID => $_),
diff --git a/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
index 12308273d6..fe74fc6f7e 100644
--- a/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
+++ b/templates/ContentGenerator/Instructor/Stats/student_filter_menu.html.ep
@@ -7,13 +7,18 @@
 	% for (@$filters) {
 		% $current_filter = $_->[0] if $_->[1] eq $filter;
 	% }
-	<%= link_to $current_filter => '#', id => 'filter', class => 'btn btn-primary dropdown-toggle',
-		role => 'button', 'aria-expanded' => 'false', data => { bs_toggle => 'dropdown' } =%>
+	<%= link_to
+		$current_filter => '#',
+		id              => 'filter',
+		class           => 'btn btn-primary dropdown-toggle',
+		role            => 'button',
+		'aria-expanded' => 'false',
+		data            => { bs_toggle => 'dropdown' } =%>
 	<ul class="dropdown-menu" role="menu" aria-labelledby="filter">
 		% for (@$filters) {
 			<li>
 				<%= link_to $_->[0] => $c->systemLink(url_for, params => { %$params, filter => $_->[1] }),
-					class => join(' ', 'dropdown-item', $_->[1] eq $filter ? 'active' : ()) =%>
+					class           => join(' ', 'dropdown-item', $_->[1] eq $filter ? 'active' : ()) =%>
 			</li>
 		% }
 	</ul>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
index 142abaa394..d11ca242e8 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/index.html.ep
@@ -25,8 +25,10 @@
 				<ul>
 					% for (@{ $c->{student_records} }) {
 						<li>
-							<%= link_to $_->last_name . ', ' . $_->first_name . ' (' . $_->user_id . ')' =>
-								$c->systemLink(url_for("instructor_user_progress", userID   => $_->user_id)) =%>
+							<%= link_to $_->last_name . ', '
+								. $_->first_name . ' ('
+								. $_->user_id
+								. ')' => $c->systemLink(url_for("instructor_user_progress", userID => $_->user_id)) =%>
 						</li>
 					% }
 				</ul>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
index e155421871..c36b5dade9 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/set_progress.html.ep
@@ -4,7 +4,7 @@
 	% defined $primary_sort_method   ? (primary_sort   => $primary_sort_method)   : (),
 	% defined $secondary_sort_method ? (secondary_sort => $secondary_sort_method) : (),
 	% defined $ternary_sort_method   ? (ternary_sort   => $ternary_sort_method)   : (),
-	% defined $filter                ? (filter => $filter)                        : (),
+	% defined $filter                ? (filter         => $filter)                : (),
 	% # Preserve display options when the sort headers are clicked for gateway quizzes.
 	% $setIsVersioned
 	% ? (
@@ -26,7 +26,8 @@
 	<div class="d-flex align-items-center mt-1 mb-3">
 		<%= maketext('Showing progress for:') =%>
 		<%= include 'ContentGenerator/Instructor/Stats/student_filter_menu',
-			filters => $filters, params => \%params =%>
+			filters => $filters,
+			params  => \%params =%>
 	</div>
 % }
 %
@@ -34,8 +35,11 @@
 % # display.
 % if ($setIsVersioned) {
 	<div class="card bg-light mb-3">
-		<%= form_for current_route, method => 'post',
-			id => 'sp-gateway-form', name => 'StudentProgress', begin =%>
+		<%= form_for current_route,
+			method => 'post',
+			id     => 'sp-gateway-form',
+			name   => 'StudentProgress',
+			begin =%>
 			<%= $c->hidden_authen_fields =%>
 			<%= hidden_field returning => 1 =%>
 			<div class="card-body">
@@ -112,17 +116,14 @@
 <div>
 	% if ($setIsVersioned) {
 		<p>
-			<%= maketext(
-				q{Click a student's name to see the student's test summary page. }
+			<%= maketext(q{Click a student's name to see the student's test summary page. }
 					. q{Click a test's version number to see the corresponding test version. }
-					. 'Click a heading to sort the table.'
-			) =%>
+					. 'Click a heading to sort the table.') =%>
 		</p>
 	% } else {
 		<p>
 			<%= maketext(
-				q{Click a student's name to see the student's homework set. Click a heading to sort the table.}
-			) =%>
+				q{Click a student's name to see the student's homework set. Click a heading to sort the table.}) =%>
 		</p>
 	% }
 	%
@@ -191,12 +192,17 @@
 				% if ($showColumns->{problems}) {
 					<th colspan="<%= scalar(@$problems) %>">
 						<%= maketext('Problems') =%>
-						<a class="help-popup" role="button" tabindex="0" data-bs-placement="top"
+						<a
+							class="help-popup"
+							role="button"
+							tabindex="0"
+							data-bs-placement="top"
 							data-bs-toggle="popover"
 							data-bs-content="<%= maketext(
 								'The top number is the percent score on the problem.  A period (.) indicates a problem '
-								. 'has not been attempted. The bottom number is the number of incorrect attempts.'
-							) =%>">
+									. 'has not been attempted. The bottom number is the number of incorrect attempts.'
+							) =%>"
+						>
 							<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 							<span class="visually-hidden"><%= maketext('Problem Score Help') =%></span>
 						</a>
@@ -239,10 +245,8 @@
 				% my $email    = $rec->{record}{email_address};
 				%
 				% if ($setIsVersioned) {
-					% my $interactiveURL = $c->systemLink(
-						% url_for('problem_list'),
-						% params => { effectiveUser => $rec->{record}{user_id} }
-					% );
+					% my $interactiveURL = $c->systemLink(url_for('problem_list'),
+						% params => { effectiveUser => $rec->{record}{user_id} });
 					%
 					<tr>
 						% # If total is -1, then this is a user that hasn't taken any tests.
@@ -254,20 +258,20 @@
 							% );
 							%
 							<td>
-							% if ($rec->{record}{user_id} eq $prevUserID) {
-								<div class="ms-4">(<%= $versionLink %>)</div>
-							% } else {
-								<div>
-									<%= link_to $fullName => $interactiveURL =%>
-									% if ($setIsVersioned && !$showBestOnly) {
-										(<%= $versionLink %>)
+								% if ($rec->{record}{user_id} eq $prevUserID) {
+									<div class="ms-4">(<%= $versionLink %>)</div>
+								% } else {
+									<div>
+										<%= link_to $fullName => $interactiveURL =%>
+										% if ($setIsVersioned && !$showBestOnly) {
+											(<%= $versionLink %>)
+										% }
+									</div>
+									% if ($email) {
+										<div><%= link_to $email => "mailto:$email" =%></div>
 									% }
-								</div>
-								% if ($email) {
-									<div><%= link_to $email => "mailto:$email" =%></div>
+									% $prevUserID = $rec->{record}{user_id};
 								% }
-								% $prevUserID = $rec->{record}{user_id};
-							% }
 							</td>
 							<td><%= $rec->{score} %></td>
 							<td><%= $rec->{total} %></td>
@@ -284,10 +288,11 @@
 								% if (@{ $rec->{problem_scores} }) {
 									% for (0 .. $#{ $rec->{problem_scores} }) {
 										<td class="problem-data">
-											<span class="<%=
-												$rec->{problem_scores}[$_] eq '100'             ? 'correct'
-												: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
-												:                                                 '' =%>">
+											<span
+												class="<%= $rec->{problem_scores}[$_] eq '100'                 ? 'correct'
+													: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
+													:                                                 '' =%>"
+											>
 												<%== $rec->{problem_scores}[$_] =%>
 											</span>
 											<br>
@@ -320,10 +325,8 @@
 					<tr>
 						<td>
 							<div>
-								<%= link_to $fullName => $c->systemLink(
-									url_for('problem_list'),
-									params => { effectiveUser => $rec->{record}{user_id} }
-								) =%>
+								<%= link_to $fullName => $c->systemLink(url_for('problem_list'),
+									params => { effectiveUser => $rec->{record}{user_id} }) =%>
 							</div>
 							% if ($email) {
 								<div><%= link_to $email => "mailto:$email" %></div>
@@ -334,10 +337,11 @@
 						% if (@{ $rec->{problem_scores} }) {
 							% for (0 .. $#{ $rec->{problem_scores} }) {
 								<td class="problem-data">
-									<span class="<%=
-										$rec->{problem_scores}[$_] eq '100'             ? 'correct'
-										: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
-										:                                                 '' =%>">
+									<span
+										class="<%= $rec->{problem_scores}[$_] eq '100'                 ? 'correct'
+											: $rec->{problem_scores}[$_] eq '&nbsp;.&nbsp;' ? 'unattempted'
+											:                                                 '' =%>"
+									>
 										<%== $rec->{problem_scores}[$_] =%>
 									</span>
 									<br>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep
index 8d77a079f9..5b3ad80e5f 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/siblings.html.ep
@@ -14,9 +14,10 @@
 						$_->user_id eq $c->{studentID}
 						? (class => 'nav-link active')
 						: (
-							href => $c->systemLink(url_for(current_route, userID => $_->user_id)),
+							href  => $c->systemLink(url_for(current_route, userID => $_->user_id)),
 							class => 'nav-link'
-						), begin =%>
+						),
+						begin =%>
 						<%= $_->last_name =%>, <%= $_->first_name %> (<%= $_->user_id %>)
 					<% end =%>
 				</li>
@@ -24,7 +25,8 @@
 		</ul>
 	% } else {
 		% # Shared with Stats siblings.
-		<%= include 'ContentGenerator/Instructor/Stats/siblings_set_list',
-			set_link_route => 'instructor_set_progress' =%>
+		<%=
+			include 'ContentGenerator/Instructor/Stats/siblings_set_list', set_link_route => 'instructor_set_progress'
+		=%>
 	% }
 </div>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
index 2eb40ddba1..d94d88f7b0 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/student_progress.html.ep
@@ -6,7 +6,7 @@
 	% last;
 % }
 %
-% my $email  = $studentRecord->email_address;
+% my $email = $studentRecord->email_address;
 % if ($email) {
 	<%= link_to $email => "mailto:$email" =%>
 	<br>
diff --git a/templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep b/templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep
index b4df273d71..3ca8d48c08 100644
--- a/templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep
+++ b/templates/ContentGenerator/Instructor/StudentProgress/student_stats.html.ep
@@ -10,12 +10,16 @@
 			<th rowspan="2" scope="col"><%= maketext('Out Of') %></th>
 			<th colspan="<%= $max_problems %>" scope="col">
 				<%= maketext('Problems') %>
-				<a class="help-popup" role="button" tabindex="0" data-bs-placement="top"
+				<a
+					class="help-popup"
+					role="button"
+					tabindex="0"
+					data-bs-placement="top"
 					data-bs-toggle="popover"
 					data-bs-content="<%= maketext(
 						'The top number is the percent score on the problem.  A period (.) indicates a problem '
-						. 'has not been attempted. The bottom number is the number of incorrect attempts.'
-					) =%>">
+							. 'has not been attempted. The bottom number is the number of incorrect attempts.') =%>"
+				>
 					<i class="icon fas fa-question-circle" aria-hidden="true"></i>
 					<span class="visually-hidden"><%= maketext('Problem Score Help') %></span>
 				</a>
@@ -36,8 +40,11 @@
 			<tr class="grades-course-total">
 				<th scope="row"><%= maketext('Homework Totals') %></th>
 				<td>
-					<span class="<%=
-						$totalRightPercent == 0 ? 'unattempted' : $totalRightPercent == 100 ? 'correct' : '' %>">
+					<span
+						class="<%=
+							$totalRightPercent == 0 ? 'unattempted' : $totalRightPercent == 100 ? 'correct' : ''
+						%>"
+					>
 						<%= $totalRightPercent . '%' %>
 					</span>
 				</td>
diff --git a/templates/ContentGenerator/Instructor/UserDetail.html.ep b/templates/ContentGenerator/Instructor/UserDetail.html.ep
index 4e4c0447fd..1e865250b9 100644
--- a/templates/ContentGenerator/Instructor/UserDetail.html.ep
+++ b/templates/ContentGenerator/Instructor/UserDetail.html.ep
@@ -13,12 +13,13 @@
 		<%= javascript getAssetURL(
 			$ce,
 			'node_modules/flatpickr/dist/l10n/'
-		   	. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr))
-		   	. '.js'
-		), defer => undef =%>
+				. ($ce->{language} =~ /^el/ ? 'gr' : ($ce->{language} =~ s/^(..).*/$1/gr)) . '.js'
+			),
+			defer => undef =%>
 	% }
-	<%= javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'),
-		defer => undef =%>
+	<%=
+		javascript getAssetURL($ce, 'node_modules/flatpickr/dist/plugins/confirmDate/confirmDate.js'), defer => undef
+	=%>
 	<%= javascript getAssetURL($ce, 'node_modules/shortcut-buttons-flatpickr/dist/shortcut-buttons-flatpickr.min.js'),
 		defer => undef =%>
 	<%= javascript getAssetURL($ce, 'js/DatePicker/datepicker.js'), defer => undef =%>
@@ -46,10 +47,11 @@
 % # Display a message about how many sets have been assigned to this user.
 <div class="text-center my-3">
 	<h2 class="fs-6">
-		% my $link = link_to(maketext('class list data') => $c->systemLink(
-			% url_for('instructor_user_list'),
-			% params => { visible_users => $userID, editMode => 1 }
-		% ));
+		% my $link = link_to(
+			% maketext('class list data') => $c->systemLink(
+				% url_for('instructor_user_list'), params => { visible_users => $userID, editMode => 1 }
+			% )
+		% );
 		<%== maketext('Edit [_1] for [_2] ([_3]) who has been assigned [_4] sets.',
 			$link, $userName, $userID, scalar(keys %{ $c->{userSetRecords} })) =%>
 	</h2>
@@ -60,7 +62,8 @@
 	%
 	<div class="mb-2">
 		<%= submit_button maketext('Assign All Sets to Current User'),
-			name => 'assignAll', class => 'btn btn-primary' =%>
+			name  => 'assignAll',
+			class => 'btn btn-primary' =%>
 	</div>
 	% # Print warning
 	<div class="alert alert-danger p-1 mb-2">
@@ -71,8 +74,7 @@
 		<%= maketext(
 			'When you uncheck a homework set (and save the changes), you destroy all of the data for that set for '
 				. 'this student.   If you reassign the set, the student will receive a new version of each problem. '
-				. 'Make sure this is what you want to do before unchecking sets.'
-		) =%>
+				. 'Make sure this is what you want to do before unchecking sets.') =%>
 	</div>
 	<div class="fs-6 mb-2">
 		<%= maketext(
@@ -85,7 +87,9 @@
 	%
 	<div class="table-responsive">
 		<table class="table table-bordered table-sm font-sm align-middle w-auto caption-top">
-			<caption><%= maketext("Sets assigned to [_1] ([_2])", $userName, $userID) =%></caption>
+			<caption>
+				<%= maketext("Sets assigned to [_1] ([_2])", $userName, $userID) =%>
+			</caption>
 			<tr>
 				<th class="text-center"><%= maketext('Assignment') %></th>
 				<th class="text-center"><%= maketext('Assigned') %></th>
@@ -96,8 +100,8 @@
 				%
 				<%= include 'ContentGenerator/Instructor/UserDetail/set_row',
 					set       => $set,
-				   	userSet   => $c->{userSetRecords}{$setID},
-				   	mergedSet => $c->{mergedSetRecords}{$setID} =%>
+					userSet   => $c->{userSetRecords}{$setID},
+					mergedSet => $c->{mergedSetRecords}{$setID} =%>
 				%
 				% if ($set->assignment_type =~ /gateway/) {
 					% for (0 .. $#{ $c->{setVersions}{$setID} }) {
@@ -120,6 +124,5 @@
 	<%= maketext(
 		'There is NO undo for unassigning sets. Do not do so unless you know what you are doing!  When you unassign '
 			. 'sets by unchecking set names and clicking save, you destroy all of the data for those sets for '
-			. 'this student.'
-	) =%>
+			. 'this student.') =%>
 </div>
diff --git a/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep b/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep
index 83ab6994ba..041d9ee50f 100644
--- a/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep
+++ b/templates/ContentGenerator/Instructor/UserDetail/set_date_table.html.ep
@@ -15,12 +15,18 @@
 		% if (defined $userRecord) {
 			<th scope="col" <%== defined $userRecord && !$isVersioned ? '' : 'colspan="2"' %>>
 				% if ($isVersioned) {
-					<a tabindex="0" class="help-popup" role="button" data-bs-toggle="popover" data-bs-trigger="focus"
-						data-bs-content="<%= maketext(
-							'If the test was timed, granting the user an additional version '
-							. 'may be preferred to changing its dates.' )%>">
+					<a
+						tabindex="0"
+						class="help-popup"
+						role="button"
+						data-bs-toggle="popover"
+						data-bs-trigger="focus"
+						data-bs-content="<%= maketext('If the test was timed, granting the user an additional version '
+								. 'may be preferred to changing its dates.') %>"
+					>
 						<i class="icon fa-solid fa-question-circle fa-lg" aria-hidden="true"></i><% =%>\
-						<span class="visually-hidden"><%= maketext('Advice on changing test dates') %></span><% =%>\
+						<span class="visually-hidden"><%= maketext('Advice on changing test dates') %></span
+						><% =%>\
 					</a>
 				% }
 				<%= $isVersioned ? maketext(q{User's Test Version Dates}) : maketext('User Overrides') =%>
@@ -35,17 +41,20 @@
 		%
 		<tr>
 			<td class="px-1 text-nowrap">
-				<%= label_for "set.$setID.$field" . (defined $userRecord ? '_id' : '.class_value') =>
-						maketext($fieldLabels->{$field}),
-					class => 'form-label mb-0' =%>
+				<%= label_for "set.$setID.$field"
+					. (defined $userRecord ? '_id' : '.class_value') => maketext($fieldLabels->{$field}),
+					class                                            => 'form-label mb-0' =%>
 			</td>
 			% unless ($isVersioned) {
 				<td class="px-1 text-nowrap">
-					<%= text_field "set.$setID.$field.class_value" =>
-							$c->formatDateTime($globalRecord->$field, 'datetime_format_short'),
-						id => "set.$setID.$field.class_value", readonly => undef, dir => 'ltr',
-						class => 'form-control-plaintext form-control-sm w-auto',
-						size => 16,
+					<%= text_field
+						"set.$setID.$field.class_value" =>
+						$c->formatDateTime($globalRecord->$field, 'datetime_format_short'),
+						id       => "set.$setID.$field.class_value",
+						readonly => undef,
+						dir      => 'ltr',
+						class    => 'form-control-plaintext form-control-sm w-auto',
+						size     => 16,
 						defined $userRecord ? ('aria-labelledby' => "set.$setID.${field}_id") : (),
 						data => { class_value => $globalRecord->$field } =%>
 				</td>
@@ -53,14 +62,15 @@
 			% if (defined $userRecord) {
 				<td class="px-1 text-nowrap">
 					<div class="input-group input-group-sm flex-nowrap flatpickr">
-						<%= text_field "set.$setID.$field" => $userRecord->$field,
-							id          => "set.$setID.${field}_id",
-							class       => 'form-control w-auto' . ($field eq 'open_date' ? ' datepicker-group' : ''),
+						<%= text_field
+							"set.$setID.$field" => $userRecord->$field,
+							id                  => "set.$setID.${field}_id",
+							class => 'form-control w-auto' . ($field eq 'open_date' ? ' datepicker-group' : ''),
 							placeholder => $isGateway
-								? ($isVersioned && $field ne 'reduced_scoring_date'
-									? maketext('Required')
-								   	: maketext('Test Default'))
-								: maketext('Assignment Default'),
+							? ($isVersioned && $field ne 'reduced_scoring_date'
+								? maketext('Required')
+								: maketext('Test Default'))
+							: maketext('Assignment Default'),
 							$isVersioned && $field ne 'reduced_scoring_date' ? (required => undef) : (),
 							data => {
 								input      => undef,
@@ -70,8 +80,13 @@
 								locale     => $ce->{language},
 								timezone   => $ce->{siteDefaults}{timezone}
 							} =%>
-						<a class="btn btn-secondary btn-sm" data-toggle tabindex="0" role="button"
-							aria-label="<%= $c->maketext('Pick date and time') %>">
+						<a
+							class="btn btn-secondary btn-sm"
+							data-toggle
+							tabindex="0"
+							role="button"
+							aria-label="<%= $c->maketext('Pick date and time') %>"
+						>
 							<i class="fas fa-calendar-alt"></i>
 						</a>
 					</div>
diff --git a/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep b/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep
index 072a9153a9..cbb0d7d4d5 100644
--- a/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep
+++ b/templates/ContentGenerator/Instructor/UserDetail/set_row.html.ep
@@ -1,8 +1,8 @@
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
-% my $setID   = $set->set_id;
+% my $setID     = $set->set_id;
 % my $isGateway = $set->assignment_type =~ /gateway/;
-% my $version = stash 'version';
+% my $version   = stash 'version';
 <tr>
 	<th class="text-center" scope="row">
 		% if (defined $mergedSet) {
@@ -14,8 +14,7 @@
 				<%= link_to format_set_name_display($version ? "$setID (version $version)" : $setID) =>
 					$c->systemLink(
 						url_for('instructor_set_detail', setID => $setID . ($version ? ",v$version" : '')),
-						params => { editForUser => $userID }
-					) =%>
+						params => { editForUser => $userID }) =%>
 			</span>
 		% } else {
 			<span dir="ltr">
@@ -30,7 +29,8 @@
 	<td class="text-center">
 		<label class="form-check-label">
 			<%= check_box $version ? "set.$setID,v$version.assignment" : "set.$setID.assignment" => 'assigned',
-				class => 'form-check-input', defined $mergedSet ? (checked => undef) : () =%>
+				class                                                                            => 'form-check-input',
+				defined $mergedSet ? (checked => undef) : () =%>
 			% if (defined $mergedSet && $version) {
 				<%= hidden_field "set.$setID,v$version.assignment" => 'delete' =%>
 			% }
@@ -38,6 +38,8 @@
 	</td>
 	<td class="text-center">
 		<%= include 'ContentGenerator/Instructor/UserDetail/set_date_table',
-			globalRecord => $set, userRecord => $userSet, mergedRecord => $mergedSet =%>
+			globalRecord => $set,
+			userRecord   => $userSet,
+			mergedRecord => $mergedSet =%>
 	</td>
 </tr>
diff --git a/templates/ContentGenerator/Instructor/UserList.html.ep b/templates/ContentGenerator/Instructor/UserList.html.ep
index 6972328e63..5751a883cc 100644
--- a/templates/ContentGenerator/Instructor/UserList.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList.html.ep
@@ -6,8 +6,8 @@
 %
 % content_for js => begin
 	<%= javascript getAssetURL($ce, 'js/ActionTabs/actiontabs.js'), defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/UserList/userlist.js'),     defer => undef =%>
-	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'),   defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/UserList/userlist.js'), defer => undef =%>
+	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
 % end
 %
 % unless ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
@@ -49,12 +49,11 @@
 	% for my $actionID (@$formsToShow) {
 		% next if $actionID eq 'reset_2fa' && !$ce->two_factor_authentication_enabled;
 		% next
-			% if $actionID eq 'lms_roster_sync' && (
-				% !$ce->{LTIVersion}
+			% if $actionID eq 'lms_roster_sync'
+			% && (!$ce->{LTIVersion}
 				% || $ce->{LTIVersion} ne 'v1p3'
 				% || !$ce->{LTI}{v1p3}{preferred_source_of_username}
-				% || !$db->getSettingValue('LTINamesRolesServiceURL')
-			% );
+				% || !$db->getSettingValue('LTINamesRolesServiceURL'));
 		% next if $formPerms->{$actionID} && !$authz->hasPermissions(param('user'), $formPerms->{$actionID});
 		%
 		% my $disabled = $actionID eq 'import' && !@$CSVList ? ' disabled' : '';
@@ -64,22 +63,26 @@
 		% content_for 'tab-list' => begin
 			<li class="nav-item" role="presentation">
 				<%= link_to maketext($formTitles->{$actionID}) => "#$actionID",
-					class            => "nav-link action-link$active$disabled",
-					id               => "$actionID-tab",
-					data             => {
+					class                                      => "nav-link action-link$active$disabled",
+					id                                         => "$actionID-tab",
+					data                                       => {
 						action    => $actionID,
 						bs_toggle => 'tab',
 						bs_target => "#$actionID",
 						$actionID eq 'cancel_edit' ? (no_validate => 1) : ()
 					},
-					role             => 'tab',
-					'aria-controls'  => $actionID,
-					'aria-selected'  => $active ? 'true' : 'false', =%>
+					role            => 'tab',
+					'aria-controls' => $actionID,
+					'aria-selected' => $active ? 'true' : 'false', =%>
 			</li>
 		% end
 		% content_for 'tab-content' => begin
-			<div class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>" id="<%= $actionID %>"
-				role="tabpanel" aria-labelledby="<%= $actionID %>-tab">
+			<div
+				class="tab-pane fade mb-2 <%= $active ? " show$active" : '' %>"
+				id="<%= $actionID %>"
+				role="tabpanel"
+				aria-labelledby="<%= $actionID %>-tab"
+			>
 				<%= include "ContentGenerator/Instructor/UserList/${actionID}_form" =%>
 			</div>
 		% end
@@ -87,7 +90,9 @@
 	%
 	<%= hidden_field action => $default_choice, id => 'current_action' =%>
 	<div>
-		<ul class="nav nav-tabs mb-2" role="tablist"><%= content 'tab-list' =%></ul>
+		<ul class="nav nav-tabs mb-2" role="tablist">
+			<%= content 'tab-list' =%>
+		</ul>
 		<div class="tab-content"><%= content 'tab-content' %></div>
 	</div>
 	%
@@ -96,8 +101,11 @@
 	</div>
 	%
 	<div>
-		<%= maketext('Showing [_1] out of [_2] users',
-			scalar(keys %{ $c->{visibleUserIDs} }), scalar(@{ $c->{allUserIDs} })) =%>
+		<%= maketext(
+			'Showing [_1] out of [_2] users',
+			scalar(keys %{ $c->{visibleUserIDs} }),
+			scalar(@{ $c->{allUserIDs} })
+		) =%>
 	</div>
 	%
 	% if ($c->{editMode}) {
diff --git a/templates/ContentGenerator/Instructor/UserList/add_form.html.ep b/templates/ContentGenerator/Instructor/UserList/add_form.html.ep
index d33408264e..63dd8c7acd 100644
--- a/templates/ContentGenerator/Instructor/UserList/add_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/add_form.html.ep
@@ -3,7 +3,12 @@
 		<%= maketext('Add how many users?') %><span class="required-field">*</span>
 	<% end =%>
 	<div class="col-auto">
-		<%= number_field number_of_students => 1, id => 'add_entry', min => 1, 'aria-required' => 'true',
-			class => 'form-control form-control-sm', style => 'width: 6em' =%>
+		<%= number_field
+			number_of_students => 1,
+			id                 => 'add_entry',
+			min                => 1,
+			'aria-required'    => 'true',
+			class              => 'form-control form-control-sm',
+			style              => 'width: 6em' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep b/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep
index 266851b86a..bef05a2b88 100644
--- a/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/delete_form.html.ep
@@ -3,14 +3,15 @@
 		<em><%= maketext('Warning: Deletion destroys all user-related data and is not undoable!') =%></em>
 	</div>
 	<div class="row mb-2">
-		<%= label_for delete_select => maketext('Delete selected users?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			delete_select => maketext('Delete selected users?'),
+			class         => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.delete.confirm' => [
-					[ maketext('No')  => 'no', selected => undef ],
-					[ maketext('Yes') => 'yes' ]
-				],
-				id => 'delete_select', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.delete.confirm' =>
+				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ] ],
+				id    => 'delete_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="delete_confirm_err_msg" class="alert alert-danger p-1 d-inline-flex d-none">
diff --git a/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep b/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep
index cb2eb1ef33..cb41cab952 100644
--- a/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/edit_form.html.ep
@@ -1,10 +1,12 @@
 <div class="row mb-2">
 	<%= label_for edit_select => maketext('Edit which users?'), class => 'col-form-label col-form-label-sm col-auto' =%>
 	<div class="col-auto">
-		<%= select_field 'action.edit.scope' => [
+		<%= select_field
+			'action.edit.scope' => [
 				[ maketext('all course users') => 'all' ],
 				[ maketext('selected users')   => 'selected', selected => undef ]
 			],
-			id => 'edit_select', class => 'form-select form-select-sm' =%>
+			id    => 'edit_select',
+			class => 'form-select form-select-sm' =%>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/UserList/export_form.html.ep b/templates/ContentGenerator/Instructor/UserList/export_form.html.ep
index 5dacc40238..6b147241ca 100644
--- a/templates/ContentGenerator/Instructor/UserList/export_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/export_form.html.ep
@@ -1,24 +1,27 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for export_select_scope => maketext('Export which users?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			export_select_scope => maketext('Export which users?'),
+			class               => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.export.scope' => [
+			<%= select_field
+				'action.export.scope' => [
 					[ maketext('all course users') => 'all' ],
 					[ maketext('selected users')   => 'selected', selected => undef ],
 				],
-				id => 'export_select_scope', class => 'form-select form-select-sm' =%>
+				id    => 'export_select_scope',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for export_select_target => maketext('Export to what kind of file?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			export_select_target => maketext('Export to what kind of file?'),
+			class                => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.export.target' => [
-					[ maketext('Enter filename below') => 'new' ],
-					@$CSVList
-				],
-				id => 'export_select_target', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.export.target' => [ [ maketext('Enter filename below') => 'new' ], @$CSVList ],
+				id                     => 'export_select_target',
+				class                  => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="export_elements" class="row mb-2">
@@ -27,8 +30,11 @@
 		<% end =%>
 		<div class="col-auto d-inline-flex">
 			<div class="input-group input-group-sm">
-				<%= text_field 'action.export.new' => '', id => 'export_filename', 'aria-required' => 'true',
-					class => 'form-control form-control-sm' =%>
+				<%= text_field
+					'action.export.new' => '',
+					id                  => 'export_filename',
+					'aria-required'     => 'true',
+					class               => 'form-control form-control-sm' =%>
 				<span class="input-group-text font-monospace">.lst</span>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep b/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep
index 1c4d04d620..4a2dd5e937 100644
--- a/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/filter_form.html.ep
@@ -1,28 +1,34 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for filter_select => maketext('Show which users?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			filter_select => maketext('Show which users?'),
+			class         => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.filter.scope' => [
+			<%= select_field
+				'action.filter.scope' => [
 					[ maketext('all course users')                  => 'all' ],
 					[ maketext('selected users')                    => 'selected' ],
 					[ maketext('users who match on selected field') => 'match_regex', selected => undef ]
 				],
-				id => 'filter_select', class => 'form-select form-select-sm' =%>
+				id    => 'filter_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="filter_elements">
 		<div class="row mb-2">
-			<%= label_for 'filter_type_select' => maketext('What field should filtered users match on?'),
-				class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+			<%= label_for
+				'filter_type_select' => maketext('What field should filtered users match on?'),
+				class                => 'col-form-label col-form-label-sm col-sm-auto' =%>
 			<div class="col-auto">
-				<%= select_field 'action.filter.field' => [
+				<%= select_field
+					'action.filter.field' => [
 						map { [
 							maketext($fieldProperties->{$_}{name}) => $_,
 							$_ eq 'user_id' ? (selected => undef) : ()
-					   	] } grep { $_ ne 'email_address' && $_ ne 'password' } @$fields
+						] } grep { $_ ne 'email_address' && $_ ne 'password' } @$fields
 					],
-					id => 'filter_type_select', class => 'form-select form-select-sm' =%>
+					id    => 'filter_type_select',
+					class => 'form-select form-select-sm' =%>
 			</div>
 		</div>
 		<div class="row mb-2">
@@ -30,8 +36,11 @@
 				<%= maketext('Filter by what text?') %><span class="required-field">*</span>
 			<% end =%>
 			<div class="col-auto">
-				<%= text_field 'action.filter.user_ids' => '', id => 'filter_text', 'aria-required' => 'true',
-					class => 'form-control form-control-sm' =%>
+				<%= text_field
+					'action.filter.user_ids' => '',
+					id                       => 'filter_text',
+					'aria-required'          => 'true',
+					class                    => 'form-control form-control-sm' =%>
 			</div>
 		</div>
 	</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/import_form.html.ep b/templates/ContentGenerator/Instructor/UserList/import_form.html.ep
index f64d850187..f5bbd29154 100644
--- a/templates/ContentGenerator/Instructor/UserList/import_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/import_form.html.ep
@@ -1,23 +1,30 @@
 <div>
 	<div class="row mb-2">
-		<%= label_for import_select_source => maketext('Import users from what file?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			import_select_source => maketext('Import users from what file?'),
+			class                => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.source' => $CSVList,
-				id => 'import_select_source', class => 'form-select form-select-sm', dir => 'ltr' =%>
+			<%= select_field
+				'action.import.source' => $CSVList,
+				id                     => 'import_select_source',
+				class                  => 'form-select form-select-sm',
+				dir                    => 'ltr' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for import_select_replace => maketext('Replace which users?'),
-			class => 'col-form-label col-form-label-sm col-sm-auto' =%>
+		<%= label_for
+			import_select_replace => maketext('Replace which users?'),
+			class                 => 'col-form-label col-form-label-sm col-sm-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.import.replace' => [
+			<%= select_field
+				'action.import.replace' => [
 					[ maketext('any users')      => 'any' ],
 					[ maketext('visible users')  => 'visible' ],
 					[ maketext('selected users') => 'selected' ],
 					[ maketext('no users')       => 'none', selected => undef ]
 				],
-				id => 'import_select_replace', class   => 'form-select form-select-sm' =%>
+				id    => 'import_select_replace',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	%
@@ -33,10 +40,10 @@
 				data  => {
 					bs_content => maketext(
 						'This is the field in the class list file that will be used for the password if the '
-							. 'password and unencrypted password fields are both empty. If it is set to "None", '
-							. 'and no password is provided either in the password field or the unencrypted '
-							. 'password field, or if no value is provided for the field this is set to in the '
-							. 'class list file, then the user will be created without a password.'
+						. 'password and unencrypted password fields are both empty. If it is set to "None", '
+						. 'and no password is provided either in the password field or the unencrypted '
+						. 'password field, or if no value is provided for the field this is set to in the '
+						. 'class list file, then the user will be created without a password.'
 					),
 					bs_placement => 'top',
 					bs_toggle    => 'popover'
@@ -44,19 +51,21 @@
 				role     => 'button',
 				tabindex => 0,
 				begin =%>
-					<i class="icon fas fa-question-circle" aria-hidden="true"></i><% =%>\
-					<span class="visually-hidden"><%= maketext('Fallback password source help') %></span><% =%>\
-				<% end =%>
+				<i class="icon fas fa-question-circle" aria-hidden="true"></i><% =%>\
+				<span class="visually-hidden"><%= maketext('Fallback password source help') %></span><% =%>\
+			<% end =%>
 		<% end =%>
 		<div class="col-auto">
-			<%= select_field fallback_password_source => [
+			<%= select_field
+				fallback_password_source => [
 					[ 'None'       => '',           $default eq ''           ? (selected => undef) : () ],
 					[ 'Login Name' => 'user_id',    $default eq 'user_id'    ? (selected => undef) : () ],
 					[ 'First Name' => 'first_name', $default eq 'first_name' ? (selected => undef) : () ],
 					[ 'Last Name'  => 'last_name',  $default eq 'last_name'  ? (selected => undef) : () ],
 					[ 'Student ID' => 'student_id', $default eq 'student_id' ? (selected => undef) : () ]
 				],
-				id => 'fallback_password_source', class => 'form-select form-select-sm' =%>
+				id    => 'fallback_password_source',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 </div>
diff --git a/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep b/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep
index 5426b1b116..5c10ff19ff 100644
--- a/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/reset_2fa_form.html.ep
@@ -2,19 +2,20 @@
 	<div class="d-inline-block alert alert-danger p-1 mb-2">
 		<em>
 			<%= maketext('Warning: This will make users need to setup two factor authentication again! Only do this '
-				. 'for users that can no longer access the course due the account being lost in the authenticator app.')
-				=%>
+					. 'for users that can no longer access the course due the account being lost in the authenticator app.'
+			) =%>
 		</em>
 	</div>
 	<div class="row mb-2">
-		<%= label_for reset_2fa_select => maketext('Reset two factor authentication for selected users?'),
-			class => 'col-form-label col-form-label-sm col-auto' =%>
+		<%= label_for
+			reset_2fa_select => maketext('Reset two factor authentication for selected users?'),
+			class            => 'col-form-label col-form-label-sm col-auto' =%>
 		<div class="col-auto">
-			<%= select_field 'action.reset_2fa.confirm' => [
-					[ maketext('No')  => 'no', selected => undef ],
-					[ maketext('Yes') => 'yes' ]
-				],
-				id => 'reset_2fa_select', class => 'form-select form-select-sm' =%>
+			<%= select_field
+				'action.reset_2fa.confirm' =>
+				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ] ],
+				id    => 'reset_2fa_select',
+				class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div id="reset_2fa_confirm_err_msg" class="alert alert-danger p-1 d-inline-flex d-none">
diff --git a/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep b/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep
index a820cf0315..d6cbd441c0 100644
--- a/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/sort_button.html.ep
@@ -1,6 +1,9 @@
 % if ($c->{primarySortField} eq $field) {
-	<button type="button" data-sort-priority="primary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="primary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		1
 		% if ($c->{primarySortOrder} eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
@@ -11,8 +14,11 @@
 		% }
 	</button>
 % } elsif ($c->{secondarySortField} eq $field) {
-	<button type="button" data-sort-priority="secondary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="secondary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		2
 		% if ($c->{secondarySortOrder} eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
@@ -23,8 +29,11 @@
 		% }
 	</button>
 % } elsif ($c->{ternarySortField} eq $field) {
-	<button type="button" data-sort-priority="ternary"
-		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs">
+	<button
+		type="button"
+		data-sort-priority="ternary"
+		class="sort-order btn btn-secondary rounded-pill btn-sm py-0 fw-bold text-nowrap font-xs"
+	>
 		3
 		% if ($c->{ternarySortOrder} eq 'ASC') {
 			<i class="fa-solid fa-chevron-down"></i>
diff --git a/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep b/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep
index 0fe2f47b15..7576928d15 100644
--- a/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/sort_form.html.ep
@@ -3,29 +3,35 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_1 => maketext('Sort by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_1 => maketext('Sort by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary' => [
+					<%= select_field
+						'action.sort.primary' => [
 							map { [
 								maketext($fieldProperties->{$_}{name}) => $_,
 								$_ eq 'last_name' ? (selected => undef) : ()
 							] } @sortFields
 						],
-						id => 'sort_select_1', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_1 => maketext('Ordered') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_1 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.primary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_1', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.primary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_1',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
@@ -33,29 +39,35 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_2 => maketext('Then by') . ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_2 => maketext('Then by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary' => [
+					<%= select_field
+						'action.sort.secondary' => [
 							map { [
 								maketext($fieldProperties->{$_}{name}) => $_,
 								$_ eq 'first_name' ? (selected => undef) : ()
 							] } @sortFields
 						],
-						id => 'sort_select_2', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_2 => maketext('Ordered'). ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_2 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.secondary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_2', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.secondary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_2',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
@@ -63,29 +75,35 @@
 	<div class="row">
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_select_3 => maketext('Then by') . ':', class => 'col-form-label col-form-label-sm',
-					style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_select_3 => maketext('Then by') . ':',
+					class         => 'col-form-label col-form-label-sm',
+					style         => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.ternary' => [
+					<%= select_field
+						'action.sort.ternary' => [
 							map { [
 								maketext($fieldProperties->{$_}{name}) => $_,
 								$_ eq 'user_id' ? (selected => undef) : ()
 							] } @sortFields
 						],
-						id => 'sort_select_3', class => 'form-select form-select-sm' =%>
+						id    => 'sort_select_3',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
 		<div class="col-md-auto col-sm-12">
 			<div class="row mb-2">
-				<%= label_for sort_order_select_3 => maketext('Ordered'). ':',
-					class => 'col-form-label col-form-label-sm', style => 'width:4.5rem' =%>
+				<%= label_for
+					sort_order_select_3 => maketext('Ordered') . ':',
+					class               => 'col-form-label col-form-label-sm',
+					style               => 'width:4.5rem' =%>
 				<div class="col-auto">
-					<%= select_field 'action.sort.ternary.order' => [
-							[ maketext('Ascending')  => 'ASC' ],
-							[ maketext('Descending') => 'DESC' ],
-						],
-						id => 'sort_order_select_3', class => 'form-select form-select-sm' =%>
+					<%= select_field
+						'action.sort.ternary.order' =>
+						[ [ maketext('Ascending') => 'ASC' ], [ maketext('Descending') => 'DESC' ], ],
+						id    => 'sort_order_select_3',
+						class => 'form-select form-select-sm' =%>
 				</div>
 			</div>
 		</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
index 4e99bb6e7a..8eb97d282a 100644
--- a/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/user_list.html.ep
@@ -2,22 +2,25 @@
 	% content_for 'user-list-table-headings' => begin
 		<th>
 			<%= label_for 'select-all', begin =%>
-				<%= check_box 'select-all' => 'on', id => 'select-all',
-					class => 'select-all form-check-input set-id-tooltip',
+				<%= check_box
+					'select-all' => 'on',
+					id           => 'select-all',
+					class        => 'select-all form-check-input set-id-tooltip',
 					'aria-label' => maketext('Select all users'),
-					data => {
+					data         => {
 						select_group => 'selected_users',
-						bs_toggle => 'tooltip',
+						bs_toggle    => 'tooltip',
 						bs_placement => 'right',
-						bs_title => maketext('Select all users')
+						bs_title     => maketext('Select all users')
 					} =%>
-					<i class="fa-solid fa-check-double" aria-hidden="true"></i>
-				<% end =%>
+				<i class="fa-solid fa-check-double" aria-hidden="true"></i>
+			<% end =%>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Login Name') => '#', class => 'sort-header',
-						data => { sort_field => 'user_id' } =%>
+				<%= link_to maketext('Login Name') => '#',
+					class                          => 'sort-header',
+					data                           => { sort_field => 'user_id' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'user_id' =%>
 			</div>
 		</th>
@@ -25,59 +28,67 @@
 		<th><%= maketext('Assigned Sets') %></th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('First Name') => '#', class => 'sort-header',
-					data => { sort_field => 'first_name' } %>
+				<%= link_to maketext('First Name') => '#',
+					class                          => 'sort-header',
+					data                           => { sort_field => 'first_name' } %>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'first_name' =%>
 			</div>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Last Name') => '#', class => 'sort-header',
-					data => { sort_field => 'last_name' } =%>
+				<%= link_to maketext('Last Name') => '#',
+					class                         => 'sort-header',
+					data                          => { sort_field => 'last_name' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'last_name' =%>
 			</div>
 		</th>
 		<th><%= maketext('Email Link') %></th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Student ID') => '#', class => 'sort-header',
-					data => { sort_field => 'student_id' } =%>
+				<%= link_to maketext('Student ID') => '#',
+					class                          => 'sort-header',
+					data                           => { sort_field => 'student_id' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'student_id' =%>
 			</div>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Status') => '#', class => 'sort-header',
-					data => { sort_field => 'status' } =%>
+				<%= link_to maketext('Status') => '#',
+					class                      => 'sort-header',
+					data                       => { sort_field => 'status' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'status' =%>
 			</div>
 		</th>
 		<th><%= maketext('Accommodation Time Factor') %></th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Section') => '#', class => 'sort-header',
-					data => { sort_field => 'section' } =%>
+				<%= link_to maketext('Section') => '#',
+					class                       => 'sort-header',
+					data                        => { sort_field => 'section' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'section' =%>
 			</div>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Recitation') => '#', class => 'sort-header',
-					data => { sort_field => 'recitation' } =%>
+				<%= link_to maketext('Recitation') => '#',
+					class                          => 'sort-header',
+					data                           => { sort_field => 'recitation' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'recitation' =%>
 			</div>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Comment') => '#', class => 'sort-header',
-					data => { sort_field => 'comment' } =%>
+				<%= link_to maketext('Comment') => '#',
+					class                       => 'sort-header',
+					data                        => { sort_field => 'comment' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'comment' =%>
 			</div>
 		</th>
 		<th>
 			<div class="d-flex justify-content-between align-items-end gap-1">
-				<%= link_to maketext('Permission Level') => '#', class => 'sort-header',
-					data => { sort_field => 'permission' } =%>
+				<%= link_to maketext('Permission Level') => '#',
+					class                                => 'sort-header',
+					data                                 => { sort_field => 'permission' } =%>
 				<%= include 'ContentGenerator/Instructor/UserList/sort_button', field => 'permission' =%>
 			</div>
 		</th>
@@ -94,9 +105,13 @@
 	<%= maketext('Please select at least one user.') %>
 </div>
 <div class="table-responsive <%= $c->{editMode} ? 'edit-classlist-table-container' : '' %>">
-	<table id="classlist-table"
-		class="table table-sm caption-top font-sm <%= $c->{editMode} ? ' align-middle' : ' table-bordered' =%>">
-		<caption><%= maketext('Users List') %></caption>
+	<table
+		id="classlist-table"
+		class="table table-sm caption-top font-sm <%= $c->{editMode} ? ' align-middle' : ' table-bordered' =%>"
+	>
+		<caption>
+			<%= maketext('Users List') %>
+		</caption>
 		<thead class="table-group-divider">
 			<tr>
 				<%= content 'user-list-table-headings' =%>
@@ -107,8 +122,7 @@
 				<%= include 'ContentGenerator/Instructor/UserList/user_row',
 					user         => $c->{allUsers}{$_},
 					userSelected => exists $c->{selectedUserIDs}{$_},
-					editable     => exists $c->{userIsEditable}{$_}
-				=%>
+					editable     => exists $c->{userIsEditable}{$_} =%>
 			% }
 		</tbody>
 	</table>
diff --git a/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
index e7e3831480..16d5d203e6 100644
--- a/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/user_list_field.html.ep
@@ -1,13 +1,17 @@
-% my $fieldName = 'user.' . $user->user_id . '.' . $field;
+% my $fieldName  = 'user.' . $user->user_id . '.' . $field;
 % my $properties = $fieldProperties->{$field};
 %
 % if ($properties->{type} eq 'text' || $properties->{type} eq 'number') {
 	% my $value = $user->$field;
 	% if ($c->{editMode}) {
 		% my $field_method = "$properties->{type}_field";
-		<%= $c->$field_method($fieldName => $value, id => $fieldName . '_id', %{$properties->{attributes} // {}},
-			class => 'form-control form-control-sm d-inline w-auto',
-			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header') =%>
+		<%= $c->$field_method(
+			$fieldName => $value,
+			id         => $fieldName . '_id',
+			%{ $properties->{attributes} // {} },
+			class             => 'form-control form-control-sm d-inline w-auto',
+			'aria-labelledby' => ($fieldName =~ s/^.*\.([^.]*)$/$1/r) . '_header'
+		) =%>
 	% } else {
 		% if ($field eq 'email_address') {
 			% if ($value =~ /\S/) {
@@ -18,19 +22,21 @@
 		% }
 	% }
 % } elsif ($properties->{type} eq 'status') {
-	% my $value = $user->$field;
+	% my $value       = $user->$field;
 	% my $status_name = $ce->status_abbrev_to_name($value);
 	% if ($c->{editMode}) {
 		% if (defined $status_name) {
 			% $value = ($ce->status_name_to_abbrevs($status_name))[0];
 		% }
-		<%= select_field $fieldName => [
+		<%= select_field
+			$fieldName => [
 				map { [
 					maketext($_) => $ce->{statuses}{$_}{abbrevs}[0],
 					$ce->{statuses}{$_}{abbrevs}[0] eq $value ? (selected => undef) : ()
 				] } sort(keys %{ $ce->{statuses} })
 			],
-			id => $fieldName . '_id', class => 'form-select form-select-sm w-auto flex-grow-0',
+			id                => $fieldName . '_id',
+			class             => 'form-select form-select-sm w-auto flex-grow-0',
 			'aria-labelledby' => 'status_header' =%>
 	% } else {
 		<%= $status_name ? maketext($status_name) : $value =%>
@@ -42,14 +48,19 @@
 		% my @values;
 		% for my $role (sort { $ce->{userRoles}{$a} <=> $ce->{userRoles}{$b} } keys %{ $ce->{userRoles} }) {
 			% next unless $ce->{userRoles}{$role} <= $db->getPermissionLevel(param('user'))->permission;
-			% push(@values, [
-				% maketext($role) => $ce->{userRoles}{$role},
-				% $value eq $ce->{userRoles}{$role} ? (selected => undef) : ()
-			% ]);
+			% push(
+				% @values,
+				% [
+					% maketext($role) => $ce->{userRoles}{$role},
+					% $value eq $ce->{userRoles}{$role} ? (selected => undef) : ()
+				% ]
+			% );
 		% }
 		%
-		<%= select_field $fieldName => \@values,
-			id => $fieldName . '_id', class => 'form-select form-select-sm w-auto flex-grow-0',
+		<%= select_field
+			$fieldName        => \@values,
+			id                => $fieldName . '_id',
+			class             => 'form-select form-select-sm w-auto flex-grow-0',
 			'aria-labelledby' => 'permission_header' =%>
 	% } elsif (my $roleName = (grep { $ce->{userRoles}{$_} eq $value } keys %{ $ce->{userRoles} })[0]) {
 		<%= maketext($roleName) %>
@@ -71,15 +82,20 @@
 	% } else {
 		<div class="row flex-nowrap">
 			<div class="col-auto">
-				<%= text_field $fieldName => '', id => "${fieldName}_id",
-					placeholder => $user->{passwordExists} ? 'password set' : 'no password set',
-					class => 'form-control form-control-sm d-inline w-auto', size => 14,
+				<%= text_field
+					$fieldName        => '',
+					id                => "${fieldName}_id",
+					placeholder       => $user->{passwordExists} ? 'password set' : 'no password set',
+					class             => 'form-control form-control-sm d-inline w-auto',
+					size              => 14,
 					'aria-labelledby' => 'password_header' =%>
 			</div>
 			% if ($user->{passwordExists}) {
 				<div class="col-auto form-check d-flex align-items-center">
-					<%= check_box "${fieldName}_delete" => 1, class => 'form-check-input',
-					data => { bs_toggle => 'tooltip', bs_title => 'Check to delete password' } =%>
+					<%= check_box
+						"${fieldName}_delete" => 1,
+						class                 => 'form-check-input',
+						data                  => { bs_toggle => 'tooltip', bs_title => 'Check to delete password' } =%>
 				</div>
 			% }
 		</div>
diff --git a/templates/ContentGenerator/Instructor/UserList/user_row.html.ep b/templates/ContentGenerator/Instructor/UserList/user_row.html.ep
index ade17ed225..8e6d2199ee 100644
--- a/templates/ContentGenerator/Instructor/UserList/user_row.html.ep
+++ b/templates/ContentGenerator/Instructor/UserList/user_row.html.ep
@@ -5,8 +5,11 @@
 		% # Select checkboxes
 		<td>
 			% if ($editable) {
-				<%= check_box selected_users => $user->user_id, id => $user->user_id . '_checkbox',
-					class => 'form-check-input', $userSelected ? (checked => undef) : () =%>
+				<%= check_box
+					selected_users => $user->user_id,
+					id             => $user->user_id . '_checkbox',
+					class          => 'form-check-input',
+					$userSelected ? (checked => undef) : () =%>
 			% }
 		</td>
 		% # User id
@@ -17,10 +20,8 @@
 					% if (!$authz->hasPermissions(param('user'), 'become_student')) {
 						<%= $user->user_id =%>
 					% } else {
-						<%= link_to $user->user_id => $c->systemLink(
-							url_for('set_list'),
-							params => { effectiveUser => $user->user_id }
-						) =%>
+						<%= link_to $user->user_id =>
+							$c->systemLink(url_for('set_list'), params => { effectiveUser => $user->user_id }) =%>
 					% }
 				<% end =%>
 				% if ($editable) {
@@ -34,12 +35,10 @@
 		</td>
 		% # Login Status
 		<td>
-			% if (
-				% $db->existsKeyWhere({
-					% user_id => $user->user_id,
-					% timestamp => { '>=' => time - $ce->{sessionTimeout} }
-				% })
-			% )
+			% if ($db->existsKeyWhere({
+				% user_id   => $user->user_id,
+				% timestamp => { '>=' => time - $ce->{sessionTimeout} }
+			% }))
 			% {
 				<b><%= maketext('Active') %></b>
 			% } else {
@@ -51,8 +50,9 @@
 	% if ($c->{editMode}) {
 		% # User ID ("edit sets assigned to user" link)
 		<td>
-			<%= link_to $user->user_id =>
-				$c->systemLink(url_for('instructor_user_detail', userID => $user->user_id)) =%>
+			<%=
+				link_to $user->user_id => $c->systemLink(url_for('instructor_user_detail', userID => $user->user_id))
+			=%>
 		</td>
 	% } else {
 		% # User ID ("edit sets assigned to user" link)
@@ -72,7 +72,7 @@
 		% next if $field eq 'password' && !$c->{editMode};
 		<td>
 			<div class="<%= $statusClass %>">
-			   	<%= include 'ContentGenerator/Instructor/UserList/user_list_field', user => $user, field => $field =%>
+				<%= include 'ContentGenerator/Instructor/UserList/user_list_field', user => $user, field => $field =%>
 			</div>
 		</td>
 	% }
diff --git a/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep b/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep
index 670849becd..251367e274 100644
--- a/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep
+++ b/templates/ContentGenerator/Instructor/UsersAssignedToSet.html.ep
@@ -12,7 +12,8 @@
 %
 <%= form_for current_route, method => 'post', begin =%>
 	<div class="my-2">
-		<%= submit_button maketext('Assign to All Current Users'), name  => 'assignToAll',
+		<%= submit_button maketext('Assign to All Current Users'),
+			name  => 'assignToAll',
 			class => 'btn btn-primary' =%>
 		<i><%= maketext('This action can take a long time if there are many students.') %></i>
 	</div>
@@ -47,8 +48,14 @@
 					%
 					<tr>
 						<td class="text-center">
-							<input type="checkbox" name="selected" id="selected_<%= $userID %>" value="<%= $userID %>"
-								class="form-check-input" <%= defined $userSet ? 'checked' : '' %>>
+							<input
+								type="checkbox"
+								name="selected"
+								id="selected_<%= $userID %>"
+								value="<%= $userID %>"
+								class="form-check-input"
+								<%= defined $userSet ? 'checked' : '' %>
+							>
 						</td>
 						<td>
 							<div class="<%= $ce->status_abbrev_to_name($user->status) || '' %>">
@@ -66,10 +73,9 @@
 								% }
 							</td>
 							<td>
-								<%= link_to maketext('Edit data for [_1]', $userID) => $c->systemLink(
-									url_for('instructor_set_detail'),
-									params => { editForUser => $userID }
-								) =%>
+								<%= link_to maketext('Edit data for [_1]', $userID) =>
+									$c->systemLink(url_for('instructor_set_detail'),
+										params => { editForUser => $userID }) =%>
 							</td>
 						% } else {
 							<td></td>
@@ -93,7 +99,8 @@
 			) =%>
 		</div>
 		<div class="d-flex flex-wrap align-items-center">
-			<%= submit_button maketext('Unassign from All Users'), name => 'unassignFromAll',
+			<%= submit_button maketext('Unassign from All Users'),
+				name  => 'unassignFromAll',
 				class => 'btn btn-primary' =%>
 			<label class="form-check-label text-nowrap">
 				<%= radio_button unassignFromAllSafety => 0, checked => undef, class => 'form-check-input mx-1' =%>
diff --git a/templates/ContentGenerator/LTI/content_item_course_selection.html.ep b/templates/ContentGenerator/LTI/content_item_course_selection.html.ep
index f2fc84d8c5..91cc280612 100644
--- a/templates/ContentGenerator/LTI/content_item_course_selection.html.ep
+++ b/templates/ContentGenerator/LTI/content_item_course_selection.html.ep
@@ -1,34 +1,36 @@
 <!DOCTYPE html>
 <html <%== $c->output_course_lang_and_dir %>>
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= maketext('Available Courses') %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-</head>
-%
-<body class="m-3">
-	<div class="container-fluid">
-		<%= form_for current_route, method => 'POST', begin =%>
-			<%= $c->hidden_authen_fields =%>
-			<%= hidden_field courseID => $courseID =%>
-			% for (keys %$forwardParams) {
-				<%= hidden_field $_ => $forwardParams->{$_} =%>
-			% }
-			<fieldset class="mb-3">
-				<legend><%= maketext('Available Courses') %></legend>
-				% for (@$courseChoices) {
-					<div class="form-check">
-						<%= radio_button selected_course => $_, id => "${_}_id", class => 'form-check-input',
-							required => undef =%>
-						<%= label_for "${_}_id" => $_, class => 'form-check-label' =%>
-					</div>
+	%
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= maketext('Available Courses') %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+	</head>
+	%
+	<body class="m-3">
+		<div class="container-fluid">
+			<%= form_for current_route, method => 'POST', begin =%>
+				<%= $c->hidden_authen_fields =%>
+				<%= hidden_field courseID => $courseID =%>
+				% for (keys %$forwardParams) {
+					<%= hidden_field $_ => $forwardParams->{$_} =%>
 				% }
-			</fieldset>
-			<%= submit_button maketext('Submit Choice'), class => 'btn btn-primary' =%>
-		<% end =%>
-	</div>
-</body>
-%
+				<fieldset class="mb-3">
+					<legend><%= maketext('Available Courses') %></legend>
+					% for (@$courseChoices) {
+						<div class="form-check">
+							<%= radio_button
+								selected_course => $_,
+								id              => "${_}_id",
+								class           => 'form-check-input',
+								required        => undef =%>
+							<%= label_for "${_}_id" => $_, class => 'form-check-label' =%>
+						</div>
+					% }
+				</fieldset>
+				<%= submit_button maketext('Submit Choice'), class => 'btn btn-primary' =%>
+			<% end =%>
+		</div>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/LTI/content_item_selection.html.ep b/templates/ContentGenerator/LTI/content_item_selection.html.ep
index e14b79d81a..6a6ddb6c30 100644
--- a/templates/ContentGenerator/LTI/content_item_selection.html.ep
+++ b/templates/ContentGenerator/LTI/content_item_selection.html.ep
@@ -1,60 +1,67 @@
-% use WeBWorK::Utils qw(getAssetURL);
+% use WeBWorK::Utils       qw(getAssetURL);
 % use WeBWorK::Utils::Sets qw(format_set_name_display);
 %
 <!DOCTYPE html>
 <html <%== $c->output_course_lang_and_dir %>>
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= maketext('Available Content') %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-	<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
-</head>
-%
-<body class="m-3">
-	<div class="container-fluid">
-		<h1><%== maketext('Available Content') %></h1>
-		<%= form_for current_route, method => 'POST', name => 'lti_content_selection', begin =%>
-			<%= $c->hidden_authen_fields =%>
-			<%= hidden_field courseID => $courseID =%>
-			% for (keys %$forwardParams) {
-				<%= hidden_field $_ => $forwardParams->{$_} =%>
-			% }
-			<div class="form-check mb-3">
-				<%= check_box course_home_link => 1, id => 'course_home_link', class => 'form-check-input' =%>
-				<%= label_for course_home_link => maketext('Assignments (Course Home)'),
-					class => 'form-check-label' =%>
-			</div>
-			<fieldset class="mb-3">
-				<legend><%= maketext('Visible Sets') %></legend>
-				% if ($acceptMultiple) {
-					<div class="form-check mb-2">
-						<%= check_box 'select-all' => '', id => 'select-all',
-							class => 'select-all form-check-input',
-							'aria-label' => maketext('Select all available sets'),
-							data => { select_group => 'selected_sets' } =%>
-						<%= label_for 'select-all' => maketext('Select all sets'), class => 'form-check-label' =%>
-					</div>
+	%
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= maketext('Available Content') %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= javascript getAssetURL($ce, 'js/SelectAll/selectall.js'), defer => undef =%>
+	</head>
+	%
+	<body class="m-3">
+		<div class="container-fluid">
+			<h1><%== maketext('Available Content') %></h1>
+			<%= form_for current_route, method => 'POST', name => 'lti_content_selection', begin =%>
+				<%= $c->hidden_authen_fields =%>
+				<%= hidden_field courseID => $courseID =%>
+				% for (keys %$forwardParams) {
+					<%= hidden_field $_ => $forwardParams->{$_} =%>
 				% }
-				% for (@$visibleSets) {
-					% my $set_id = $_->set_id;
-					<div class="form-check">
-						% if ($acceptMultiple) {
-							<%= check_box selected_sets => $set_id, id => "${set_id}_id",
-								class => 'form-check-input' =%>
-						% } else {
-							<%= radio_button selected_sets => $set_id, id => "${set_id}_id",
-								class => 'form-check-input' =%>
-						% }
-						<%= label_for "${set_id}_id" => format_set_name_display($set_id),
-							class => 'form-check-label' =%>
-					</div>
-				% }
-			</fieldset>
-			<%= submit_button maketext('Submit Choices'), class => 'btn btn-primary' =%>
-		<% end =%>
-	</div>
-</body>
-%
+				<div class="form-check mb-3">
+					<%= check_box course_home_link => 1, id => 'course_home_link', class => 'form-check-input' =%>
+					<%= label_for
+						course_home_link => maketext('Assignments (Course Home)'),
+						class            => 'form-check-label' =%>
+				</div>
+				<fieldset class="mb-3">
+					<legend><%= maketext('Visible Sets') %></legend>
+					% if ($acceptMultiple) {
+						<div class="form-check mb-2">
+							<%= check_box
+								'select-all' => '',
+								id           => 'select-all',
+								class        => 'select-all form-check-input',
+								'aria-label' => maketext('Select all available sets'),
+								data         => { select_group => 'selected_sets' } =%>
+							<%= label_for 'select-all' => maketext('Select all sets'), class => 'form-check-label' =%>
+						</div>
+					% }
+					% for (@$visibleSets) {
+						% my $set_id = $_->set_id;
+						<div class="form-check">
+							% if ($acceptMultiple) {
+								<%= check_box
+									selected_sets => $set_id,
+									id            => "${set_id}_id",
+									class         => 'form-check-input' =%>
+							% } else {
+								<%= radio_button
+									selected_sets => $set_id,
+									id            => "${set_id}_id",
+									class         => 'form-check-input' =%>
+							% }
+							<%= label_for
+								"${set_id}_id" => format_set_name_display($set_id),
+								class          => 'form-check-label' =%>
+						</div>
+					% }
+				</fieldset>
+				<%= submit_button maketext('Submit Choices'), class => 'btn btn-primary' =%>
+			<% end =%>
+		</div>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/LTI/content_item_selection_error.html.ep b/templates/ContentGenerator/LTI/content_item_selection_error.html.ep
index 96e1dc1e5d..47a7951839 100644
--- a/templates/ContentGenerator/LTI/content_item_selection_error.html.ep
+++ b/templates/ContentGenerator/LTI/content_item_selection_error.html.ep
@@ -1,28 +1,30 @@
 <!DOCTYPE html>
 <html <%== $c->output_course_lang_and_dir %>>
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= maketext('Available Content') %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-</head>
-%
-<body class="m-3">
-	<div class="container-fluid">
-		<div class="alert alert-danger" role="alert"><%= $errorMessage =%></div>
-		% if (stash->{contextData}) {
-			<div class="mb-3">
-				<%= maketext('An LTI content item request was received with no associated LMS course. '
-					. 'The following parameters were received which can be used to make this association:') =%>
-			</div>
-			<table class="table table-bordered m-auto w-auto">
-				% for (@{ stash->{contextData} }) {
-					<tr><th><%= $_->[0] %></th><td><%= $_->[1] %></td></tr>
-				% }
-			</table>
-		% }
-	</div>
-</body>
-%
+	%
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= maketext('Available Content') %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+	</head>
+	%
+	<body class="m-3">
+		<div class="container-fluid">
+			<div class="alert alert-danger" role="alert"><%= $errorMessage =%></div>
+			% if (stash->{contextData}) {
+				<div class="mb-3">
+					<%= maketext('An LTI content item request was received with no associated LMS course. '
+							. 'The following parameters were received which can be used to make this association:') =%>
+				</div>
+				<table class="table table-bordered m-auto w-auto">
+					% for (@{ stash->{contextData} }) {
+						<tr>
+							<th><%= $_->[0] %></th>
+							<td><%= $_->[1] %></td>
+						</tr>
+					% }
+				</table>
+			% }
+		</div>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/LTI/self_posting_form.html.ep b/templates/ContentGenerator/LTI/self_posting_form.html.ep
index 9e7d80cf07..ecb9189f37 100644
--- a/templates/ContentGenerator/LTI/self_posting_form.html.ep
+++ b/templates/ContentGenerator/LTI/self_posting_form.html.ep
@@ -1,7 +1,10 @@
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/LTILogin/ltilogin.js' }),
-        defer => undef =%>
-<%= form_for $form_target, method => 'POST', enctype => 'application/x-www-form-urlencoded',
-	name => 'ltiRepost', id => 'ltiRepost', begin =%>
+<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/LTILogin/ltilogin.js' }), defer => undef =%>
+<%= form_for $form_target,
+	method  => 'POST',
+	enctype => 'application/x-www-form-urlencoded',
+	name    => 'ltiRepost',
+	id      => 'ltiRepost',
+	begin =%>
 	% for (keys %$form_params) {
 		<%= hidden_field $_ => $form_params->{$_} =%>
 	% }
diff --git a/templates/ContentGenerator/Login.html.ep b/templates/ContentGenerator/Login.html.ep
index e32a03df7e..ee884d4895 100644
--- a/templates/ContentGenerator/Login.html.ep
+++ b/templates/ContentGenerator/Login.html.ep
@@ -7,28 +7,35 @@
 % my $course = (stash('courseID') // '') =~ s/_/ /gr;
 %
 % if ($ce->{LTI} && $externalAuth) {
-	% my $LMS = $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+	% my $LMS =
+		% $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
 		% ? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
 		% : $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name};
 	%
 	% if (!stash('authen_error')) {
 		<p>
-			<%== maketext('The course [_1] uses an external authentication system ([_2]). '
-				. 'Please return to that system to access this course.',
-				tag('strong', $course), $LMS) =%>
+			<%== maketext(
+				'The course [_1] uses an external authentication system ([_2]). '
+					. 'Please return to that system to access this course.',
+				tag('strong', $course),
+				$LMS
+			) =%>
 		</p>
 	% } else {
 		<p>
-			<%== maketext('The course [_1] uses an external authentication system ([_2]). You\'ve authenticated '
-				. 'through that system, but aren\'t allowed to log in to this course.',
-				tag('strong', $course), $LMS) =%>
+			<%== maketext(
+				'The course [_1] uses an external authentication system ([_2]). You\'ve authenticated '
+					. 'through that system, but aren\'t allowed to log in to this course.',
+				tag('strong', $course),
+				$LMS
+			) =%>
 		</p>
 	% }
 % } elsif ($externalAuth) {
 	% if (stash('authen_error')) {
 		<p>
 			<%== maketext(q{This course uses an external authentication system. You've authenticated }
-				. q{through that system, but aren't allowed to log in to this course.}) =%>
+					. q{through that system, but aren't allowed to log in to this course.}) =%>
 		</p>
 	% }
 % } else {
@@ -37,10 +44,11 @@
 	% if ($ce->{session_management_via} ne 'session_cookie') {
 		<p>
 			% my $rememberMeText = maketext('Remember Me');
-			<%== maketext('If you check [_1] your login information will be remembered by the browser you are using, '
-				. 'allowing you to visit WeBWorK pages without typing your user name and password (until your session '
-				. 'expires). This feature is not safe for public workstations, untrusted machines, and machines '
-				. 'over which you do not have direct control.',
+			<%== maketext(
+				'If you check [_1] your login information will be remembered by the browser you are using, '
+					. 'allowing you to visit WeBWorK pages without typing your user name and password (until your session '
+					. 'expires). This feature is not safe for public workstations, untrusted machines, and machines '
+					. 'over which you do not have direct control.',
 				tag('strong', $rememberMeText)
 			) =%>
 		</p>
@@ -54,13 +62,22 @@
 				% # Prevent user from being filled in for practice users (they should use the "Guest Login" button).
 				% param('user', undef) if param('user') && param('user') =~ m/^$ce->{practiceUserPrefix}/;
 				%
-				<%= text_field user => '', id => 'uname', 'aria-required' => 'true', class => 'form-control',
-					placeholder => '', autocapitalize => 'none', spellcheck => 'false' =%>
+				<%= text_field
+					user            => '',
+					id              => 'uname',
+					'aria-required' => 'true',
+					class           => 'form-control',
+					placeholder     => '',
+					autocapitalize  => 'none',
+					spellcheck      => 'false' =%>
 				<%= label_for uname => maketext('Username') =%>
 			</div>
 			<div class="form-floating mb-2">
-				<%= password_field 'passwd', id => 'pswd', 'aria-required' => 'true', class => 'form-control',
-					placeholder => '' =%>
+				<%= password_field 'passwd',
+					id              => 'pswd',
+					'aria-required' => 'true',
+					class           => 'form-control',
+					placeholder     => '' =%>
 				<%= label_for pswd => maketext('Password') =%>
 			</div>
 			% if ($ce->{session_management_via} ne 'session_cookie') {
@@ -86,7 +103,8 @@
 						tag('b', $guestLoginText)) =%>
 				</p>
 				<%= submit_button maketext('Guest Login'),
-					name  => 'login_practice_user', class => 'btn btn-primary' =%>
+					name  => 'login_practice_user',
+					class => 'btn btn-primary' =%>
 			</div>
 		% }
 	<% end =%>
diff --git a/templates/ContentGenerator/LoginProctor.html.ep b/templates/ContentGenerator/LoginProctor.html.ep
index fb3e8545fe..78d1e20aef 100644
--- a/templates/ContentGenerator/LoginProctor.html.ep
+++ b/templates/ContentGenerator/LoginProctor.html.ep
@@ -19,8 +19,8 @@
 	% my ($alertClass, $msg) = ('alert-primary', '');
 	% if ($dueTime + $ce->{gatewayGracePeriod} < $submitTime) {
 		% $alertClass = ' alert-warning';
-		% $msg = maketext('The time limit on this assignment was exceeded. The assignment may be checked, '
-			% . 'but the result will not be counted.');
+		% $msg        = maketext('The time limit on this assignment was exceeded. The assignment may be checked, '
+				% . 'but the result will not be counted.');
 	% }
 	%
 	<div class="alert mb-2<%= $alertClass %>" role="alert">
@@ -62,16 +62,23 @@
 		<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2">
 			% # Prevent the proctor_user field from being filled with the parameter value.
 			% param('proctor_user', undef);
-			<%= text_field proctor_user => '', id => 'proctor_user', class => 'form-control', placeholder => '',
-				autocapitalize => 'none', spellcheck => 'false', autocomplete => 'new-password' =%>
+			<%= text_field
+				proctor_user   => '',
+				id             => 'proctor_user',
+				class          => 'form-control',
+				placeholder    => '',
+				autocapitalize => 'none',
+				spellcheck     => 'false',
+				autocomplete   => 'new-password' =%>
 			<%= label_for proctor_user => maketext('Proctor Username') =%>
 		</div>
 	% } else {
 		% # Restricted set login
 		<div class="alert alert-primary card p-2 mb-2" role="alert">
 			<em>
-				<%= maketext(
-					'This set has a set-level proctor password to authorize logins. Enter the password below.') =%>
+				<%=
+					maketext('This set has a set-level proctor password to authorize logins. Enter the password below.')
+				=%>
 			</em>
 		</div>
 		<%= hidden_field proctor_user => "set_id:$setID" =%>
@@ -80,12 +87,11 @@
 	% # The password field for the proctor.
 	<div class="col-xl-5 col-lg-6 col-md-7 col-sm-8 form-floating mb-2">
 		<%= password_field 'proctor_passwd',
-		 		id           => 'proctor_passwd',
-		 		class        => 'form-control',
-				placeholder  => '',
-				autocomplete => 'new-password'
-			=%>
-		<%=	label_for proctor_passwd => maketext('Proctor Password') =%>
+			id           => 'proctor_passwd',
+			class        => 'form-control',
+			placeholder  => '',
+			autocomplete => 'new-password' =%>
+		<%= label_for proctor_passwd => maketext('Proctor Password') =%>
 	</div>
 	%
 	<%= submit_button maketext('Continue'), class => 'btn btn-primary' =%>
diff --git a/templates/ContentGenerator/Logout.html.ep b/templates/ContentGenerator/Logout.html.ep
index ed4d9fd928..8ef646eb48 100644
--- a/templates/ContentGenerator/Logout.html.ep
+++ b/templates/ContentGenerator/Logout.html.ep
@@ -7,17 +7,21 @@
 			'The course [_1] uses an external authentication system ([_2]). Please go there to log in again.',
 			tag('strong', stash('courseID')),
 			$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
-				? link_to(tag('strong', $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}) =>
-					$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
-				: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
+			? link_to(
+				tag('strong', $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}) =>
+					$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+				)
+			: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
 		) =%>
 	</p>
 % } elsif ($ce->{external_auth} || $authen->{external_auth}) {
-	<p><%== maketext('This course uses an external authentication system. '
-		. 'Please return to its sign in page to log in again.') =%></p>
+	<p>
+		<%== maketext('This course uses an external authentication system. '
+				. 'Please return to its sign in page to log in again.') =%>
+	</p>
 % } else {
 	<%= form_for 'set_list', method => 'POST', begin =%>
 		<%= hidden_field force_passwd_authen => 1 =%>
-		<p><%= submit_button maketext('Log In Again'), name  => 'submit', class => 'btn btn-primary' =%></p>
+		<p><%= submit_button maketext('Log In Again'), name => 'submit', class => 'btn btn-primary' =%></p>
 	<% end =%>
 % }
diff --git a/templates/ContentGenerator/Options.html.ep b/templates/ContentGenerator/Options.html.ep
index 496c39f397..4ce5286936 100644
--- a/templates/ContentGenerator/Options.html.ep
+++ b/templates/ContentGenerator/Options.html.ep
@@ -23,31 +23,45 @@
 		<div class="row mb-2">
 			<div class="col-lg-8 col-md-10">
 				<div class="row mb-2">
-					<%= label_for currFirstName => maketext("Current First Name"),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						currFirstName => maketext("Current First Name"),
+						class         => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= text_field currFirstName => $c->{effectiveUser}->first_name, readonly => undef,
-							id => 'currFirstName', class => 'form-control bg-light', dir => 'ltr' =%>
+						<%= text_field
+							currFirstName => $c->{effectiveUser}->first_name,
+							readonly      => undef,
+							id            => 'currFirstName',
+							class         => 'form-control bg-light',
+							dir           => 'ltr' =%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for currLastName => maketext("Current Last Name"),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						currLastName => maketext("Current Last Name"),
+						class        => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= text_field currLastName => $c->{effectiveUser}->last_name, readonly => undef,
-							id => 'currLastName', class => 'form-control bg-light', dir => 'ltr' =%>
+						<%= text_field
+							currLastName => $c->{effectiveUser}->last_name,
+							readonly     => undef,
+							id           => 'currLastName',
+							class        => 'form-control bg-light',
+							dir          => 'ltr' =%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for newFirstName => maketext("New First Name"),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						newFirstName => maketext("New First Name"),
+						class        => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= text_field newFirstName => '', id => 'newFirstName', class => 'form-control', dir => 'ltr' =%>
+						<%=
+							text_field newFirstName => '', id => 'newFirstName', class => 'form-control', dir => 'ltr'
+						=%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for newLastName => maketext("New Last Name"),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						newLastName => maketext("New Last Name"),
+						class       => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
 						<%= text_field newLastName => '', id => 'newLastName', class => 'form-control', dir => 'ltr' =%>
 					</div>
@@ -62,30 +76,39 @@
 			<div class="col-lg-8 col-md-10">
 				<div class="row mb-2">
 					<%= label_for 'currPassword', class => 'col-form-label col-sm-6', begin =%>
-						<%= maketext(
-							q{[_1]'s Current Password}, $eUserName
-						) =%>
+						<%= maketext(q{[_1]'s Current Password}, $eUserName) =%>
 					<% end =%>
 					<div class="col-sm-6">
 						<%= text_field dummyUsername => '', class => 'd-none' =%>
-						<%= password_field 'currPassword', id => 'currPassword', class => 'form-control', dir => 'ltr',
+						<%= password_field 'currPassword',
+							id    => 'currPassword',
+							class => 'form-control',
+							dir   => 'ltr',
 							$c->{has_password} ? () : (disabled => 1) =%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for newPassword => maketext("[_1]'s New Password", $eUserName),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						newPassword => maketext("[_1]'s New Password", $eUserName),
+						class       => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= password_field 'newPassword', id => 'newPassword', class => 'form-control',
-							dir => 'ltr', autocomplete => 'new-password' =%>
+						<%= password_field 'newPassword',
+							id           => 'newPassword',
+							class        => 'form-control',
+							dir          => 'ltr',
+							autocomplete => 'new-password' =%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for confirmPassword => maketext("Confirm [_1]'s New Password", $eUserName),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						confirmPassword => maketext("Confirm [_1]'s New Password", $eUserName),
+						class           => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= password_field 'confirmPassword', id => 'confirmPassword', class => 'form-control',
-							dir => 'ltr', autocomplete => 'new-password' =%>
+						<%= password_field 'confirmPassword',
+							id           => 'confirmPassword',
+							class        => 'form-control',
+							dir          => 'ltr',
+							autocomplete => 'new-password' =%>
 					</div>
 				</div>
 			</div>
@@ -97,16 +120,22 @@
 		<div class="row mb-2">
 			<div class="col-lg-8 col-md-10">
 				<div class="row mb-2">
-					<%= label_for currAddress => maketext("[_1]'s Current Address", $eUserName),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						currAddress => maketext("[_1]'s Current Address", $eUserName),
+						class       => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
-						<%= text_field currAddress => $c->{effectiveUser}->email_address, readonly => undef,
-							id => 'currAddress', class => 'form-control bg-light', dir => 'ltr' =%>
+						<%= text_field
+							currAddress => $c->{effectiveUser}->email_address,
+							readonly    => undef,
+							id          => 'currAddress',
+							class       => 'form-control bg-light',
+							dir         => 'ltr' =%>
 					</div>
 				</div>
 				<div class="row mb-2">
-					<%= label_for newAddress => maketext("[_1]'s New Address", $eUserName),
-						class => 'col-form-label col-sm-6' =%>
+					<%= label_for
+						newAddress => maketext("[_1]'s New Address", $eUserName),
+						class      => 'col-form-label col-sm-6' =%>
 					<div class="col-sm-6">
 						<%= text_field newAddress => '', id => 'newAddress', class => 'form-control', dir => 'ltr' =%>
 					</div>
@@ -129,7 +158,10 @@
 						<legend class="lead"><%= maketext('View equations as') . ':' =%></legend>
 						% for (@active_modes) {
 							<div class="form-check form-check-inline">
-								<%= radio_button displayMode => $_, id => "displayMode-$_", class => 'form-check-input',
+								<%= radio_button
+									displayMode => $_,
+									id          => "displayMode-$_",
+									class       => 'form-check-input',
 									$_ eq $curr_displayMode ? (checked => undef) : () =%>
 								<%= label_for "displayMode-$_" => $_, class => 'form-check-label' =%>
 							</div>
@@ -148,11 +180,14 @@
 						<legend class="lead"><%= maketext('Show saved answers?') =%></legend>
 						% for (1, 0) {
 							<div class="form-check form-check-inline">
-								<%= radio_button showOldAnswers => $_,
-									id => "showOldAnswers$_", class => 'form-check-input',
+								<%= radio_button
+									showOldAnswers => $_,
+									id             => "showOldAnswers$_",
+									class          => 'form-check-input',
 									$_ eq $curr_showOldAnswers ? (checked => undef) : () =%>
-								<%= label_for "showOldAnswers$_" => $_ ? maketext('Yes') : maketext('No'),
-									class => 'form-check-label' =%>
+								<%= label_for
+									"showOldAnswers$_" => $_ ? maketext('Yes') : maketext('No'),
+									class              => 'form-check-label' =%>
 							</div>
 						% }
 					</fieldset>
@@ -170,11 +205,14 @@
 						<legend class="lead"><%= maketext('Use Equation Editor?') %></legend>
 						% for (1, 0) {
 							<div class="form-check form-check-inline">
-								<%= radio_button useMathView => $_,
-									id => "useMathView$_", class => 'form-check-input',
+								<%= radio_button
+									useMathView => $_,
+									id          => "useMathView$_",
+									class       => 'form-check-input',
 									$_ eq $curr_useMathView ? (checked => undef) : () =%>
-								<%= label_for "useMathView$_" => $_ ? maketext('Yes') : maketext('No'),
-									class => 'form-check-label' =%>
+								<%= label_for
+									"useMathView$_" => $_ ? maketext('Yes') : maketext('No'),
+									class           => 'form-check-label' =%>
 							</div>
 						% }
 					</fieldset>
@@ -192,11 +230,14 @@
 						<legend class="lead"><%= maketext('Use live equation rendering?') %></legend>
 						% for (1, 0) {
 							<div class="form-check form-check-inline">
-								<%= radio_button useMathQuill => $_,
-									id => "useMathQuill$_", class => 'form-check-input',
+								<%= radio_button
+									useMathQuill => $_,
+									id           => "useMathQuill$_",
+									class        => 'form-check-input',
 									$_ eq $curr_useMathQuill ? (checked => undef) : () =%>
-								<%= label_for "useMathQuill$_" => $_ ? maketext('Yes') : maketext('No'),
-									class => 'form-check-label' =%>
+								<%= label_for
+									"useMathQuill$_" => $_ ? maketext('Yes') : maketext('No'),
+									class            => 'form-check-label' =%>
 							</div>
 						% }
 					</fieldset>
diff --git a/templates/ContentGenerator/Problem.html.ep b/templates/ContentGenerator/Problem.html.ep
index 8e5de14fc1..2a44f91151 100644
--- a/templates/ContentGenerator/Problem.html.ep
+++ b/templates/ContentGenerator/Problem.html.ep
@@ -34,8 +34,10 @@
 	%
 	% # This is for tagging menus (if allowed)
 	% if ($authz->hasPermissions(param('user'), 'modify_tags')) {
-		<%= javascript getAssetURL($ce, 'js/TagWidget/tagwidget.js'), id => 'tag-widget-script', defer => undef,
-			data => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
+		<%= javascript getAssetURL($ce, 'js/TagWidget/tagwidget.js'),
+			id    => 'tag-widget-script',
+			defer => undef,
+			data  => { taxonomy => "$ce->{webworkURLs}{htdocs}/DATA/tagging-taxonomy.json" } =%>
 	% }
 	%
 	% # This is for any page specific js.  Right now its just used for achievement popups
@@ -69,7 +71,7 @@
 	<div class="row g-0 mb-2">
 		<div class="col-12 alert alert-danger m-0">
 			<%== maketext('<strong>Warning</strong>: There may be something wrong with this question. '
-				. 'Please inform your instructor including the warning messages below.') =%>
+					. 'Please inform your instructor including the warning messages below.') =%>
 		</div>
 	</div>
 % }
@@ -88,20 +90,26 @@
 	<div class="row g-0 mb-2">
 		<div class="col-10 alert alert-danger m-0">
 			<h2 style="color:red"><%= maketext('PG question failed to render') %></h2>
-			<p class="m-0"><%= maketext('Processing of this PG problem was not completed.  Probably because of a '
-				. 'syntax error. The translator died prematurely and no PG warning messages were transmitted.') %></p>
+			<p class="m-0">
+				<%= maketext('Processing of this PG problem was not completed.  Probably because of a '
+						. 'syntax error. The translator died prematurely and no PG warning messages were transmitted.'
+				) %>
+			</p>
 		</div>
 	</div>
 % }
 <div class="row">
 	<div class="col-lg-10">
-		<%= form_for current_route, method => 'POST', name => 'problemMainForm',
-			id => 'problemMainForm', class => 'problem-main-form', begin =%>
+		<%= form_for current_route,
+			method => 'POST',
+			name   => 'problemMainForm',
+			id     => 'problemMainForm',
+			class  => 'problem-main-form',
+			begin =%>
 			<%= $c->hidden_authen_fields =%>
 			<%= hidden_field(startTime => param('startTime') || time) =%>
 			<%= hidden_field(courseID => $c->ce->{courseName}) =%>
-			<div id="problem_body" class="problem-content"
-				<%== $c->output_problem_lang_and_dir %>>
+			<div id="problem_body" class="problem-content" <%== $c->output_problem_lang_and_dir %>>
 				<%= $c->output_problem_body =%>
 			</div>
 			<%= $c->output_message =%>
diff --git a/templates/ContentGenerator/Problem/checkboxes.html.ep b/templates/ContentGenerator/Problem/checkboxes.html.ep
index d173352acd..9f0d25cbb8 100644
--- a/templates/ContentGenerator/Problem/checkboxes.html.ep
+++ b/templates/ContentGenerator/Problem/checkboxes.html.ep
@@ -1,4 +1,5 @@
-% last unless $c->{can}{showAnsGroupInfo}
+% last
+	% unless $c->{can}{showAnsGroupInfo}
 	% || $c->{can}{showAnsHashInfo}
 	% || $c->{can}{showPGInfo}
 	% || $c->{can}{showResourceInfo};
@@ -8,7 +9,10 @@
 	%
 	% if ($c->{can}{showAnsGroupInfo}) {
 		<div class="form-check form-check-inline">
-			<%= check_box showAnsGroupInfo => 1, id => 'showAnsGroupInfo', class => 'form-check-input',
+			<%= check_box
+				showAnsGroupInfo => 1,
+				id               => 'showAnsGroupInfo',
+				class            => 'form-check-input',
 				$c->{will}{showAnsGroupInfo} ? (checked => undef) : () =%>
 			<%= label_for showAnsGroupInfo => maketext('Answer Group Info'), class => "form-check-label" =%>
 		</div>
@@ -16,7 +20,10 @@
 	%
 	% if ($c->{can}{showResourceInfo}) {
 		<div class="form-check form-check-inline">
-			<%= check_box showResourceInfo => 1, id => 'showResourceInfo', class => 'form-check-input',
+			<%= check_box
+				showResourceInfo => 1,
+				id               => 'showResourceInfo',
+				class            => 'form-check-input',
 				$c->{will}{showResourceInfo} ? (checked => undef) : () =%>
 			<%= label_for showResourceInfo => maketext('Auxiliary Resources'), class => 'form-check-label' =%>
 		</div>
@@ -24,7 +31,10 @@
 	%
 	% if ($c->{can}{showAnsHashInfo}) {
 		<div class="form-check form-check-inline">
-			<%= check_box showAnsHashInfo => 1, id => 'showAnsHashInfo', class => 'form-check-input',
+			<%= check_box
+				showAnsHashInfo => 1,
+				id              => 'showAnsHashInfo',
+				class           => 'form-check-input',
 				$c->{will}{showAnsHashInfo} ? (checked => undef) : () =%>
 			<%= label_for showAnsHashInfo => maketext('Answer Hash Info'), class => 'form-check-label' =%>
 		</div>
@@ -32,9 +42,12 @@
 	%
 	% if ($c->{can}{showPGInfo}) {
 		<div class="form-check form-check-inline">
-			<%= check_box showPGInfo => 1, id => 'showPGInfo', class => 'form-check-input',
+			<%= check_box
+				showPGInfo => 1,
+				id         => 'showPGInfo',
+				class      => 'form-check-input',
 				$c->{will}{showPGInfo} ? (checked => undef) : () =%>
-			<%= label_for showPGInfo => maketext('PG Info'), class =>  'form-check-label' =%>
+			<%= label_for showPGInfo => maketext('PG Info'), class => 'form-check-label' =%>
 		</div>
 	% }
 </div>
diff --git a/templates/ContentGenerator/Problem/instructor_buttons.html.ep b/templates/ContentGenerator/Problem/instructor_buttons.html.ep
index c336324f87..7bfc554137 100644
--- a/templates/ContentGenerator/Problem/instructor_buttons.html.ep
+++ b/templates/ContentGenerator/Problem/instructor_buttons.html.ep
@@ -2,7 +2,8 @@
 %
 % if ($c->{can}{showCorrectAnswers}) {
 	<div class="submit-buttons-container col-12 my-2">
-		<%= submit_button maketext('Show Correct Answers'), name => 'showCorrectAnswers',
+		<%= submit_button maketext('Show Correct Answers'),
+			name  => 'showCorrectAnswers',
 			class => 'btn btn-primary mb-1' =%>
 	</div>
 % }
diff --git a/templates/ContentGenerator/Problem/messages.html.ep b/templates/ContentGenerator/Problem/messages.html.ep
index fd91ca9ee8..febbdcf3ac 100644
--- a/templates/ContentGenerator/Problem/messages.html.ep
+++ b/templates/ContentGenerator/Problem/messages.html.ep
@@ -12,10 +12,8 @@
 	<p>
 		<b><%= maketext('Note') %>:</b>
 		<i>
-			<%= maketext(
-				'You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',
-				$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100
-			) =%>
+			<%= maketext('You are in the Reduced Scoring Period.  All work counts for [_1]% of the original.',
+				$ce->{pg}{ansEvalDefaults}{reducedScoringValue} * 100) =%>
 		</i>
 	</p>
 % }
@@ -43,8 +41,7 @@
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The solution shown is an instructor preview and '
-				. 'will only be shown to students after the answer date.'
-			) =%>
+					. 'will only be shown to students after the answer date.') =%>
 		</i>
 	</p>
 % }
@@ -54,7 +51,7 @@
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The correct answers shown in feedback are instructor previews and '
-				. 'will only be shown to students after the answer date.') =%>
+					. 'will only be shown to students after the answer date.') =%>
 		</i>
 	</p>
 % }
diff --git a/templates/ContentGenerator/Problem/siblings.html.ep b/templates/ContentGenerator/Problem/siblings.html.ep
index 82f8084265..47136016dd 100644
--- a/templates/ContentGenerator/Problem/siblings.html.ep
+++ b/templates/ContentGenerator/Problem/siblings.html.ep
@@ -7,14 +7,22 @@
 		% my $progress_bar_inprogress_width  = $total_inprogress * 100 / $num_of_problems;
 		% my $progress_bar_unattempted_width = $unattempted * 100 / $num_of_problems;
 		%
-		<div class="progress set-progress set-id-tooltip" aria-label="progress bar for current problem set"
-			role="figure">
+		<div
+			class="progress set-progress set-id-tooltip"
+			aria-label="progress bar for current problem set"
+			role="figure"
+		>
 			% if ($total_correct > 0) {
-				<div class="progress-bar correct-progress set-id-tooltip"
+				<div
+					class="progress-bar correct-progress set-id-tooltip"
 					style="width:<%= $progress_bar_correct_width %>%"
-					aria-label="correct progress bar for current problem set" role="figure"
-					data-bs-toggle="tooltip" data-bs-placement="bottom" tabindex="0"
-					data-bs-title="<%= maketext('Correct: [_1]/[_2]', $total_correct, $num_of_problems) %>">
+					aria-label="correct progress bar for current problem set"
+					role="figure"
+					data-bs-toggle="tooltip"
+					data-bs-placement="bottom"
+					tabindex="0"
+					data-bs-title="<%= maketext('Correct: [_1]/[_2]', $total_correct, $num_of_problems) %>"
+				>
 					% if ($total_correct == $num_of_problems) {
 						% if ($is_reduced) {
 							% # If any of the scores are reduced the set is not perfect. It is merely complete.
@@ -27,28 +35,40 @@
 				</div>
 			% }
 			% if ($total_inprogress > 0) {
-				<div class="progress-bar inprogress-progress set-id-tooltip"
+				<div
+					class="progress-bar inprogress-progress set-id-tooltip"
 					style="width:<%= $progress_bar_inprogress_width %>%"
-					aria-label="in progress bar for current problem set" role="figure"
-					data-bs-toggle="tooltip" data-bs-placement="bottom" tabindex="0"
-					data-bs-title="<%= maketext('In progress: [_1]/[_2]', $total_inprogress, $num_of_problems) %>">
-				</div>
+					aria-label="in progress bar for current problem set"
+					role="figure"
+					data-bs-toggle="tooltip"
+					data-bs-placement="bottom"
+					tabindex="0"
+					data-bs-title="<%= maketext('In progress: [_1]/[_2]', $total_inprogress, $num_of_problems) %>"
+				></div>
 			% }
 			% if ($total_incorrect > 0) {
-				<div class="progress-bar incorrect-progress set-id-tooltip"
+				<div
+					class="progress-bar incorrect-progress set-id-tooltip"
 					style="width:<%= $progress_bar_incorrect_width %>%"
-					aria-label="incorrect progress bar for current problem set" role="figure"
-					data-bs-toggle="tooltip" data-bs-placement="bottom" tabindex="0"
-					data-bs-title="<%= maketext('Incorrect: [_1]/[_2]', $total_incorrect, $num_of_problems) %>">
-				</div>
+					aria-label="incorrect progress bar for current problem set"
+					role="figure"
+					data-bs-toggle="tooltip"
+					data-bs-placement="bottom"
+					tabindex="0"
+					data-bs-title="<%= maketext('Incorrect: [_1]/[_2]', $total_incorrect, $num_of_problems) %>"
+				></div>
 			% }
 			% if ($unattempted > 0) {
-				<div class="progress-bar unattempted-progress set-id-tooltip"
+				<div
+					class="progress-bar unattempted-progress set-id-tooltip"
 					style="width:<%= $progress_bar_unattempted_width %>%"
-					aria-label="unattempted progress bar for current problem set" role="figure"
-					data-bs-toggle="tooltip" data-bs-placement="bottom" tabindex="0"
-					data-bs-title="<%= maketext('Unattempted: [_1]/[_2]', $unattempted, $num_of_problems) %>">
-				</div>
+					aria-label="unattempted progress bar for current problem set"
+					role="figure"
+					data-bs-toggle="tooltip"
+					data-bs-placement="bottom"
+					tabindex="0"
+					data-bs-title="<%= maketext('Unattempted: [_1]/[_2]', $unattempted, $num_of_problems) %>"
+				></div>
 			% }
 		</div>
 	% }
diff --git a/templates/ContentGenerator/Problem/submit_buttons.html.ep b/templates/ContentGenerator/Problem/submit_buttons.html.ep
index f959fb7eba..ceef8bf012 100644
--- a/templates/ContentGenerator/Problem/submit_buttons.html.ep
+++ b/templates/ContentGenerator/Problem/submit_buttons.html.ep
@@ -1,23 +1,29 @@
 % use WeBWorK::Utils::DateTime qw(before);
 %
-% my %can            = %{ $c->{can} };
-% my %will           = %{ $c->{will} };
-% my $effectiveUser  = param('effectiveUser');
+% my %can           = %{ $c->{can} };
+% my %will          = %{ $c->{will} };
+% my $effectiveUser = param('effectiveUser');
 % if ($will{requestNewSeed}) {
-	<%= submit_button maketext('Request New Version'), id => 'enter_key_submit', name => 'requestNewSeed',
-		formtarget => '_self', class => 'visually-hidden-unfocusable' =%>
-	<%= submit_button maketext('Request New Version'), id => 'submitAnswers_id', name => 'requestNewSeed',
-		formtarget => '_self', class => 'btn btn-primary mb-1' =%>
+	<%= submit_button maketext('Request New Version'),
+		id         => 'enter_key_submit',
+		name       => 'requestNewSeed',
+		formtarget => '_self',
+		class      => 'visually-hidden-unfocusable' =%>
+	<%= submit_button maketext('Request New Version'),
+		id         => 'submitAnswers_id',
+		name       => 'requestNewSeed',
+		formtarget => '_self',
+		class      => 'btn btn-primary mb-1' =%>
 % } else {
 	% my $enter_key_name  = 'previewAnswers';
 	% my $enter_key_value = maketext('Preview My Answers');
-	% if (
-		% $c->ce->{pg}{options}{enterKey} eq 'submit'
-		% || ($c->ce->{pg}{options}{enterKey} eq 'conservative' && $c->{problem}{max_attempts} < 0)
-	% ) {
+	% if ($c->ce->{pg}{options}{enterKey} eq 'submit'
+		% || ($c->ce->{pg}{options}{enterKey} eq 'conservative' && $c->{problem}{max_attempts} < 0))
+	% {
 		% if ($can{getSubmitButton}) {
-			% $enter_key_name  = 'submitAnswers';
-			% $enter_key_value = (param('user') ne $effectiveUser)
+			% $enter_key_name = 'submitAnswers';
+			% $enter_key_value =
+				% (param('user') ne $effectiveUser)
 				% ? maketext('Submit Answers for [_1]', $effectiveUser)
 				% : maketext('Submit Answers');
 		% } elsif ($can{checkAnswers}) {
@@ -25,25 +31,39 @@
 			% $enter_key_value = maketext('Check Answers');
 		% }
 	% }
-	<%= submit_button $enter_key_value, id => 'enter_key_submit', formtarget => '_self', name => $enter_key_name,
-		class => 'visually-hidden-unfocusable' =%>
-	<%= submit_button maketext('Preview My Answers'), id => 'previewAnswers_id', formtarget => '_self',
-		name => 'previewAnswers', class => 'btn btn-primary mb-1' =%>
+	<%= submit_button $enter_key_value,
+		id         => 'enter_key_submit',
+		formtarget => '_self',
+		name       => $enter_key_name,
+		class      => 'visually-hidden-unfocusable' =%>
+	<%= submit_button maketext('Preview My Answers'),
+		id         => 'previewAnswers_id',
+		formtarget => '_self',
+		name       => 'previewAnswers',
+		class      => 'btn btn-primary mb-1' =%>
 	%
 	% if ($can{checkAnswers}) {
-		<%= submit_button maketext('Check Answers'), id => 'checkAnswers_id', formtarget => '_self',
-			name => 'checkAnswers', class => 'btn btn-primary mb-1' =%>
+		<%= submit_button maketext('Check Answers'),
+			id         => 'checkAnswers_id',
+			formtarget => '_self',
+			name       => 'checkAnswers',
+			class      => 'btn btn-primary mb-1' =%>
 	% }
 	%
 	% if ($can{getSubmitButton}) {
 		% if (param('user') ne $effectiveUser) {
 			% # If acting as a student, make it clear that answer submissions will
 			% # apply to the student's records, not the instructor's.
-			<%= submit_button maketext('Submit Answers for [_1]', $effectiveUser), id => 'submitAnswers_id',
-				name => 'submitAnswers', class => 'btn btn-primary mb-1' =%>
+			<%= submit_button maketext('Submit Answers for [_1]', $effectiveUser),
+				id    => 'submitAnswers_id',
+				name  => 'submitAnswers',
+				class => 'btn btn-primary mb-1' =%>
 		% } else {
-			<%= submit_button maketext('Submit Answers'), id => 'submitAnswers_id', name => 'submitAnswers',
-				formtarget => '_self', class => 'btn btn-primary mb-1' =%>
+			<%= submit_button maketext('Submit Answers'),
+				id         => 'submitAnswers_id',
+				name       => 'submitAnswers',
+				formtarget => '_self',
+				class      => 'btn btn-primary mb-1' =%>
 		% }
 	% }
 	%
@@ -52,15 +72,15 @@
 		% && $c->{showMeAnother}{MaxReps} > -1
 		% && $c->{showMeAnother}{Count} >= $c->{showMeAnother}{MaxReps};
 	% if ($can{showMeAnother} && !$exhausted) {
-	<%= link_to maketext('Show Me Another') => $c->systemLink(url_for('show_me_another')),
-			class      => 'set-id-tooltip btn btn-primary mb-1',
-			target     => 'WW_Show_Me_Another',
-			data       => {
+		<%= link_to maketext('Show Me Another') => $c->systemLink(url_for('show_me_another')),
+			class                               => 'set-id-tooltip btn btn-primary mb-1',
+			target                              => 'WW_Show_Me_Another',
+			data                                => {
 				bs_toggle    => 'tooltip',
 				bs_placement => 'right',
 				bs_title     => maketext(
 					'You can use this feature [quant,_1,more time,more times,as many times as you want] '
-						. 'on this problem',
+					. 'on this problem',
 					$c->{showMeAnother}{MaxReps} >= $c->{showMeAnother}{Count}
 					? $c->{showMeAnother}{MaxReps} - $c->{showMeAnother}{Count}
 					: ''
@@ -71,19 +91,21 @@
 		% # available because the student hasn't tried enough times or is no longer available because the user has used
 		% # show me another the maximum allowed number of times then gray it out. Otherwise display nothing.
 		% if ($ce->{pg}{options}{enableShowMeAnother} && $c->{showMeAnother}{TriesNeeded} > -1) {
-			<span class="set-id-tooltip d-inline-block" tabindex="0" data-bs-toggle="tooltip"
+			<span
+				class="set-id-tooltip d-inline-block"
+				tabindex="0"
+				data-bs-toggle="tooltip"
 				data-bs-placement="right"
-				data-bs-title="<%=
-					before($db->getGlobalSet($c->{set}->set_id)->open_date, $c->submitTime)
-						? maketext('The problem set is not yet open')
-						: $exhausted
-						? maketext('This feature has been used the maximum allowed number of times for this problem, '
-							. 'and cannot be used again.'
-						)
-						: maketext(
-							'You must attempt this problem [quant,_1,more time] before this feature is available',
-							$c->{showMeAnother}{TriesNeeded} - $c->{problem}->num_correct - $c->{problem}->num_incorrect
-						) =%>">
+				data-bs-title="<%= before($db->getGlobalSet($c->{set}->set_id)->open_date, $c->submitTime)
+					? maketext('The problem set is not yet open')
+					: $exhausted
+					? maketext('This feature has been used the maximum allowed number of times for this problem, '
+						. 'and cannot be used again.')
+					: maketext(
+						'You must attempt this problem [quant,_1,more time] before this feature is available',
+						$c->{showMeAnother}{TriesNeeded} - $c->{problem}->num_correct - $c->{problem}->num_incorrect
+					) =%>"
+			>
 				<button class="btn btn-primary mb-1" type="button" disabled>
 					% if ($exhausted) {
 						<%= maketext('Show Me Another Exhausted') =%>
diff --git a/templates/ContentGenerator/ProblemSet.html.ep b/templates/ContentGenerator/ProblemSet.html.ep
index 1c07e75e93..23972b13ea 100644
--- a/templates/ContentGenerator/ProblemSet.html.ep
+++ b/templates/ContentGenerator/ProblemSet.html.ep
@@ -13,10 +13,8 @@
 	% } else {
 		<div class="alert alert-danger">
 			<p class="mb-3">
-				<%= maketext(
-					'The selected problem set ([_1]) is not a valid set for [_2].',
-					stash('setID'), param('effectiveUser')
-				) =%>
+				<%= maketext('The selected problem set ([_1]) is not a valid set for [_2].',
+					stash('setID'), param('effectiveUser')) =%>
 			</p>
 			<p class="mb-0"><%= $c->{invalidSet} %></p>
 		</div>
diff --git a/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep b/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
index a6f765592b..0405e6290f 100644
--- a/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
+++ b/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
@@ -34,18 +34,21 @@
 		% my $achievementItems = $c->{achievementItems};
 		% if ($achievementItems && @$achievementItems) {
 			<%= link_to maketext('Use Achievement Reward') => '#modal_rewards',
-				role  => 'button',
-				class => 'btn btn-primary',
-				id    => 'popup_rewards',
-				data  => { bs_toggle => 'modal' }
-			=%>
+				role                                       => 'button',
+				class                                      => 'btn btn-primary',
+				id                                         => 'popup_rewards',
+				data                                       => { bs_toggle => 'modal' } =%>
 			<div id="modal_rewards" class="modal hide fade" tabindex="-1">
 				<div class="modal-dialog modal-dialog-centered">
 					<div class="modal-content">
 						<div class="modal-header">
 							<h1 class="modal-title h4"><%= maketext('Achievement Rewards') %></h1>
-							<button type="button" class="btn-close" data-bs-dismiss="modal"
-								aria-label="<%= maketext('close') %>"></button>
+							<button
+								type="button"
+								class="btn-close"
+								data-bs-dismiss="modal"
+								aria-label="<%= maketext('close') %>"
+							></button>
 						</div>
 						<div class="modal-body">
 							<dl>
@@ -53,27 +56,34 @@
 									% my ($item, $form) = @$_;
 									<dt class="fs-4"><%= $item->name %></dt>
 									<dd class="mx-3 mb-4">
-									% if (param('user') eq param('effectiveUser')) {
-										<%= form_for current_route, method => 'POST', name => 'use_reward', begin =%>
-											<%= hidden_field 'use_achievement_item_id' => $item->id %>
+										% if (param('user') eq param('effectiveUser')) {
+											<%= form_for current_route, method => 'POST', name => 'use_reward', begin =%>
+												<%= hidden_field 'use_achievement_item_id' => $item->id %>
+												<%= $form %>
+												% unless ($item->{hideUseButton}) {
+													<input
+														class="btn btn-primary"
+														type="submit"
+														name="use_achievement_item_<%= $item->id %>"
+														value="<%= maketext('Use [_1]', $item->remaining_title($c)) %>"
+													>
+												% }
+											<%= end =%>
+										% } else {
 											<%= $form %>
-											% unless ($item->{hideUseButton}) {
-												<input class="btn btn-primary" type="submit"
-													name="use_achievement_item_<%= $item->id %>"
-													value="<%= maketext('Use [_1]', $item->remaining_title($c)) %>">
-											% }
-										<%= end =%>
-									% } else {
-										<%= $form %>
-										<span class="d-inline-block set-id-tooltip"
-											tabindex="0" data-bs-toggle="tooltip" data-bs-placement="top"
-											data-bs-title="<%=maketext('You cannot use achievement rewards '
-																		. 'when acting as another user.') %>">
-											<button class="btn btn-primary" type="button" disabled>
-												<%= maketext('Use [_1]', $item->remaining_title($c)) %>
-											</button>
-										</span>
-									% }
+											<span
+												class="d-inline-block set-id-tooltip"
+												tabindex="0"
+												data-bs-toggle="tooltip"
+												data-bs-placement="top"
+												data-bs-title="<%= maketext('You cannot use achievement rewards '
+														. 'when acting as another user.') %>"
+											>
+												<button class="btn btn-primary" type="button" disabled>
+													<%= maketext('Use [_1]', $item->remaining_title($c)) %>
+												</button>
+											</span>
+										% }
 									</dd>
 								% }
 							</dl>
@@ -85,8 +95,13 @@
 				</div>
 			</div>
 		% } else {
-			<span class="d-inline-block set-id-tooltip" tabindex="0" data-bs-toggle="tooltip" data-bs-placement="top"
-				data-bs-title="<%=maketext('No achievement rewards are available for this assignment.') %>">
+			<span
+				class="d-inline-block set-id-tooltip"
+				tabindex="0"
+				data-bs-toggle="tooltip"
+				data-bs-placement="top"
+				data-bs-title="<%= maketext('No achievement rewards are available for this assignment.') %>"
+			>
 				<button class="btn btn-primary" type="button" disabled>
 					<%= maketext('Use Achievement Reward') %>
 				</button>
@@ -94,9 +109,7 @@
 		% }
 	% }
 	% unless ($c->{set}->assignment_type =~ /gateway/) {
-		<%= link_to
-			maketext('Download Hardcopy') => $c->systemLink(url_for 'hardcopy_preselect_set'),
-			class => 'btn btn-primary' =%>
+		<%= link_to maketext('Download Hardcopy') => $c->systemLink(url_for 'hardcopy_preselect_set'),
+			class                                 => 'btn btn-primary' =%>
 	% }
 </div>
-
diff --git a/templates/ContentGenerator/ProblemSet/info.html.ep b/templates/ContentGenerator/ProblemSet/info.html.ep
index 1a19470fe6..9520202a7a 100644
--- a/templates/ContentGenerator/ProblemSet/info.html.ep
+++ b/templates/ContentGenerator/ProblemSet/info.html.ep
@@ -2,10 +2,11 @@
 	<h2 class="d-flex align-items-center justify-content-center">
 		<%= maketext('Set Info') =%>
 		<%= link_to maketext('Edit') => $c->systemLink(
-				url_for('instructor_problem_editor_withset_withproblem', setID => $c->{set}->set_id, problemID => 0),
-				params => { file_type => 'set_header' }
+			url_for('instructor_problem_editor_withset_withproblem', setID => $c->{set}->set_id, problemID => 0),
+			params => { file_type => 'set_header' }
 			),
-			target => 'WW_Editor', class => 'btn btn-sm btn-info m-1' =%>
+			target => 'WW_Editor',
+			class  => 'btn btn-sm btn-info m-1' =%>
 	</h2>
 % } else {
 	<h2><%= maketext('Set Info') %></h2>
diff --git a/templates/ContentGenerator/ProblemSet/problem_list.html.ep b/templates/ContentGenerator/ProblemSet/problem_list.html.ep
index ce1ee9cdea..5194d187ad 100644
--- a/templates/ContentGenerator/ProblemSet/problem_list.html.ep
+++ b/templates/ContentGenerator/ProblemSet/problem_list.html.ep
@@ -6,7 +6,9 @@
 	% # This table contains a summary, a caption, and scope variables for the columns.
 	<div class="table-responsive">
 		<table class="problem_set_table table caption-top font-sm">
-			<caption><%= maketext('Problems') %></caption>
+			<caption>
+				<%= maketext('Problems') %>
+			</caption>
 			<thead class="table-group-divider">
 				<tr>
 					<th><%= maketext('Name') %></th>
@@ -18,14 +20,17 @@
 						<th>
 							<%= maketext('Adjusted Status') =%>
 							&nbsp;
-							<%= link_to '#', class => 'help-popup', tabindex => 0, role => 'button',
-								data => {
+							<%= link_to '#',
+								class    => 'help-popup',
+								tabindex => 0,
+								role     => 'button',
+								data     => {
 									bs_placement => 'top',
 									bs_toggle    => 'popover',
 									bs_content   => maketext(
-										q{The adjusted status of a problem is the larger of the problem's status and }
-											. 'the weighted average of the status of those problems which count '
-											. 'toward the parent grade.'
+									q{The adjusted status of a problem is the larger of the problem's status and }
+										. 'the weighted average of the status of those problems which count '
+										. 'toward the parent grade.'
 									)
 								},
 								begin =%>
@@ -36,7 +41,7 @@
 						<th><%= maketext('Counts for Parent') %></th>
 					% }
 					% if ($authz->hasPermissions(param('user'), 'access_instructor_tools')
-						% && $authz->hasPermissions(param('user'), 'problem_grader')) {
+					% && $authz->hasPermissions(param('user'), 'problem_grader')) {
 						<th><%= maketext('Grader') %></th>
 					% }
 				</tr>
@@ -44,7 +49,8 @@
 			<tbody class="table-group-divider">
 				% for my $problem (@$problems) {
 					<%= include 'ContentGenerator/ProblemSet/problem_list_row',
-						problem => $problem, isJitarSet => $isJitarSet =%>
+						problem    => $problem,
+						isJitarSet => $isJitarSet =%>
 				% }
 			</tbody>
 		</table>
@@ -52,4 +58,3 @@
 % } else {
 	<p><%= maketext('This homework set contains no problems.') %></p>
 % }
-%
diff --git a/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep b/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep
index 07464ce071..2c8983a320 100644
--- a/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep
+++ b/templates/ContentGenerator/ProblemSet/problem_list_row.html.ep
@@ -1,10 +1,6 @@
 % use WeBWorK::Utils qw(wwRound);
-% use WeBWorK::Utils::JITAR (
-	% 'jitar_id_to_seq',
-	% 'is_jitar_problem_hidden',
-	% 'is_jitar_problem_closed',
-	% 'jitar_problem_adjusted_status'
-% );
+% use WeBWorK::Utils::JITAR ('jitar_id_to_seq', 'is_jitar_problem_hidden', 'is_jitar_problem_closed',
+	% 'jitar_problem_adjusted_status');
 %
 % my $courseID      = stash('courseID');
 % my $setID         = $c->{set}->set_id;
@@ -30,11 +26,9 @@
 	<tr>
 		% # Problem number
 		<td>
-			% if (
-				% $isJitarSet
+			% if ($isJitarSet
 				% && !$authz->hasPermissions($problem->user_id, 'view_unopened_sets')
-				% && is_jitar_problem_closed($db, $ce, $problem->user_id, $setID, $problemID)
-			% )
+				% && is_jitar_problem_closed($db, $ce, $problem->user_id, $setID, $problemID))
 			% {
 				% # If the problem is jitar restricted, then show it greyed out.
 				<span class="<%= $linkClasses %> text-nowrap">
@@ -68,17 +62,17 @@
 				% }
 			</td>
 			<td>
-				<%= $isJitarSet && $problemLevel != 0 && $problem->counts_parent_grade
-					? maketext('Yes')
-					: maketext('No') =%>
+				<%= $isJitarSet
+					&& $problemLevel != 0
+					&& $problem->counts_parent_grade ? maketext('Yes') : maketext('No') =%>
 			</td>
 		% }
 		% # Grader
 		% if ($authz->hasPermissions(param('user'), 'access_instructor_tools')
-			% && $authz->hasPermissions(param('user'), 'problem_grader')) {
+		% && $authz->hasPermissions(param('user'), 'problem_grader')) {
 			<td>
 				<%= link_to(maketext('Grade Problem') =>
-					$c->systemLink(url_for('instructor_problem_grader', problemID => $problemID))) =%>
+						$c->systemLink(url_for('instructor_problem_grader', problemID => $problemID))) =%>
 			</td>
 		% }
 	</tr>
diff --git a/templates/ContentGenerator/ProblemSet/version_list.html.ep b/templates/ContentGenerator/ProblemSet/version_list.html.ep
index e292f4a626..9b729f335d 100644
--- a/templates/ContentGenerator/ProblemSet/version_list.html.ep
+++ b/templates/ContentGenerator/ProblemSet/version_list.html.ep
@@ -35,8 +35,7 @@
 				<div class="alert alert-warning">
 					<%= maketext(
 						'You have [quant,_1,hour] and [quant,_2,minute] remaining to complete the currently open test.',
-						$hours,
-						$minutes
+						$hours, $minutes
 					) =%>
 				</div>
 			% } elsif ($hours || ($minutes && (!$seconds || $continueTimeLeft > 299))) {
@@ -46,8 +45,7 @@
 					<%= maketext(
 						'You have [quant,_1,hour,hours,][quant,_2,minute,minutes,] '
 							. 'remaining to complete the currently open test.',
-						$hours,
-						$minutes
+						$hours, $minutes
 					) =%>
 				</div>
 			% } else {
@@ -56,16 +54,13 @@
 						<%= maketext(
 							'You have [quant,_1,minute] and [quant,_2,second] '
 								. 'remaining to complete the currently open test.',
-							$minutes,
-							$seconds
+							$minutes, $seconds
 						) =%>
 					</div>
 				% } else {
 					<div class="alert alert-warning">
-						<%= maketext(
-							'You have [quant,_1,second] remaining to complete the currently open test.',
-							$seconds
-						) =%>
+						<%= maketext('You have [quant,_1,second] remaining to complete the currently open test.',
+							$seconds) =%>
 					</div>
 				% }
 			% }
@@ -80,27 +75,26 @@
 	%
 	<div class="mb-3">
 		<%= link_to maketext('Continue Open Test') =>
-				$c->systemLink(url_for($routeName, setID => $set->set_id . ',v' . $continueVersion->version_id)),
+			$c->systemLink(url_for($routeName, setID => $set->set_id . ',v' . $continueVersion->version_id)),
 			class => 'btn btn-primary' =%>
 	</div>
 % } elsif (($timeNow >= $set->open_date || $authz->hasPermissions($user, 'view_hidden_sets'))
-	% && $timeNow <= $set->due_date
+% && $timeNow <= $set->due_date
 	% && !($ce->{options}{enableConditionalRelease} && is_restricted($db, $set, param('effectiveUser')))
 	% && ($maxVersions <= 0 || $currentVersions < $maxVersions))
 % {
 	% # Display information about a new test and a start new test button.
 	% # Print time limit for timed tests
 	% if ($timeLimit > 0) {
-		% my $hours    = int($timeLimit / 3600);
-		% my $minutes  = int(($timeLimit % 3600) / 60);
+		% my $hours   = int($timeLimit / 3600);
+		% my $minutes = int(($timeLimit % 3600) / 60);
 		%
 		% # Two cases to format time to work well with translation.
 		% if ($hours && $minutes) {
 			<div class="alert alert-warning">
 				<%= maketext(
 					'This is a timed test. You will have [quant,_1,hour] and [quant,_2,minute] to complete the test.',
-					$hours,
-					$minutes
+					$hours, $minutes
 				) =%>
 			</div>
 		% } else {
@@ -110,8 +104,7 @@
 				<%= maketext(
 					'This is a timed test. You will have [quant,_1,hour,hours,]'
 						. '[quant,_2,minute,minutes,] to complete the test.',
-					$hours,
-					$minutes
+					$hours, $minutes
 				) =%>
 			</div>
 		% }
@@ -124,15 +117,20 @@
 	<div class="mb-3">
 		% # Disable "Start New Test" button when acting as another user who doesn't have permissions to start tests.
 		% if ($disable_start_new_test) {
-			<span class="d-inline-block set-id-tooltip" tabindex="0" data-bs-toggle="tooltip" data-bs-placement="top"
-				data-bs-title="<%=maketext(
+			<span
+				class="d-inline-block set-id-tooltip"
+				tabindex="0"
+				data-bs-toggle="tooltip"
+				data-bs-placement="top"
+				data-bs-title="<%= maketext(
 					'You are acting as another user and do not have permission to start a new test for other users.'
-				) %>">
+				) %>"
+			>
 				<button class="btn btn-primary" type="button" disabled><%= maketext('Start New Test') %></button>
 			</span>
 		% } else {
 			<%= link_to maketext('Start New Test') => $c->systemLink(url_for($routeName, setID => $set->set_id)),
-				class => 'btn btn-primary' =%>
+				class                              => 'btn btn-primary' =%>
 		% }
 	</div>
 % } else {
@@ -158,7 +156,9 @@
 	<% my $version_list = begin =%>
 		<div class="table-responsive">
 			<table class="problem_set_table table table-sm caption-top font-sm">
-				<caption><%= maketext('Test Versions') %></caption>
+				<caption>
+					<%= maketext('Test Versions') %>
+				</caption>
 				<thead class="table-group-divider">
 					<tr>
 						<th scope="col"><%= maketext('Versions') %></th>
@@ -167,8 +167,11 @@
 						<th scope="col"><%= maketext('Start') %></th>
 						<th scope="col"><%= maketext('End') %></th>
 						<th scope="col" class="hardcopy">
-							<i class="icon far fa-lg fa-arrow-alt-circle-down" aria-hidden="true"
-								title="<%= maketext('Generate Hardcopy') %>"></i>
+							<i
+								class="icon far fa-lg fa-arrow-alt-circle-down"
+								aria-hidden="true"
+								title="<%= maketext('Generate Hardcopy') %>"
+							></i>
 							<span class="visually-hidden"><%= maketext('Generate Hardcopy') =%></span>
 						</th>
 					</tr>
@@ -177,14 +180,15 @@
 					% for my $ver (@$versionData) {
 						% my $interactive = maketext('Version [_1]', $ver->{version});
 						% if ($authz->hasPermissions($user, 'view_hidden_work') || $ver->{show_link}) {
-							<% $interactive = link_to $interactive => $c->systemLink(url_for(
+							<% $interactive = link_to
+								$interactive => $c->systemLink(url_for(
 									$ver->{proctored} ? 'proctored_gateway_quiz' : 'gateway_quiz',
-									setID    => $ver->{id}
+									setID => $ver->{id}
 								)),
-								class             => 'set-id-tooltip text-nowrap',
-								data => {
+								class => 'set-id-tooltip text-nowrap',
+								data  => {
 									bs_toggle    => 'tooltip',
-								   	bs_placement => 'right',
+									bs_placement => 'right',
 									bs_title     => $set->description
 								} =%>
 						% }
@@ -192,20 +196,25 @@
 						% # Download hardcopy.
 						% my $control = '';
 						% if ($multiSet) {
-							<% $control = check_box selected_sets => $ver->{id},
-								id => $ver->{id}, class => 'form-check-input'; =%>
+							<% $control = check_box
+								selected_sets => $ver->{id},
+								id            => $ver->{id},
+								class         => 'form-check-input'; =%>
 							% # Make interactive the label for the control.
 							% $interactive = label_for $ver->{id} => $interactive;
 						% } elsif ($ver->{show_download}) {
 							% # Only display download option if answers are available.
 							<% $control = link_to $c->systemLink(
-									url_for('hardcopy_preselect_set', setID => $ver->{id}),
-									params => { selected_sets => $ver->{id} }
+								url_for('hardcopy_preselect_set', setID => $ver->{id}),
+								params => { selected_sets => $ver->{id} }
 								),
 								class => 'hardcopy-link',
 								begin =%>
-								<i class="icon far fa-arrow-alt-circle-down fa-lg" aria-hidden="true"
-									title="<%= maketext('Download [_1]', $ver->{id} =~ s/_/ /gr) %>"></i>
+								<i
+									class="icon far fa-arrow-alt-circle-down fa-lg"
+									aria-hidden="true"
+									title="<%= maketext('Download [_1]', $ver->{id} =~ s/_/ /gr) %>"
+								></i>
 								<span class="visually-hidden">
 									<%= maketext('Download [_1]', $ver->{id} =~ s/_/ /gr) %>
 								</span>
@@ -228,17 +237,25 @@
 	%
 	% if ($multiSet) {
 		% # Show form for generating hardcopies of test versions.
-		<%= form_for 'hardcopy_preselect_set', method => 'POST', name => 'problem-sets-form', id => 'problem-sets-form',
+		<%= form_for 'hardcopy_preselect_set',
+			method => 'POST',
+			name   => 'problem-sets-form',
+			id     => 'problem-sets-form',
 			begin =%>
 			<%= $c->hidden_authen_fields =%>
 			<%= $version_list->() =%>
 			<div class="mb-3">
-				<%= input_tag reset => maketext('Deselect All Test Versions'),
-					id => 'clear', type => 'reset', class => 'btn btn-primary' =%>
+				<%= input_tag
+					reset => maketext('Deselect All Test Versions'),
+					id    => 'clear',
+					type  => 'reset',
+					class => 'btn btn-primary' =%>
 			</div>
 			<div class="mb-3">
 				<%= submit_button maketext('Download Hardcopy for Selected Tests'),
-					id => 'hardcopy', name => 'hardcopy', class => 'btn btn-primary' =%>
+					id    => 'hardcopy',
+					name  => 'hardcopy',
+					class => 'btn btn-primary' =%>
 			</div>
 		<% end =%>
 	% } else {
diff --git a/templates/ContentGenerator/ProblemSets.html.ep b/templates/ContentGenerator/ProblemSets.html.ep
index d8e49ce887..d3d608cf69 100644
--- a/templates/ContentGenerator/ProblemSets.html.ep
+++ b/templates/ContentGenerator/ProblemSets.html.ep
@@ -6,10 +6,14 @@
 	<div class="alert alert-danger">
 		<b>
 			% if ($ce->{LTI}) {
-				<%== maketext('You must access assignments from your Course Management System ([_1]).',
+				<%== maketext(
+					'You must access assignments from your Course Management System ([_1]).',
 					$ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
-						? link_to($ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url})
-						: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}) =%>
+					? link_to(
+						$ce->{LTI}{ $ce->{LTIVersion} }{LMS_name} => $ce->{LTI}{ $ce->{LTIVersion} }{LMS_url}
+						)
+					: $ce->{LTI}{ $ce->{LTIVersion} }{LMS_name}
+				) =%>
 			% } else {
 				<%= maketext('You do not have permission to list assignments in this course.') %>
 			% }
@@ -31,18 +35,24 @@
 		<%= hidden_field courseID => $ce->{courseName} =%>
 		<%= hidden_field userName => param('user') =%>
 		<div class="btn-group" role="group" aria-label="<%= maketext('Display choice') %>">
-			<button id="show-by-date-btn" type="button" class="btn btn-outline-primary"
+			<button
+				id="show-by-date-btn"
+				type="button"
+				class="btn btn-outline-primary"
 				data-open-title="<%= maketext('Open Assignments') %>"
 				data-reduced-title="<%= maketext('Reduced Scoring Assignments') %>"
 				data-not-open-title="<%= maketext('Future Assignments') %>"
 				data-past-due-title="<%= maketext('Past Due Assignments') %>"
-				>
+			>
 				<%= maketext('Show By Date') =%>
 			</button>
-			<button id="show-by-type-btn" type="button" class="btn btn-outline-primary"
+			<button
+				id="show-by-type-btn"
+				type="button"
+				class="btn btn-outline-primary"
 				data-default-title="<%= maketext('Regular Assignments') %>"
 				data-test-title="<%= maketext('Tests/Quizzes') %>"
-				>
+			>
 				<%= maketext('Show By Type') =%>
 			</button>
 		</div>
diff --git a/templates/ContentGenerator/ProblemSets/info.html.ep b/templates/ContentGenerator/ProblemSets/info.html.ep
index 9bc76fcdcd..809c7d894f 100644
--- a/templates/ContentGenerator/ProblemSets/info.html.ep
+++ b/templates/ContentGenerator/ProblemSets/info.html.ep
@@ -3,9 +3,12 @@
 % if ($authz->hasPermissions(param('user'), 'access_instructor_tools')) {
 	<h2 class="d-flex align-items-center justify-content-center">
 		<%= maketext('Course Info') =%>
-		<%= link_to(maketext('Edit') =>
+		<%= link_to(
+			maketext('Edit') =>
 				$c->systemLink(url_for('instructor_problem_editor'), params => { file_type => 'course_info' }),
-			target => 'WW_Editor', class => 'btn btn-sm btn-info m-1') =%>
+			target => 'WW_Editor',
+			class  => 'btn btn-sm btn-info m-1'
+		) =%>
 	</h2>
 	% if (stash('course_info_error')) {
 		<div class="alert alert-danger p-1 mb-0"><%= stash('course_info_error') %></div>
diff --git a/templates/ContentGenerator/ProblemSets/set_list_row.html.ep b/templates/ContentGenerator/ProblemSets/set_list_row.html.ep
index af2af34f9b..57f1e90f16 100644
--- a/templates/ContentGenerator/ProblemSets/set_list_row.html.ep
+++ b/templates/ContentGenerator/ProblemSets/set_list_row.html.ep
@@ -1,47 +1,68 @@
 % use WeBWorK::Utils::DateTime qw(after);
-% use WeBWorK::Utils::Sets qw(format_set_name_display);
+% use WeBWorK::Utils::Sets     qw(format_set_name_display);
 %
 % my $display_name = format_set_name_display($set->set_id);
 %
-<li class="list-group-item d-flex align-items-center justify-content-between" data-set-status="<%= $status %>"
+<li
+	class="list-group-item d-flex align-items-center justify-content-between"
+	data-set-status="<%= $status %>"
 	data-set-type="<%= $set->assignment_type =~ /gateway/ ? 'test' : 'default' %>"
-	data-urgency-sort-order="<%= $set->{urgency_sort_order} %>" data-name-sort-order="<%= $set->{name_sort_order} %>">
+	data-urgency-sort-order="<%= $set->{urgency_sort_order} %>"
+	data-name-sort-order="<%= $set->{name_sort_order} %>"
+>
 	<div>
 		% my $icon_title = $set->assignment_type =~ /gateway/ ? maketext('Test/Quiz') : maketext('Regular Assignment');
-		<i class="set-id-tooltip fa-solid <%= $set->assignment_type =~ /gateway/ ? 'fa-list-check' : 'fa-book-open' %>"
-			data-bs-title="<%= $icon_title %>" data-bs-toggle="tooltip" data-bs-placement="right"
-			aria-hidden="true" tabindex="-1">
+		<i
+			class="set-id-tooltip fa-solid <%= $set->assignment_type =~ /gateway/ ? 'fa-list-check' : 'fa-book-open' %>"
+			data-bs-title="<%= $icon_title %>"
+			data-bs-toggle="tooltip"
+			data-bs-placement="right"
+			aria-hidden="true"
+			tabindex="-1"
+		>
 		</i>
 		<span class="visually-hidden"><%= $icon_title %></span>
 	</div>
 	<div class="ms-3 me-auto">
 		<div dir="ltr">
-			<%= link_to $display_name => $c->systemLink(url_for('problem_list', setID => $set->set_id)),
-				class => 'fw-bold'
-			=%>
+			<%= link_to
+				$display_name => $c->systemLink(url_for('problem_list', setID => $set->set_id)),
+				class         => 'fw-bold' =%>
 			% if ($set->description =~ /\S/) {
-				<a class="set-id-tooltip px-1" role="button" tabindex="0" data-bs-placement="right"
-						data-bs-toggle="tooltip" data-bs-title="<%= $set->description =%>"
-						data-fallback-placements="top bottom">
+				<a
+					class="set-id-tooltip px-1"
+					role="button"
+					tabindex="0"
+					data-bs-placement="right"
+					data-bs-toggle="tooltip"
+					data-bs-title="<%= $set->description =%>"
+					data-fallback-placements="top bottom"
+				>
 					<i class="icon fas fa-circle-info" aria-hidden="true"></i>
 					<span class="visually-hidden"><%= maketext('Assignment Description') =%></span>
 				</a>
 			% }
 		</div>
 		<div class="font-sm">
-		% if (ref $status_msg) {
-			<%= $status_msg->{msg} %>
-			% if ($status_msg->{override} && $c->authz->hasPermissions(param('user'), 'override_indicator')) {
-				<a class="set-id-tooltip px-1" role="button" tabindex="0" data-bs-placement="right"
-						data-bs-toggle="tooltip" data-fallback-placements="top bottom"
-						data-bs-title="<%= maketext('This date overrides the assignment date.') =%>">
-					<i class="icon fas fa-calendar-plus" aria-hidden="true"></i>
-					<span class="visually-hidden"><%= maketext('Date override alert') =%></span>
-				</a>
+			% if (ref $status_msg) {
+				<%= $status_msg->{msg} %>
+				% if ($status_msg->{override} && $c->authz->hasPermissions(param('user'), 'override_indicator')) {
+					<a
+						class="set-id-tooltip px-1"
+						role="button"
+						tabindex="0"
+						data-bs-placement="right"
+						data-bs-toggle="tooltip"
+						data-fallback-placements="top bottom"
+						data-bs-title="<%= maketext('This date overrides the assignment date.') =%>"
+					>
+						<i class="icon fas fa-calendar-plus" aria-hidden="true"></i>
+						<span class="visually-hidden"><%= maketext('Date override alert') =%></span>
+					</a>
+				% }
+			% } else {
+				<%= $status_msg %>
 			% }
-		% } else {
-			<%= $status_msg %>
-		% }
 		</div>
 		% if (!$set->visible && $authz->hasPermissions(param('user'), 'view_unopened_sets')) {
 			<div class="font-sm"><em><%= maketext('(This set is hidden from students.)') %></em></div>
@@ -55,7 +76,7 @@
 	% if (
 		% $set->assignment_type !~ /gateway/
 		% && ($authz->hasPermissions(param('user'), 'view_multiple_sets')
-		% || (after($set->open_date) && (!$is_restricted || after($set->due_date))))
+			% || (after($set->open_date) && (!$is_restricted || after($set->due_date))))
 	% )
 	% {
 		% my $hardcopyTitle = maketext('Download [_1]', tag('span', dir => 'ltr', $display_name));
@@ -63,11 +84,16 @@
 			<%= link_to $c->systemLink(
 				url_for('hardcopy', setID => $set->set_id),
 				params => { selected_sets => $set->set_id }
-			),
-			class => 'hardcopy-link', begin =%>
-				<i class="hardcopy-tooltip far fa-arrow-alt-circle-down fa-lg" aria-hidden="true"
-					title="<%= $hardcopyTitle =%>" data-bs-toggle="tooltip"
-					data-bs-placement="left"></i>
+				),
+				class => 'hardcopy-link',
+				begin =%>
+				<i
+					class="hardcopy-tooltip far fa-arrow-alt-circle-down fa-lg"
+					aria-hidden="true"
+					title="<%= $hardcopyTitle =%>"
+					data-bs-toggle="tooltip"
+					data-bs-placement="left"
+				></i>
 				<span class="visually-hidden"><%== $hardcopyTitle %></span>
 			<% end =%>
 		</div>
diff --git a/templates/ContentGenerator/ResetPassword.html.ep b/templates/ContentGenerator/ResetPassword.html.ep
index 6f87200a7f..5c26a15702 100644
--- a/templates/ContentGenerator/ResetPassword.html.ep
+++ b/templates/ContentGenerator/ResetPassword.html.ep
@@ -12,36 +12,51 @@
 			<%= form_for current_route, method => 'POST', begin =%>
 				<%= hidden_field user => $userID =%>
 				<%= hidden_field token => param('token') =%>
-					<p><%= maketext('Please enter a new password.') %></p>
-					<div class="row mb-2">
-						<%= label_for newPassword => maketext("New Password"),
-							class => 'col-form-label col-sm-6' =%>
-						<div class="col-sm-6">
-							<%= password_field 'newPassword', id => 'newPassword', class => 'form-control',
-								dir => 'ltr', autocomplete => 'new-password', required => undef =%>
-						</div>
+				<p><%= maketext('Please enter a new password.') %></p>
+				<div class="row mb-2">
+					<%= label_for
+						newPassword => maketext("New Password"),
+						class       => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= password_field 'newPassword',
+							id           => 'newPassword',
+							class        => 'form-control',
+							dir          => 'ltr',
+							autocomplete => 'new-password',
+							required     => undef =%>
 					</div>
+				</div>
+				<div class="row mb-2">
+					<%= label_for
+						confirmPassword => maketext("Confirm New Password"),
+						class           => 'col-form-label col-sm-6' =%>
+					<div class="col-sm-6">
+						<%= password_field 'confirmPassword',
+							id           => 'confirmPassword',
+							class        => 'form-control',
+							dir          => 'ltr',
+							autocomplete => 'new-password',
+							required     => undef =%>
+					</div>
+				</div>
+				% if ($ce->two_factor_authentication_enabled
+				% && $authz->hasPermissions($userID, 'use_two_factor_auth')) {
 					<div class="row mb-2">
-						<%= label_for confirmPassword => maketext("Confirm New Password"),
-							class => 'col-form-label col-sm-6' =%>
+						<%= label_for
+							otp_code => maketext("One-time code from authenticator app"),
+							class    => 'col-form-label col-sm-6' =%>
 						<div class="col-sm-6">
-							<%= password_field 'confirmPassword', id => 'confirmPassword', class => 'form-control',
-								dir => 'ltr', autocomplete => 'new-password', required => undef =%>
+							<%= text_field
+								otp_code       => '',
+								id             => 'otp_code',
+								class          => 'form-control',
+								autocomplete   => 'off',
+								autocapitalize => 'none',
+								spellcheck     => 'false',
+								required       => undef =%>
 						</div>
 					</div>
-					% if ($ce->two_factor_authentication_enabled
-						% && $authz->hasPermissions($userID, 'use_two_factor_auth')) {
-						<div class="row mb-2">
-							<%= label_for otp_code =>
-									maketext("One-time code from authenticator app"),
-								class => 'col-form-label col-sm-6' =%>
-							<div class="col-sm-6">
-								<%= text_field otp_code => '', id => 'otp_code', class => 'form-control',
-									autocomplete => 'off', autocapitalize => 'none', spellcheck => 'false',
-									required => undef =%>
-							</div>
-						</div>
-					% }
+				% }
 				<%= submit_button maketext('Reset Password'), name => 'reset_password', class => 'btn btn-primary' =%>
 			<% end =%>
 		% }
diff --git a/templates/ContentGenerator/SampleProblemViewer.html.ep b/templates/ContentGenerator/SampleProblemViewer.html.ep
index 38b461ad0b..bde472c4d7 100644
--- a/templates/ContentGenerator/SampleProblemViewer.html.ep
+++ b/templates/ContentGenerator/SampleProblemViewer.html.ep
@@ -2,102 +2,126 @@
 %
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
-%
-<head>
-	<meta charset='UTF-8'>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= title %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-	<%= stylesheet $c->url({
-		type => 'webwork', name => 'htdocs', file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
-	}) =%>
-	<%= javascript $c->url({
-		type => 'webwork', name => 'htdocs', file => 'node_modules/minisearch/dist/umd/index.js'
-	}), defer => undef =%>
-	<script>
-		const webworkConfig = <%== $c->webwork_js_config %>;
-		window.pgDocConfig = {
-			rootURL: '<%= $c->webwork_url %>',
-			htmlSuffixMutation: [/\.pg$/, ''],
-			searchDataURL: '<%= $c->url_for('sample_problem_search_data') %>'
-		};
-	</script>
-	<%= javascript $c->url({
-		type => 'webwork', name => 'htdocs', file => 'js/SampleProblemViewer/documentation-search.js'
-	}), defer => undef =%>
-	<link rel="icon" type="x-image/icon"
-		href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
-</head>
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= title %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= stylesheet $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+		}) =%>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/minisearch/dist/umd/index.js'
+			}),
+			defer => undef =%>
+		<script>
+			const webworkConfig = <%== $c->webwork_js_config %>;
+			window.pgDocConfig = {
+				rootURL: '<%= $c->webwork_url %>',
+				htmlSuffixMutation: [/\.pg$/, ''],
+				searchDataURL: '<%= $c->url_for('sample_problem_search_data') %>'
+			};
+		</script>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'js/SampleProblemViewer/documentation-search.js'
+			}),
+			defer => undef =%>
+		<link
+			rel="icon"
+			type="x-image/icon"
+			href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>"
+		>
+	</head>
 
-<body>
-	<main class="container">
-		<div class="row my-3">
-			<div class="col-lg-6 col-12"><h1><%= title %></h1></div>
-			<div class="col-lg-6 col-12">
-				<div class="row">
-					<div class="col-12 input-group mb-1">
-						<div class="input-group-text">
-							<i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+	<body>
+		<main class="container">
+			<div class="row my-3">
+				<div class="col-lg-6 col-12"><h1><%= title %></h1></div>
+				<div class="col-lg-6 col-12">
+					<div class="row">
+						<div class="col-12 input-group mb-1">
+							<div class="input-group-text">
+								<i class="fa-solid fa-magnifying-glass" aria-hidden="true"></i>
+							</div>
+							<input
+								type="text"
+								class="form-control"
+								id="search-box"
+								aria-label="<%= maketext('Search the documentation') %>"
+								placeholder="<%= maketext('Search the documentation') %>"
+							>
+							<button class="btn btn-outline-secondary" type="button" id="clear-search-button">
+								<%= maketext('Clear') %>
+							</button>
 						</div>
-						<input type="text" class="form-control" id="search-box"
-							aria-label="<%= maketext('Search the documentation') %>"
-							placeholder="<%= maketext('Search the documentation') %>">
-						<button class="btn btn-outline-secondary" type="button" id="clear-search-button">
-							<%= maketext('Clear') %>
-						</button>
 					</div>
-				</div>
-				<div class="row">
-					<div class="col-auto">
-						<div class="form-check">
-							<input class="form-check-input" type="checkbox" value="" id="search-macros" checked>
-							<label class="form-check-label" for="search-macros"><%= maketext('Search macros') %></label>
+					<div class="row">
+						<div class="col-auto">
+							<div class="form-check">
+								<input class="form-check-input" type="checkbox" value="" id="search-macros" checked>
+								<label class="form-check-label" for="search-macros"
+									><%= maketext('Search macros') %></label
+								>
+							</div>
 						</div>
-					</div>
-					<div class="col-auto">
-						<div class="form-check">
-							<input class="form-check-input" type="checkbox" value=""
-								id="search-sample-problems" checked>
-							<label class="form-check-label" for="search-sample-problems">
-								<%= maketext('Search sample problems') %>
-							</label>
+						<div class="col-auto">
+							<div class="form-check">
+								<input
+									class="form-check-input"
+									type="checkbox"
+									value=""
+									id="search-sample-problems"
+									checked
+								>
+								<label class="form-check-label" for="search-sample-problems">
+									<%= maketext('Search sample problems') %>
+								</label>
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
-		</div>
-		<div class="row mb-3">
-			<div class="col-md-12 col-lg-6 mt-3 order-lg-1 order-0">
-				<div id="result-list" class="list-group"></div>
-			</div>
-			<div class="col-md-12 col-lg-6 mt-3 order-lg-0 order-1">
-				<div class="list-group">
-					<%= link_to 'sample_problem_viewer', { filePath => 'categories' },
-						class => 'list-group-item list-group-item-action', begin =%>
-						<span class="h4"><%= maketext('Sample Problems by Category') %></span>
-						<div><%= maketext('A list of sample problems by category.') %></div>
-					% end
-					<%= link_to 'sample_problem_viewer', { filePath => 'subjects' },
-						class => 'list-group-item list-group-item-action', begin =%>
-						<span class="h4"><%= maketext('Sample Problems by Subject Area') %></span>
-						<div><%= maketext('A list of sample problems by subject area.') %></div>
-					% end
-					<%= link_to 'sample_problem_viewer', { filePath => 'techniques' },
-						class => 'list-group-item list-group-item-action', begin =%>
-						<span class="h4"><%= maketext('Problem Techniques') %></span>
-						<div><%= maketext('A list of sample problems by problem technique.') %></div>
-					% end
-					<%= link_to 'sample_problem_viewer', { filePath => 'macros' },
-						class => 'list-group-item list-group-item-action', begin =%>
-						<span class="h4"><%= maketext('Sample Problems by Macro') %></span>
-						<div>
-							<%= maketext('For many macros, this lists all sample problems that use the macro.') %>
-						</div>
-					% end
+			<div class="row mb-3">
+				<div class="col-md-12 col-lg-6 mt-3 order-lg-1 order-0">
+					<div id="result-list" class="list-group"></div>
+				</div>
+				<div class="col-md-12 col-lg-6 mt-3 order-lg-0 order-1">
+					<div class="list-group">
+						<%= link_to 'sample_problem_viewer', { filePath => 'categories' },
+							class => 'list-group-item list-group-item-action',
+							begin =%>
+							<span class="h4"><%= maketext('Sample Problems by Category') %></span>
+							<div><%= maketext('A list of sample problems by category.') %></div>
+						% end
+						<%= link_to 'sample_problem_viewer', { filePath => 'subjects' },
+							class => 'list-group-item list-group-item-action',
+							begin =%>
+							<span class="h4"><%= maketext('Sample Problems by Subject Area') %></span>
+							<div><%= maketext('A list of sample problems by subject area.') %></div>
+						% end
+						<%= link_to 'sample_problem_viewer', { filePath => 'techniques' },
+							class => 'list-group-item list-group-item-action',
+							begin =%>
+							<span class="h4"><%= maketext('Problem Techniques') %></span>
+							<div><%= maketext('A list of sample problems by problem technique.') %></div>
+						% end
+						<%= link_to 'sample_problem_viewer', { filePath => 'macros' },
+							class => 'list-group-item list-group-item-action',
+							begin =%>
+							<span class="h4"><%= maketext('Sample Problems by Macro') %></span>
+							<div>
+								<%= maketext('For many macros, this lists all sample problems that use the macro.') %>
+							</div>
+						% end
+					</div>
 				</div>
 			</div>
-		</div>
-	</main>
-</body>
-%
+		</main>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep b/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep
index 72bcb7c6cf..8e1b643ded 100644
--- a/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep
+++ b/templates/ContentGenerator/SampleProblemViewer/sample_problem.html.ep
@@ -2,111 +2,129 @@
 %
 <!DOCTYPE html>
 <html lang="en">
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= title %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme',  file => 'bootstrap.css' }) =%>
-	<%= stylesheet $c->url({
-		type => 'webwork', name => 'htdocs',
-		file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
-	}) =%>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs',
-		file => 'js/SampleProblemViewer/sample-problem.css' }) =%>
-	<%= javascript $c->url({ type => 'webwork', name => 'htdocs',
-		file => 'node_modules/@openwebwork/pg-codemirror-editor/dist/pg-codemirror-editor.js' }), defer => undef =%>
-	<%= javascript $c->url({ type => 'webwork', name => 'htdocs',
-		file => 'js/SampleProblemViewer/sample-problem.js' }), defer => undef =%>
-</head>
-%
-% # Default explanations
-% my $default = {
-	% preamble  => maketext('These standard macros need to be loaded.'),
-	% setup     => maketext('This perl code sets up the problem.'),
-	% statement => maketext('This is the problem statement in PGML.'),
-	% answer    => maketext('This is used for answer checking.'),
-	% solution  => maketext('A solution should be provided here.')
-% };
-%
-<body>
-	<main class="container-fluid p-3">
-		<div class="row">
-			<div class="col">
-				<h1><%= title %></h1>
-				<p><%= $description %></p>
-			</div>
-			<div class="col text-end">
-				<%= link_to maketext('Return to PG Sample Problem home') => 'sample_problem_index' =%>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col">
-				<h2><%= maketext('Complete Code') %></h2>
-				<p>
-					<%== maketext('Download file: [_1]',
-						link_to($filename => 'sample_problem_viewer', { filePath => "$filePath.pg" })) =%>
-				</p>
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= title %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= stylesheet $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+		}) =%>
+		<%= stylesheet $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'js/SampleProblemViewer/sample-problem.css'
+		}) =%>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/@openwebwork/pg-codemirror-editor/dist/pg-codemirror-editor.js'
+			}),
+			defer => undef =%>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'js/SampleProblemViewer/sample-problem.js'
+			}),
+			defer => undef =%>
+	</head>
+	%
+	% # Default explanations
+	% my $default = {
+		% preamble  => maketext('These standard macros need to be loaded.'),
+		% setup     => maketext('This perl code sets up the problem.'),
+		% statement => maketext('This is the problem statement in PGML.'),
+		% answer    => maketext('This is used for answer checking.'),
+		% solution  => maketext('A solution should be provided here.')
+	% };
+	%
+	<body>
+		<main class="container-fluid p-3">
+			<div class="row">
+				<div class="col">
+					<h1><%= title %></h1>
+					<p><%= $description %></p>
+				</div>
+				<div class="col text-end">
+					<%= link_to maketext('Return to PG Sample Problem home') => 'sample_problem_index' =%>
+				</div>
 			</div>
-			% if (scalar(@{ $metadata->{$filename}{macros} }) > 0 ) {
+			<div class="row">
 				<div class="col">
-					<h2><%= maketext('POD for Macro Files') %></h2>
-					<ul>
-						% for my $macro (@{ $metadata->{$filename}{macros} }) {
-							% if ($macro_locations->{$macro}) {
+					<h2><%= maketext('Complete Code') %></h2>
+					<p>
+						<%== maketext('Download file: [_1]',
+							link_to($filename => 'sample_problem_viewer', { filePath => "$filePath.pg" })) =%>
+					</p>
+				</div>
+				% if (scalar(@{ $metadata->{$filename}{macros} }) > 0 ) {
+					<div class="col">
+						<h2><%= maketext('POD for Macro Files') %></h2>
+						<ul>
+							% for my $macro (@{ $metadata->{$filename}{macros} }) {
+								% if ($macro_locations->{$macro}) {
+									<li>
+										<%= link_to
+											$macro => 'pod_viewer',
+											{ filePath => 'macros/'
+												. ($macro_locations->{$macro} =~ s/\.html/.pl/r) } =%>
+									</li>
+								% } else {
+									<li class="text-danger"><%= $macro %></li>
+								% }
+							% }
+						</ul>
+					</div>
+				%}
+				% if ($metadata->{$filename}{related} && scalar(@{ $metadata->{$filename}{related} }) > 0) {
+					<div class="col">
+						<h2><%= maketext('See Also') %></h2>
+						<ul>
+							% for (@{$metadata->{$filename}{related}}) {
 								<li>
-									<%= link_to $macro => 'pod_viewer', {
-										filePath => 'macros/' . ($macro_locations->{$macro} =~ s/\.html/.pl/r)
-									} =%>
+									<%= link_to $metadata->{$_}{name} => 'sample_problem_viewer',
+										{ filePath => "$metadata->{$_}{dir}/" . ($_ =~ s/.pg$//r) } =%>
 								</li>
-							% } else {
-								<li class="text-danger"><%= $macro %></li>
 							% }
-						% }
-					</ul>
-				</div>
-				%}
-			% if ($metadata->{$filename}{related} && scalar(@{ $metadata->{$filename}{related} }) > 0) {
-				<div class="col">
-					<h2><%= maketext('See Also') %></h2>
-					<ul>
-						% for (@{$metadata->{$filename}{related}}) {
-							<li>
-								<%= link_to $metadata->{$_}{name} => 'sample_problem_viewer',
-									{ filePath => "$metadata->{$_}{dir}/" . ($_ =~ s/.pg$//r) } =%>
-							</li>
-						% }
-					</ul>
-				</div>
-			% }
-		</div>
-		<div class="row">
-			<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('PG problem file') %></h2></div>
-			<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('Explanation') %></h2></div>
-		</div>
-		% for (@$blocks) {
+						</ul>
+					</div>
+				% }
+			</div>
 			<div class="row">
-				<div class="col-sm-12 col-md-6 order-md-first order-last p-0 position-relative overflow-hidden">
-					<button class="clipboard-btn btn btn-sm btn-secondary position-absolute top-0 end-0 me-1 mt-1"
-						type="button" data-code="<%= $_->{code} %>" aria-label="<%= maketext('copy to clipboard') %>">
-						<i class="fa-regular fa-clipboard fa-xl"></i>
-					</button>
-					<pre class="PGCodeMirror m-0 h-100 p-3 border border-secondary overflow-scroll"><% =%>\
+				<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('PG problem file') %></h2></div>
+				<div class="col text-center"><h2 class="fw-bold fs-3"><%= maketext('Explanation') %></h2></div>
+			</div>
+			% for (@$blocks) {
+				<div class="row">
+					<div class="col-sm-12 col-md-6 order-md-first order-last p-0 position-relative overflow-hidden">
+						<button
+							class="clipboard-btn btn btn-sm btn-secondary position-absolute top-0 end-0 me-1 mt-1"
+							type="button"
+							data-code="<%= $_->{code} %>"
+							aria-label="<%= maketext('copy to clipboard') %>"
+						>
+							<i class="fa-regular fa-clipboard fa-xl"></i>
+						</button>
+						<pre class="PGCodeMirror m-0 h-100 p-3 border border-secondary overflow-scroll"><% =%>\
 						<%= $_->{code} =%>\
 					</pre><% =%>\
+					</div>
+					<div
+						class="explanation <%=
+							$_->{section}
+						%> col-sm-12 col-md-6 order-md-last p-3 order-first border border-dark"
+					>
+						<p><b><%= ucfirst($_->{section}) %></b></p>
+						% if ($_->{doc}) {
+							<%== $_->{doc} %>
+						%} else {
+							<%= $default->{ $_->{section} } %>
+						%}
+					</div>
 				</div>
-				<div class="explanation <%= $_->{section}
-					%> col-sm-12 col-md-6 order-md-last p-3 order-first border border-dark">
-					<p><b><%= ucfirst($_->{section}) %></b></p>
-					% if ($_->{doc}) {
-						<%== $_->{doc} %>
-					%} else {
-						<%= $default->{$_->{section}} %>
-					%}
-				</div>
-			</div>
-		% }
-	</main>
-</body>
-%
+			% }
+		</main>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep b/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep
index a413e76165..d76c585527 100644
--- a/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep
+++ b/templates/ContentGenerator/SampleProblemViewer/viewer.html.ep
@@ -1,143 +1,193 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= maketext('PG Sample Problems') %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-	<%= stylesheet $c->url({
-		type => 'webwork',
-		name => 'htdocs',
-		file => 'js/SampleProblemViewer/viewer.css'
-	}) =%>
-	<%= javascript $c->url({
-			type => 'webwork', name => 'htdocs',
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= maketext('PG Sample Problems') %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= stylesheet $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'js/SampleProblemViewer/viewer.css'
+		}) =%>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
 			file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
-		}), defer => undef =%>
-	<%= javascript $c->url({
+			}),
+			defer => undef =%>
+		<%= javascript $c->url({
 			type => 'webwork',
 			name => 'htdocs',
 			file => 'js/SampleProblemViewer/viewer.js'
-		}), defer => undef =%>
-</head>
+			}),
+			defer => undef =%>
+	</head>
 
-<body>
-	<nav class="navbar fixed-top bg-primary border-bottom border-dark" data-bs-theme="dark">
-		<div class="container-fluid">
-			<ul class="nav nav-pills">
-				<li class="nav-item dropdown">
-					<a class="nav-link fs-3 dropdown-toggle active" href="#" role="button"
-						data-bs-toggle="dropdown" aria-expanded="false">
-						<%= $filePath eq 'categories' ? maketext('Sample Problems')
-							: $filePath eq 'techniques' ? maketext('Problem Techniques')
-							: $filePath eq 'subjects' ? maketext('Subject Area Problems')
-							: maketext('Problems by Macro') =%>
-					</a>
-					<ul class="dropdown-menu">
-						<li>
-							<%= link_to maketext('Sample Problems') => 'sample_problem_viewer',
-								{ filePath => 'categories' },
-								class => 'dropdown-item' . ($filePath eq 'categories' ? ' active' : ''),
-								$filePath eq 'categories' ? ('aria-current' => 'page') : () =%>
-						</li>
-						<li>
-							<%= link_to maketext('Problem Techniques') => 'sample_problem_viewer',
-								{ filePath => 'techniques' },
-								class => 'dropdown-item' . ($filePath eq 'techniques' ? ' active' : ''),
-								$filePath eq 'techniques' ? ('aria-current' => 'page') : () =%>
-						</li>
-						<li>
-							<%= link_to maketext('Subject Area Problems') => 'sample_problem_viewer',
-								{ filePath => 'subjects' },
-								class => 'dropdown-item' . ($filePath eq 'subjects' ? ' active' : ''),
-								$filePath eq 'subjects' ? ('aria-current' => 'page') : () =%>
-						</li>
-						<li>
-							<%= link_to maketext('Problems by Macro') => 'sample_problem_viewer',
-								{ filePath => 'macros' },
-								class => 'dropdown-item' . ($filePath eq 'macros' ? ' active' : ''),
-								$filePath eq 'macros' ? ('aria-current' => 'page') : () =%>
-						</li>
-					</ul>
-				</li>
-			</ul>
-			<button class="navbar-toggler d-md-none" type="button" data-bs-toggle="offcanvas"
-				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="<%= maketext('Toggle Sidebar') %>">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-		</div>
-	</nav>
-	<aside class="offcanvas-md offcanvas-start overflow-auto position-fixed border-end border-dark flex-shrink-0"
-		tabindex="-1" id="sidebar" aria-labelledby="sidebar-label">
-		<div class="offcanvas-header">
-			<h2 class="offcanvas-title fs-3" id="sidebar-label"><%= $label =%></h2>
-			<button type="button" class="btn-close" data-bs-dismiss="offcanvas"
-				data-bs-target="#sidebar" aria-label="Close">
-			</button>
-		</div>
-		<h2 class="fs-3 d-none d-md-block px-3 pt-3"><%= $label =%></h2>
-		<div class="offcanvas-body px-md-3 pb-md-3 w-100">
-			<nav class="list-group w-100" role="tablist" id="sidebar-list">
+	<body>
+		<nav class="navbar fixed-top bg-primary border-bottom border-dark" data-bs-theme="dark">
+			<div class="container-fluid">
+				<ul class="nav nav-pills">
+					<li class="nav-item dropdown">
+						<a
+							class="nav-link fs-3 dropdown-toggle active"
+							href="#"
+							role="button"
+							data-bs-toggle="dropdown"
+							aria-expanded="false"
+						>
+							<%= $filePath eq 'categories'       ? maketext('Sample Problems')
+								: $filePath eq 'techniques' ? maketext('Problem Techniques')
+								: $filePath eq 'subjects'   ? maketext('Subject Area Problems')
+								:                             maketext('Problems by Macro') =%>
+						</a>
+						<ul class="dropdown-menu">
+							<li>
+								<%= link_to maketext('Sample Problems') => 'sample_problem_viewer',
+									{ filePath => 'categories' },
+									class => 'dropdown-item' . ($filePath eq 'categories' ? ' active' : ''),
+									$filePath eq 'categories' ? ('aria-current' => 'page') : () =%>
+							</li>
+							<li>
+								<%= link_to maketext('Problem Techniques') => 'sample_problem_viewer',
+									{ filePath => 'techniques' },
+									class => 'dropdown-item' . ($filePath eq 'techniques' ? ' active' : ''),
+									$filePath eq 'techniques' ? ('aria-current' => 'page') : () =%>
+							</li>
+							<li>
+								<%= link_to maketext('Subject Area Problems') => 'sample_problem_viewer',
+									{ filePath => 'subjects' },
+									class => 'dropdown-item' . ($filePath eq 'subjects' ? ' active' : ''),
+									$filePath eq 'subjects' ? ('aria-current' => 'page') : () =%>
+							</li>
+							<li>
+								<%= link_to maketext('Problems by Macro') => 'sample_problem_viewer',
+									{ filePath => 'macros' },
+									class => 'dropdown-item' . ($filePath eq 'macros' ? ' active' : ''),
+									$filePath eq 'macros' ? ('aria-current' => 'page') : () =%>
+							</li>
+						</ul>
+					</li>
+				</ul>
+				<button
+					class="navbar-toggler d-md-none"
+					type="button"
+					data-bs-toggle="offcanvas"
+					data-bs-target="#sidebar"
+					aria-controls="sidebar"
+					aria-label="<%= maketext('Toggle Sidebar') %>"
+				>
+					<span class="navbar-toggler-icon"></span>
+				</button>
+			</div>
+		</nav>
+		<aside
+			class="offcanvas-md offcanvas-start overflow-auto position-fixed border-end border-dark flex-shrink-0"
+			tabindex="-1"
+			id="sidebar"
+			aria-labelledby="sidebar-label"
+		>
+			<div class="offcanvas-header">
+				<h2 class="offcanvas-title fs-3" id="sidebar-label"><%= $label =%></h2>
+				<button
+					type="button"
+					class="btn-close"
+					data-bs-dismiss="offcanvas"
+					data-bs-target="#sidebar"
+					aria-label="Close"
+				></button>
+			</div>
+			<h2 class="fs-3 d-none d-md-block px-3 pt-3"><%= $label =%></h2>
+			<div class="offcanvas-body px-md-3 pb-md-3 w-100">
+				<nav class="list-group w-100" role="tablist" id="sidebar-list">
+					% if ($filePath eq 'techniques') {
+						% for (['A' .. 'C'], ['D' .. 'F'], ['G' .. 'N'], ['O' .. 'Z']) {
+							<a
+								class="list-group-item list-group-item-action"
+								id="<%= $_->[0] %>-tab"
+								href="#<%= $_->[0] %>"
+								data-bs-toggle="list"
+								role="tab"
+								aria-controls="<%= $_->[0] %>"
+							>
+								<%= $_->[0] %> .. <%= $_->[-1] %>
+							</a>
+						% }
+					% } else {
+						% for (sort(keys %$list)) {
+							% my $id = ($_ =~ s/\s/_/gr) =~ s/\./_/gr;
+							<a
+								class="list-group-item list-group-item-action"
+								id="<%= $id %>-tab"
+								href="#<%= $id %>"
+								data-bs-toggle="list"
+								role="tab"
+								aria-controls="<%= $id %>"
+							>
+								<%= $_ %>
+							</a>
+						% }
+					% }
+				</nav>
+			</div>
+		</aside>
+		<main class="main-content">
+			<div class="tab-content p-3">
 				% if ($filePath eq 'techniques') {
 					% for (['A' .. 'C'], ['D' .. 'F'], ['G' .. 'N'], ['O' .. 'Z']) {
-						<a class="list-group-item list-group-item-action" id="<%= $_->[0] %>-tab" href="#<%= $_->[0] %>"
-							data-bs-toggle="list" role="tab" aria-controls="<%= $_->[0] %>">
-							<%= $_->[0] %> .. <%= $_->[-1] %>
-						</a>
+						<div
+							class="tab-pane fade"
+							id="<%= $_->[0] %>"
+							role="tabpanel"
+							aria-labelledby="<%= $_->[0] %>-tab"
+							tabindex="0"
+						>
+							<h1 class="fs-3">
+								<%= maketext('Sample Problems for Techniques: [_1]', "$_->[0] .. $_->[-1]") =%>
+							</h1>
+							<ul>
+								% my $b = join('', @$_);
+								% for (sort grep { substr($_, 0, 1 ) =~ qr/^[$b]/i } keys(%$list)) {
+									<li>
+										<%= link_to
+											$_ => 'sample_problem_viewer',
+											{ filePath => $list->{$_} } %>
+									</li>
+								% }
+							</ul>
+						</div>
 					% }
 				% } else {
+					% my %topics = (
+						% categories => maketext('Category'),
+						% subjects   => maketext('Subject'),
+						% macros     => maketext('Macro')
+					% );
 					% for (sort(keys %$list)) {
 						% my $id = ($_ =~ s/\s/_/gr) =~ s/\./_/gr;
-						<a class="list-group-item list-group-item-action" id="<%= $id %>-tab" href="#<%= $id %>"
-							data-bs-toggle="list" role="tab" aria-controls="<%= $id %>">
-							<%= $_ %>
-						</a>
+						<div
+							class="tab-pane fade"
+							id="<%= $id %>"
+							role="tabpanel"
+							aria-labelledby="<%= $id %>-tab"
+							tabindex="0"
+						>
+							<h1 class="fs-3">
+								<%= maketext('Sample Problems for [_1]: [_2]', $topics{$filePath}, $_) %>
+							</h1>
+							<ul>
+								% for my $link (sort (keys %{ $list->{$_} })) {
+									<li>
+										<%= link_to
+											$link => 'sample_problem_viewer',
+											{ filePath => $list->{$_}{$link} } %>
+									</li>
+								% }
+							</ul>
+						</div>
 					% }
 				% }
-			</nav>
-		</div>
-	</aside>
-	<main class="main-content">
-		<div class="tab-content p-3">
-			% if ($filePath eq 'techniques') {
-				% for (['A' .. 'C'], ['D' .. 'F'], ['G' .. 'N'], ['O' .. 'Z']) {
-					<div class="tab-pane fade" id="<%= $_->[0] %>" role="tabpanel"
-						aria-labelledby="<%= $_->[0] %>-tab" tabindex="0">
-						<h1 class="fs-3">
-							<%= maketext('Sample Problems for Techniques: [_1]', "$_->[0] .. $_->[-1]") =%>
-						</h1>
-						<ul>
-							% my $b = join('', @$_);
-							% for (sort grep { substr($_, 0, 1 ) =~ qr/^[$b]/i } keys(%$list)) {
-								<li><%= link_to $_ => 'sample_problem_viewer', { filePath => $list->{$_} } %></li>
-							% }
-						</ul>
-					</div>
-				% }
-			% } else {
-				% my %topics = (
-					% categories => maketext('Category'),
-					% subjects   => maketext('Subject'),
-					% macros     => maketext('Macro')
-				% );
-				% for (sort(keys %$list)) {
-					% my $id = ($_ =~ s/\s/_/gr) =~ s/\./_/gr;
-					<div class="tab-pane fade" id="<%= $id %>" role="tabpanel" aria-labelledby="<%= $id %>-tab"
-						tabindex="0">
-						<h1 class="fs-3"><%= maketext('Sample Problems for [_1]: [_2]', $topics{$filePath}, $_) %></h1>
-						<ul>
-							% for my $link (sort (keys %{ $list->{$_} })) {
-								<li>
-									<%= link_to $link => 'sample_problem_viewer', { filePath => $list->{$_}{$link} } %>
-								</li>
-							% }
-						</ul>
-					</div>
-				% }
-			% }
-		</div>
-	</main>
-</body>
-
+			</div>
+		</main>
+	</body>
 </html>
diff --git a/templates/ContentGenerator/ShowMeAnother/messages.html.ep b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
index 531d397f93..3a938769c6 100644
--- a/templates/ContentGenerator/ShowMeAnother/messages.html.ep
+++ b/templates/ContentGenerator/ShowMeAnother/messages.html.ep
@@ -6,7 +6,7 @@
 %
 % if ($c->{pg}{flags}{hintExists}
 	% && $authz->hasPermissions($c->{userID}, 'always_show_hint')
-	% && !$c->{showMeAnother}{options}{showHints}) {
+% && !$c->{showMeAnother}{options}{showHints}) {
 	% my $showHintsAfter =
 		% $c->{set}->hide_hint                 ? -1
 		% : $c->{problem}->showHintsAfter > -2 ? $c->{problem}->showHintsAfter
@@ -14,36 +14,33 @@
 	<p>
 		<b><%= maketext('Note') %>:</b>
 		<i>
-			<%= maketext(
-				$showHintsAfter == -1
+			<%= maketext($showHintsAfter == -1
 				? 'The hint shown is an instructor preview and will not be shown to students.'
 				: 'The hint shown is an instructor preview and will be shown to students after '
-					. "$showHintsAfter attempts on the original problem."
-			) =%>
+					. "$showHintsAfter attempts on the original problem.") =%>
 		</i>
 	</p>
 % }
 %
 % if ($c->{pg}{flags}{solutionExists}
 	% && $authz->hasPermissions($c->{userID}, 'always_show_solution')
-	% && !$c->{showMeAnother}{options}{showSolutions}) {
+% && !$c->{showMeAnother}{options}{showSolutions}) {
 	<p>
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The solution shown is an instructor preview and '
-				. 'will only be shown to students after the answer date.'
-			) =%>
+					. 'will only be shown to students after the answer date.') =%>
 		</i>
 	</p>
 % }
 %
 % if ($authz->hasPermissions($c->{userID}, 'show_correct_answers_before_answer_date')
-	% && !$c->{showMeAnother}{options}{showCorrect}) {
+% && !$c->{showMeAnother}{options}{showCorrect}) {
 	<p>
 		<b><%= maketext('Note') %>:</b>
 		<i>
 			<%= maketext('The correct answers shown in feedback are instructor previews and '
-				. 'will only be shown to students after the answer date.') =%>
+					. 'will only be shown to students after the answer date.') =%>
 		</i>
 	</p>
 % }
diff --git a/templates/ContentGenerator/TwoFactorAuthentication.html.ep b/templates/ContentGenerator/TwoFactorAuthentication.html.ep
index 3552756f77..84dfbd9c1a 100644
--- a/templates/ContentGenerator/TwoFactorAuthentication.html.ep
+++ b/templates/ContentGenerator/TwoFactorAuthentication.html.ep
@@ -3,9 +3,9 @@
 % if ($otp_link) {
 	<p>
 		<%= maketext('To set up one-time password generation, scan the QR code below with an authenticator app '
-			. '(such as Google Authenticator, Microsoft Authenticator, Twilio Authy, etc.) installed on a mobile '
-			. 'device. Alternatively, after installing an authenticator app on a mobile device, open this page on '
-			. 'that device, and click on the QR code below.') =%>
+				. '(such as Google Authenticator, Microsoft Authenticator, Twilio Authy, etc.) installed on a mobile '
+				. 'device. Alternatively, after installing an authenticator app on a mobile device, open this page on '
+				. 'that device, and click on the QR code below.') =%>
 	</p>
 	<div class="mb-3 d-flex align-items-center">
 		<%= link_to $otp_link, class => 'mx-auto', begin =%>
@@ -19,13 +19,13 @@
 % } elsif ($authen->session->{otp_setup_email_sent}) {
 	<p>
 		<%= maketext('You have been sent an email with instructions on how to set up an authenticator '
-			. 'app to generate one-time passwords. Follow the instructions in that email, and then enter the '
-			. 'security code shown below.') =%>
+				. 'app to generate one-time passwords. Follow the instructions in that email, and then enter the '
+				. 'security code shown below.') =%>
 	</p>
 	<p>
 		<%= maketext('Note that the QR code and link in that email are only valid as long as this '
-			. 'page is open. If you click "Cancel" below or close this page, then you will need to return to this '
-			. 'page, to have another email sent with an updated QR code and link.') =%>
+				. 'page is open. If you click "Cancel" below or close this page, then you will need to return to this '
+				. 'page, to have another email sent with an updated QR code and link.') =%>
 	</p>
 % } else {
 	<p><%== maketext('Please enter the one-time security code generated by the authenticator app.') %></p>
@@ -36,8 +36,14 @@
 	%
 	<div class="col-xl-9 col-lg-10 col-md-11 my-3">
 		<div class="form-floating mb-2">
-			<%= text_field otp_code => '', id => 'otp_code', class => 'form-control', placeholder => '',
-				autocomplete => 'off', autocapitalize => 'none', spellcheck => 'false' =%>
+			<%= text_field
+				otp_code       => '',
+				id             => 'otp_code',
+				class          => 'form-control',
+				placeholder    => '',
+				autocomplete   => 'off',
+				autocapitalize => 'none',
+				spellcheck     => 'false' =%>
 			<%= label_for otp_code => maketext('One-Time Code') =%>
 		</div>
 		<div class="form-check mb-2">
@@ -46,15 +52,15 @@
 		</div>
 		<div class="alert alert-warning mb-2">
 			<%= maketext('If you check the box above, then two factor verification will be skipped for a limited '
-				. 'time when signing in with this browser. This feature is not safe for public workstations, '
-				. 'untrusted machines, and machines over which you do not have direct control.') =%>
+					. 'time when signing in with this browser. This feature is not safe for public workstations, '
+					. 'untrusted machines, and machines over which you do not have direct control.') =%>
 		</div>
 		% if ($authen_error) {
 			<div class="alert alert-danger" tabindex="0"><%= $authen_error =%></div>
 		% }
 		<div class="submit-buttons-container">
-			<%= submit_button(maketext('Continue'), name => 'verify_otp',              class => 'btn btn-primary') =%>
-			<%= submit_button(maketext('Cancel'),   name => 'cancel_otp_verification', class => 'btn btn-primary') =%>
+			<%= submit_button(maketext('Continue'), name => 'verify_otp', class => 'btn btn-primary') =%>
+			<%= submit_button(maketext('Cancel'), name => 'cancel_otp_verification', class => 'btn btn-primary') =%>
 		</div>
 	</div>
 <% end =%>
diff --git a/templates/HTML/CodeMirrorEditor/js.html.ep b/templates/HTML/CodeMirrorEditor/js.html.ep
index 3d6edad16b..19b1b9bc1f 100644
--- a/templates/HTML/CodeMirrorEditor/js.html.ep
+++ b/templates/HTML/CodeMirrorEditor/js.html.ep
@@ -7,10 +7,7 @@
 
 % if ($ce->{options}{PGCodeMirror}) {
 	% content_for js => begin
-		<%= javascript getAssetURL(
-				$ce,
-				'node_modules/@openwebwork/pg-codemirror-editor/dist/pg-codemirror-editor.js'
-			),
+		<%= javascript getAssetURL($ce, 'node_modules/@openwebwork/pg-codemirror-editor/dist/pg-codemirror-editor.js'),
 			defer => undef =%>
 		<%= javascript getAssetURL($ce, 'js/PGCodeMirror/pgeditor.js'), defer => undef =%>
 	% end
diff --git a/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep b/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep
index 9434446117..0515728ec2 100644
--- a/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep
+++ b/templates/HTML/ScrollingRecordList/scrollingRecordList.html.ep
@@ -1,44 +1,60 @@
 <div class="card p-2">
 	<div class="row mb-2">
-		<%= label_for "$name!sort" => maketext('Sort By:'),
-			class => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
+		<%= label_for
+			"$name!sort" => maketext('Sort By:'),
+			class        => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
 		<div class="col-10 col-lg-10 col-md-12">
 			<%= select_field "$name!sort" => $sorts, id => "$name!sort", class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for "$name!format" => maketext('Format:'),
-			class => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
+		<%= label_for
+			"$name!format" => maketext('Format:'),
+			class          => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
 		<div class="col-10 col-lg-10 col-md-12">
 			<%= select_field "$name!format" => $formats, id => "$name!format", class => 'form-select form-select-sm' =%>
 		</div>
 	</div>
 	<div class="row mb-2">
-		<%= label_for "$name!filter" => maketext('Filter(s):'),
-			class => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
+		<%= label_for
+			"$name!filter" => maketext('Filter(s):'),
+			class          => 'col-form-label col-form-label-sm col-2 col-lg-2 col-md-12 pe-1 text-nowrap' =%>
 		<div class="col-10 col-lg-10 col-md-12">
-			<%= select_field "$name!filter" => $filters, id => "$name!filter", class => 'form-select form-select-sm',
-				multiple => undef, size => 5 =%>
+			<%= select_field
+				"$name!filter" => $filters,
+				id             => "$name!filter",
+				class          => 'form-select form-select-sm',
+				multiple       => undef,
+				size           => 5 =%>
 		</div>
 	</div>
 	<div class="row mb-2">
 		<div class="offset-lg-2 col-10 col-lg-10 col-md-12">
 			<div class="form-check form-check-inline">
-				<%= radio_button "$name!filter_combine" => 1, id => "$name!intersect_check", checked => undef,
-					class => 'form-check-input' =%>
+				<%= radio_button
+					"$name!filter_combine" => 1,
+					id                     => "$name!intersect_check",
+					checked                => undef,
+					class                  => 'form-check-input' =%>
 				<%= label_for "$name!intersect_check" => maketext('Intersect'), class => 'form-check-label font-sm' =%>
 			</div>
 			<div class="form-check form-check-inline">
-				<%= radio_button "$name!filter_combine" => 0, id => "$name!union_check",
-					class => 'form-check-input' =%>
+				<%= radio_button
+					"$name!filter_combine" => 0,
+					id                     => "$name!union_check",
+					class                  => 'form-check-input' =%>
 				<%= label_for "$name!union_check" => maketext('Union'), class => 'form-check-label font-sm' =%>
 			</div>
 		</div>
 	</div>
 	<div>
 		<%= submit_button $options->{refresh_button_name} // maketext('Refresh List'),
-			name => "$name!refresh", class => 'btn btn-secondary btn-sm mb-2' =%>
+			name  => "$name!refresh",
+			class => 'btn btn-secondary btn-sm mb-2' =%>
 	</div>
-	<%= select_field $name => $formattedRecords, id => $name, class => 'form-select form-select-sm',
+	<%= select_field
+		$name => $formattedRecords,
+		id    => $name,
+		class => 'form-select form-select-sm',
 		%{ $options->{attrs} // {} } =%>
 </div>
diff --git a/templates/HTML/SingleProblemGrader/grader.html.ep b/templates/HTML/SingleProblemGrader/grader.html.ep
index 8405eab134..074ef7ce1e 100644
--- a/templates/HTML/SingleProblemGrader/grader.html.ep
+++ b/templates/HTML/SingleProblemGrader/grader.html.ep
@@ -7,8 +7,11 @@
 	% end
 % }
 %
-<div class="problem-grader d-none" id="problem-grader-<%= $grader->{problem_id} %>"
-	data-grader-title="<%= maketext('Problem Grader') %>">
+<div
+	class="problem-grader d-none"
+	id="problem-grader-<%= $grader->{problem_id} %>"
+	data-grader-title="<%= maketext('Problem Grader') %>"
+>
 	<div class="problem-grader-table">
 		% my $currentScore    = 0;
 		% my $rawCurrentScore = 0;
@@ -37,12 +40,12 @@
 						<%= maketext('Answer [_1] Score (%):', $part + 1) =%>
 						<%= link_to '#',
 							class => 'help-popup',
-							data => {
+							data  => {
 								bs_content => maketext(
 									'The initial value is the answer sub score for the answer '
-										. 'that is currently shown.  If this is modified, it will be used to compute '
-										. 'the total problem score below.  This score is not saved, and will reset to '
-										. 'the score for the shown answer if the page is reloaded.'
+									. 'that is currently shown.  If this is modified, it will be used to compute '
+									. 'the total problem score below.  This score is not saved, and will reset to '
+									. 'the score for the shown answer if the page is reloaded.'
 								),
 								bs_placement => 'top',
 								bs_toggle    => 'popover'
@@ -54,39 +57,41 @@
 					<% end =%>
 					<div class="col-sm">
 						% param('answer-part-score', $scores[$part]);
-						<%= number_field 'answer-part-score' => '',
-							class => 'answer-part-score form-control form-control-sm d-inline',
-							id    =>
-								"score_problem$grader->{problem_id}_$grader->{pg}{flags}{ANSWER_ENTRY_ORDER}[$part]",
-							data  => {
+						<%= number_field
+							'answer-part-score' => '',
+							class               => 'answer-part-score form-control form-control-sm d-inline',
+							id                  =>
+							"score_problem$grader->{problem_id}_$grader->{pg}{flags}{ANSWER_ENTRY_ORDER}[$part]",
+							data => {
 								problem_id    => $grader->{problem_id},
-								answer_labels =>
-									'["' . join('","', @{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} }) . '"]',
-								weight        => $weights[$part]
+								answer_labels => '["'
+								. join('","', @{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} }) . '"]',
+								weight => $weights[$part]
 							},
 							min          => 0,
 							max          => 100,
 							autocomplete => 'off' =%>
-							&nbsp;
-							<%== maketext('<b>Weight:</b> [_1]%', wwRound(2, $weights[$part] * 100)) =%>
+						&nbsp;
+						<%== maketext('<b>Weight:</b> [_1]%', wwRound(2, $weights[$part] * 100)) =%>
 					</div>
 				</div>
 			% }
 			% $currentScore = wwRound(0, $rawCurrentScore);
 		% } elsif (@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} }) {
 			% $rawCurrentScore = $grader->{pg}{answers}{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER}[0] }{score} * 100;
-			% $currentScore = wwRound(0, $rawCurrentScore);
-			<%= hidden_field 'answer-part-score' => $currentScore, class => 'answer-part-score',
-				data => { problem_id => $grader->{problem_id}, weight => 1 } =%>
+			% $currentScore    = wwRound(0, $rawCurrentScore);
+			<%= hidden_field
+				'answer-part-score' => $currentScore,
+				class               => 'answer-part-score',
+				data                => { problem_id => $grader->{problem_id}, weight => 1 } =%>
 		% }
 		%
 		% # Total point value. Show only if configured to.
 		% unless ($ce->{problemGraderScore} eq 'Percent') {
-			% my $stepSize       = points_stepsize($grader->{problem_value});
+			% my $stepSize = points_stepsize($grader->{problem_value});
 			% my $recordedPoints =
 				% round_nearest_stepsize($grader->{recorded_score} * $grader->{problem_value}, $stepSize);
-			% my $currentPoints =
-				% round_nearest_stepsize($rawCurrentScore / 100 * $grader->{problem_value}, $stepSize);
+			% my $currentPoints = round_nearest_stepsize($rawCurrentScore / 100 * $grader->{problem_value}, $stepSize);
 			% param('grader-problem-points', $recordedPoints);
 			<div class="row align-items-center mb-2">
 				<%= label_for "score_problem$grader->{problem_id}_points",
@@ -95,38 +100,38 @@
 					<%= maketext('Point Value (0 - [_1]):', $grader->{problem_value}) %>
 					<%= link_to '#',
 						class => 'help-popup',
-						data => {
+						data  => {
 							bs_content => tag(
 								'p',
 								class => 'mb-0',
 								maketext(
 									'The initial value is the currently saved score as a point value computed '
-										. 'using the percent score.  This point value is used to compute the percent '
-										. 'score (rounded to a whole percent) that can be saved.'
-								)
+									. 'using the percent score.  This point value is used to compute the percent '
+									. 'score (rounded to a whole percent) that can be saved.'
 								)
-								. (
-									@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1 ? tag(
-										'p',
-										class => 'mt-2 mb-0',
-										maketext(
-											'This can computed from the answer sub scores above using the weights '
-											. 'shown if they are modified.  Alternatively, enter the point score you '
-											. 'want saved here (the above sub scores will be ignored).'
-										)
-									) : ''
-								)
-								. (
-									$currentPoints != $recordedPoints ? tag(
-										'p',
-										class => 'mt-2 mb-0',
-										maketext(
-											'Click the "Use points from last check" button to set the point value '
-											. 'to the points from the answers that were entered when answers were '
-											. 'last checked.'
-										)
-									) : ''
-								),
+							)
+							. (
+								@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1 ? tag(
+									'p',
+									class => 'mt-2 mb-0',
+									maketext(
+										'This can computed from the answer sub scores above using the weights '
+										. 'shown if they are modified.  Alternatively, enter the point score you '
+										. 'want saved here (the above sub scores will be ignored).'
+									)
+								) : ''
+							)
+							. (
+								$currentPoints != $recordedPoints ? tag(
+									'p',
+									class => 'mt-2 mb-0',
+									maketext(
+										'Click the "Use points from last check" button to set the point value '
+										. 'to the points from the answers that were entered when answers were '
+										. 'last checked.'
+									)
+								) : ''
+							),
 							bs_placement => 'top',
 							bs_toggle    => 'popover',
 							bs_html      => 'true'
@@ -137,18 +142,22 @@
 					<% end =%>
 				<% end =%>
 				<div class="col-sm">
-					<%= number_field 'grader-problem-points' => '',
-						min          => 0,
-						max          => $grader->{problem_value},
-						step         => $stepSize,
-						autocomplete => 'off',
-						id           => "score_problem$grader->{problem_id}_points",
-						class        => "problem-points form-control form-control-sm d-inline",
-						data         => { problem_id => $grader->{problem_id} } =%>
+					<%= number_field
+						'grader-problem-points' => '',
+						min                     => 0,
+						max                     => $grader->{problem_value},
+						step                    => $stepSize,
+						autocomplete            => 'off',
+						id                      => "score_problem$grader->{problem_id}_points",
+						class                   => "problem-points form-control form-control-sm d-inline",
+						data                    => { problem_id => $grader->{problem_id} } =%>
 					&nbsp;
 					% if ($recordedPoints != $currentPoints) {
-						<button class="recompute-grade btn btn-sm btn-secondary" type="button"
-							data-problem-id="<%= $grader->{problem_id} %>">
+						<button
+							class="recompute-grade btn btn-sm btn-secondary"
+							type="button"
+							data-problem-id="<%= $grader->{problem_id} %>"
+						>
 							<%= maketext('Use points from last check: [_1]', $currentPoints) =%>
 						</button>
 					% }
@@ -158,9 +167,10 @@
 		%
 		% # Total problem score. (Hidden if configured to only show point values.)
 		% if ($ce->{problemGraderScore} eq 'Point') {
-			<%= hidden_field 'grader-problem-score' => wwRound(0, $grader->{recorded_score} * 100),
-				id   => "score_problem$grader->{problem_id}",
-				data => { problem_id => $grader->{problem_id} } =%>
+			<%= hidden_field
+				'grader-problem-score' => wwRound(0, $grader->{recorded_score} * 100),
+				id                     => "score_problem$grader->{problem_id}",
+				data                   => { problem_id => $grader->{problem_id} } =%>
 		% } else {
 			<div class="row align-items-center mb-2">
 				% my $recordedScore = wwRound(0, $grader->{recorded_score} * 100);
@@ -168,35 +178,35 @@
 					<%= maketext('Problem Score (%):') %>
 					<%= link_to '#',
 						class => 'help-popup',
-						data => {
+						data  => {
 							bs_content => tag(
 								'p',
 								class => 'mb-0',
 								maketext('The initial value is the currently saved score for this student.')
-								)
-								. (
-									@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1 ? tag(
-										'p',
-										class => 'mt-2 mb-0',
-										maketext(
-											'This is the only part of the score that is actually saved. '
-											. 'This is computed from the answer sub scores above using the weights '
-											. 'shown if they are modified.  Alternatively, enter the score you want '
-											. 'saved here (the above sub scores will be ignored).'
-										)
-									) : ''
-								)
-								. (
-									$currentScore != $recordedScore ? tag(
-										'p',
-										class => 'mt-2 mb-0',
-										maketext(
-											'Click the "Use score from last check" button to set the problem score '
-											. 'to the score from the answers that were entered when answers were '
-											. 'last checked.'
-										)
-									) : ''
-								),
+							)
+							. (
+								@{ $grader->{pg}{flags}{ANSWER_ENTRY_ORDER} } > 1 ? tag(
+									'p',
+									class => 'mt-2 mb-0',
+									maketext(
+										'This is the only part of the score that is actually saved. '
+										. 'This is computed from the answer sub scores above using the weights '
+										. 'shown if they are modified.  Alternatively, enter the score you want '
+										. 'saved here (the above sub scores will be ignored).'
+									)
+								) : ''
+							)
+							. (
+								$currentScore != $recordedScore ? tag(
+									'p',
+									class => 'mt-2 mb-0',
+									maketext(
+										'Click the "Use score from last check" button to set the problem score '
+										. 'to the score from the answers that were entered when answers were '
+										. 'last checked.'
+									)
+								) : ''
+							),
 							bs_placement => 'top',
 							bs_toggle    => 'popover',
 							bs_html      => 'true'
@@ -208,17 +218,21 @@
 				<% end =%>
 				<div class="col-sm">
 					% param('grader-problem-score', $recordedScore);
-					<%= number_field 'grader-problem-score' => '',
-						min          => 0,
-						max          => 100,
-						autocomplete => "off",
-						id           => "score_problem$grader->{problem_id}",
-						class        => "problem-score form-control form-control-sm d-inline",
-						data         => { problem_id => $grader->{problem_id} } =%>
+					<%= number_field
+						'grader-problem-score' => '',
+						min                    => 0,
+						max                    => 100,
+						autocomplete           => "off",
+						id                     => "score_problem$grader->{problem_id}",
+						class                  => "problem-score form-control form-control-sm d-inline",
+						data                   => { problem_id => $grader->{problem_id} } =%>
 					&nbsp;
 					% if ($recordedScore != $currentScore) {
-						<button class="recompute-grade btn btn-sm btn-secondary" type="button"
-							data-problem-id="<%= $grader->{problem_id} %>">
+						<button
+							class="recompute-grade btn btn-sm btn-secondary"
+							type="button"
+							data-problem-id="<%= $grader->{problem_id} %>"
+						>
 							<%= maketext('Use score from last check: [_1]%', $currentScore) =%>
 						</button>
 					% }
@@ -229,16 +243,19 @@
 		% # Instructor comment
 		% if ($grader->{past_answer_id}) {
 			<div class="row">
-				<%= label_for "comment_problem$grader->{problem_id}" => maketext('Comment:'),
-					class => 'col-fixed col-form-label' =%>
+				<%= label_for
+					"comment_problem$grader->{problem_id}" => maketext('Comment:'),
+					class                                  => 'col-fixed col-form-label' =%>
 				<div class="col-sm">
 					% param('grader-instructor-comment', $grader->{comment_string});
-					<%= text_area 'grader-instructor-comment' => '',
-						id    => "comment_problem$grader->{problem_id}",
+					<%= text_area
+						'grader-instructor-comment' => '',
+						id                          => "comment_problem$grader->{problem_id}",
 						class => 'grader-problem-comment form-control d-inline latexentryfield',
 						data  => { problem_id => $grader->{problem_id} },
 						rows  => 3 =%>
-					<%= hidden_field "MaThQuIlL_comment_problem$grader->{problem_id}" => '',
+					<%= hidden_field
+						"MaThQuIlL_comment_problem$grader->{problem_id}" => '',
 						id => "MaThQuIlL_comment_problem$grader->{problem_id}" =%>
 				</div>
 			</div>
@@ -247,7 +264,9 @@
 		% # Save button
 		<div class="row align-items-center">
 			<div class="col-fixed mt-2">
-				<button class="save-grade btn btn-sm btn-secondary" type="button"
+				<button
+					class="save-grade btn btn-sm btn-secondary"
+					type="button"
 					id="<%= "save_grade_problem$grader->{problem_id}" %>"
 					data-course-id="<%= $grader->{course_id} %>"
 					data-student-id="<%= $grader->{student_id} %>"
@@ -255,7 +274,8 @@
 					data-version-id="<%= $grader->{version_id} %>"
 					data-problem-id="<%= $grader->{problem_id} %>"
 					data-past-answer-id="<%= $grader->{past_answer_id} %>"
-					data-save-sub-status="<%= $grader->{save_sub_status} %>">
+					data-save-sub-status="<%= $grader->{save_sub_status} %>"
+				>
 					<%= maketext('Save') =%>
 				</button>
 			</div>
diff --git a/templates/HTML/StudentNav/student_nav.html.ep b/templates/HTML/StudentNav/student_nav.html.ep
index 10070e7512..7ea88b4551 100644
--- a/templates/HTML/StudentNav/student_nav.html.ep
+++ b/templates/HTML/StudentNav/student_nav.html.ep
@@ -1,7 +1,7 @@
 % # Cap the number of students shown to at most 200.
 % my $numAfter        = $#$userRecords - $currentUserIndex;
 % my $numBefore       = 200 - ($numAfter < 100 ? $numAfter : 100);
-% my $minStudentIndex = $currentUserIndex < $numBefore ? 0 : $currentUserIndex - $numBefore;
+% my $minStudentIndex = $currentUserIndex < $numBefore          ? 0 : $currentUserIndex - $numBefore;
 % my $maxStudentIndex = $minStudentIndex + 200 < $#$userRecords ? $minStudentIndex + 200 : $#$userRecords;
 %
 <div class="user-nav d-flex submit-buttons-container">
@@ -9,8 +9,9 @@
 		% if ($eUserID ne $userID) {
 			% if ($prevUser) {
 				<%= link_to $c->systemLink(
-						url_for,
-						params => { effectiveUser => $prevUser->user_id, $filter ? (studentNavFilter => $filter) : () }
+					url_for,
+					params =>
+						{ effectiveUser => $prevUser->user_id, $filter ? (studentNavFilter => $filter) : () }
 					),
 					data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
 					title => $prevUser->{displayName},
@@ -27,18 +28,23 @@
 				% $eUserID ne $userID
 				% ? $userRecords->[$currentUserIndex]{displayName}
 				% : maketext('Select Student to Act As');
-			<%= link_to $buttonName => '#', id => 'studentSelector', class => 'btn btn-primary dropdown-toggle',
-				role => 'button', data => { bs_toggle => 'dropdown' }, 'aria-expanded' => 'false' =%>
+			<%= link_to
+				$buttonName     => '#',
+				id              => 'studentSelector',
+				class           => 'btn btn-primary dropdown-toggle',
+				role            => 'button',
+				data            => { bs_toggle => 'dropdown' },
+				'aria-expanded' => 'false' =%>
 			<ul class="dropdown-menu" role="menu" aria-labelledby="studentSelector">
 				% for (@$userRecords[ $minStudentIndex .. $maxStudentIndex ]) {
 					<li>
 						<%= link_to $_->{displayName} => $c->systemLink(
-								url_for,
-								params => { effectiveUser => $_->user_id, $filter ? (studentNavFilter => $filter) : () }
+							url_for,
+							params =>
+								{ effectiveUser => $_->user_id, $filter ? (studentNavFilter => $filter) : () }
 							),
 							class =>
-								join(' ', 'dropdown-item', $eUserID ne $userID && $_->{currentUser} ? 'active' : ())
-						=%>
+							join(' ', 'dropdown-item', $eUserID ne $userID && $_->{currentUser} ? 'active' : ()) =%>
 					</li>
 				% }
 			</ul>
@@ -46,13 +52,13 @@
 		% if ($eUserID ne $userID) {
 			% if ($nextUser) {
 				<%= link_to $c->systemLink(
-						url_for,
-						params => {
-							effectiveUser => $nextUser->user_id,
-							$filter ? (studentNavFilter => $filter) : ()
-						}
+					url_for,
+					params => {
+						effectiveUser => $nextUser->user_id,
+						$filter ? (studentNavFilter => $filter) : ()
+					}
 					),
-					data  => { bs_toggle    => 'tooltip', bs_placement => 'top' },
+					data  => { bs_toggle => 'tooltip', bs_placement => 'top' },
 					title => $nextUser->{displayName},
 					class => 'btn btn-primary student-nav-button',
 					begin =%>
@@ -67,25 +73,28 @@
 	% if (keys %$filters) {
 		<div class="btn-group student-nav-filter-selector">
 			<%= link_to $filter ? $filters->{$filter}[0] : maketext('Showing all students') => '#',
-				id => 'studentSelectorFilter', class => 'btn btn-primary dropdown-toggle', role => 'button',
-				data => { bs_toggle => 'dropdown' }, 'aria-expanded' => 'false' =%>
+				id                                                                          => 'studentSelectorFilter',
+				class           => 'btn btn-primary dropdown-toggle',
+				role            => 'button',
+				data            => { bs_toggle => 'dropdown' },
+				'aria-expanded' => 'false' =%>
 			<ul class="dropdown-menu" role="menu" aria-labelledby="studentSelectorFilter">
 				% # If a filter is currently in use, then add an item that will remove that filter.
 				% if ($filter) {
 					<li>
 						<%= link_to maketext('Show all students') =>
-								$c->systemLink(url_for, params => { effectiveUser => $eUserID }),
+							$c->systemLink(url_for, params => { effectiveUser => $eUserID }),
 							class => 'dropdown-item' =%>
 					</li>
 				% }
 				% for (sort keys %$filters) {
 					<li>
 						<%= link_to $filters->{$_}[0] => $c->systemLink(
-								url_for,
-								params => {
-									effectiveUser    => $eUserID ne $userID ? $filters->{$_}[1] : $eUserID,
-								   	studentNavFilter => $_
-							   	}
+							url_for,
+							params => {
+								effectiveUser    => $eUserID ne $userID ? $filters->{$_}[1] : $eUserID,
+								studentNavFilter => $_
+							}
 							),
 							class => join(' ', 'dropdown-item', ($filter || '') eq $_ ? 'active' : ()) =%>
 					</li>
diff --git a/templates/HelpFiles/Achievements.html.ep b/templates/HelpFiles/Achievements.html.ep
index 13525e6dcd..f1119c66d5 100644
--- a/templates/HelpFiles/Achievements.html.ep
+++ b/templates/HelpFiles/Achievements.html.ep
@@ -3,6 +3,6 @@
 %
 <p class="m-0">
 	<%= maketext(q{This page displays a student's current achievement level and progress toward the next level, }
-		. 'and lists the rewards and badges that the student has earned. If rewards have been earned, '
-		. 'then the student may also redeem those rewards.') =%>
+			. 'and lists the rewards and badges that the student has earned. If rewards have been earned, '
+			. 'then the student may also redeem those rewards.') =%>
 </p>
diff --git a/templates/HelpFiles/AchievementsLeaderboard.html.ep b/templates/HelpFiles/AchievementsLeaderboard.html.ep
index b16758abef..0d4935141c 100644
--- a/templates/HelpFiles/AchievementsLeaderboard.html.ep
+++ b/templates/HelpFiles/AchievementsLeaderboard.html.ep
@@ -3,10 +3,10 @@
 %
 <p>
 	<%= maketext('The leaderboard orders the achievement points earned from the greatest to the least. '
-		. 'The rank of each user is determined by their position on the leader board. All users with the '
-		. 'same number of achievement points have the same rank.') %>
+			. 'The rank of each user is determined by their position on the leader board. All users with the '
+			. 'same number of achievement points have the same rank.') %>
 </p>
 <p>
 	<%= maketext(q(Achievement badges are shown for each earned achievement. Mousing over the badge's )
-		. 'icon will give the name and description of the achievement.') %>
+			. 'icon will give the name and description of the achievement.') %>
 </p>
diff --git a/templates/HelpFiles/AdminAddCourse.html.ep b/templates/HelpFiles/AdminAddCourse.html.ep
index 8cdf53a3e6..d356d816f5 100644
--- a/templates/HelpFiles/AdminAddCourse.html.ep
+++ b/templates/HelpFiles/AdminAddCourse.html.ep
@@ -3,30 +3,37 @@
 %
 <p>
 	<%= maketext('Create a new course.  The "Course ID" is used as the course name and is used in course links.  '
-		. 'Underscores appear as spaces when displaying the course name.  The "Course Title" is used as the title '
-		. 'on the course home page.') =%>
+			. 'Underscores appear as spaces when displaying the course name.  The "Course Title" is used as the title '
+			. 'on the course home page.') =%>
 </p>
 <p>
-	<%= maketext('Select which users in the [_1] course to copy over to the newly created course. The WeBWorK '
-		. 'administrators need to be added to the course in order for them to access the course. Unselecting '
-		. 'them will make it so WeBWorK administrators cannot directly login to the course.',
-		$ce->{admin_course_id}) =%>
+	<%= maketext(
+		'Select which users in the [_1] course to copy over to the newly created course. The WeBWorK '
+			. 'administrators need to be added to the course in order for them to access the course. Unselecting '
+			. 'them will make it so WeBWorK administrators cannot directly login to the course.',
+		$ce->{admin_course_id}
+	) =%>
 </p>
 <p>
-	<%= maketext('Click the "Add Additional User" button to add additional users to the course. The only required '
-		. 'field is the user ID.  You can also add this user to the [_1] course, so you can copy this user when '
-		. 'creating future courses, or manage and email course users.  Note, by default these new users will be '
-		. '"Dropped" and unable to login to the [_1] course.', $ce->{admin_course_id}) =%>
+	<%= maketext(
+		'Click the "Add Additional User" button to add additional users to the course. The only required '
+			. 'field is the user ID.  You can also add this user to the [_1] course, so you can copy this user when '
+			. 'creating future courses, or manage and email course users.  Note, by default these new users will be '
+			. '"Dropped" and unable to login to the [_1] course.',
+		$ce->{admin_course_id}
+	) =%>
 </p>
 <p>
 	<%= maketext('You may choose a course to copy components from. Select the course and which components to copy.  '
-		. 'If the course is not a true course (like the modelCourse) then only the templates and html folders, '
-		. 'and the simple and course config files can be copied. The "simple config" file contains the settings '
-		. 'made in the "Course Config" page. The "course config" file should only be copied if you know what you '
-		. 'are doing.') =%>
+			. 'If the course is not a true course (like the modelCourse) then only the templates and html folders, '
+			. 'and the simple and course config files can be copied. The "simple config" file contains the settings '
+			. 'made in the "Course Config" page. The "course config" file should only be copied if you know what you '
+			. 'are doing.') =%>
 </p>
 <p class="mb-0">
-	<%= maketext('If there are .conf files in the [_1] folder, you may select a number of these to include at the '
-		. 'end of the course.conf file. This only applies when not copying a course.conf file from another course.',
-		$ce->{webworkDirs}{addOnConf}) =%>
+	<%= maketext(
+		'If there are .conf files in the [_1] folder, you may select a number of these to include at the '
+			. 'end of the course.conf file. This only applies when not copying a course.conf file from another course.',
+		$ce->{webworkDirs}{addOnConf}
+	) =%>
 </p>
diff --git a/templates/HelpFiles/AdminArchiveCourse.html.ep b/templates/HelpFiles/AdminArchiveCourse.html.ep
index 93d5e67062..fc63ea9abb 100644
--- a/templates/HelpFiles/AdminArchiveCourse.html.ep
+++ b/templates/HelpFiles/AdminArchiveCourse.html.ep
@@ -3,10 +3,10 @@
 %
 <p>
 	<%= maketext('Select a course to create a .tar.gz archive of, which contains a dump of the database and all '
-		. 'course files (templates, configuration files, etc).  Each course can only have a single archive.  '
-		. 'Creating an archive of a previously archived course will delete the old archive.') =%>
+			. 'course files (templates, configuration files, etc).  Each course can only have a single archive.  '
+			. 'Creating an archive of a previously archived course will delete the old archive.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Archived courses are located inside the "archives" directory of the "admin" course.  Use the '
-		. '"File Manager" to access the .tar.gz files.') =%>
+			. '"File Manager" to access the .tar.gz files.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminDeleteCourse.html.ep b/templates/HelpFiles/AdminDeleteCourse.html.ep
index dddd2c2485..fc3c01de1e 100644
--- a/templates/HelpFiles/AdminDeleteCourse.html.ep
+++ b/templates/HelpFiles/AdminDeleteCourse.html.ep
@@ -3,5 +3,5 @@
 %
 <p class="mb-0">
 	<%= maketext('Select a course to delete.  Warning, all data will be deleted and this cannot be undone.  '
-		. 'This will not delete any course archives.') =%>
+			. 'This will not delete any course archives.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminHideCourses.html.ep b/templates/HelpFiles/AdminHideCourses.html.ep
index a88a2904a8..0f2de07f07 100644
--- a/templates/HelpFiles/AdminHideCourses.html.ep
+++ b/templates/HelpFiles/AdminHideCourses.html.ep
@@ -3,8 +3,8 @@
 %
 <p class="mb-0">
 	<%= maketext('Select the course(s) you want to hide (or unhide) and then click "Hide Courses" (or "Unhide '
-		. 'Courses"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding '
-		. 'a course that is already visible does no harm (the action is skipped). Hidden courses are still active '
-		. 'but are not listed in the list of WeBWorK courses on the opening page. To access the course, an '
-		. 'instructor or student must know the full URL address for the course.') =%>
+			. 'Courses"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding '
+			. 'a course that is already visible does no harm (the action is skipped). Hidden courses are still active '
+			. 'but are not listed in the list of WeBWorK courses on the opening page. To access the course, an '
+			. 'instructor or student must know the full URL address for the course.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminManageLTICourseMap.html.ep b/templates/HelpFiles/AdminManageLTICourseMap.html.ep
index f280f614d3..75acf46a68 100644
--- a/templates/HelpFiles/AdminManageLTICourseMap.html.ep
+++ b/templates/HelpFiles/AdminManageLTICourseMap.html.ep
@@ -3,16 +3,16 @@
 %
 <p>
 	<%= maketext('Fill out the form below to add or remove LMS context IDs for courses. The LMS context ID is a '
-		. 'unique identifier for a course in the LMS. This is used to associate an LMS course to a WeBWorK course '
-		. 'when a content item selection request is made. You do not need to set anything on this page if you do '
-		. 'not want the instructors using this WeBWorK server to be able to use content item selection. Note that '
-		. 'the LMS context ID for a course will be displayed if an instructor attempts to select content from the '
-		. 'course via a content item request, and the LMS context id has not been set in WeBWorK.') =%>
+			. 'unique identifier for a course in the LMS. This is used to associate an LMS course to a WeBWorK course '
+			. 'when a content item selection request is made. You do not need to set anything on this page if you do '
+			. 'not want the instructors using this WeBWorK server to be able to use content item selection. Note that '
+			. 'the LMS context ID for a course will be displayed if an instructor attempts to select content from the '
+			. 'course via a content item request, and the LMS context id has not been set in WeBWorK.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Note that two courses in different LMSs might have the same context id. If that is the case, then '
-		. 'these courses must must have different LTI configurations. For LTI 1.1, this means they must have the '
-		. 'consumer key set to different values in the two LMSs and that must be set in the LTI 1.1 configuration for '
-		. 'the courses in WeBWorK. For LTI 1.3, two different LMSs will always have different configurations. Make '
-		. 'sure the two configurations are correct in WeBWorK.') =%>
+			. 'these courses must must have different LTI configurations. For LTI 1.1, this means they must have the '
+			. 'consumer key set to different values in the two LMSs and that must be set in the LTI 1.1 configuration for '
+			. 'the courses in WeBWorK. For LTI 1.3, two different LMSs will always have different configurations. Make '
+			. 'sure the two configurations are correct in WeBWorK.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminManageLocations.html.ep b/templates/HelpFiles/AdminManageLocations.html.ep
index d2d9072c33..19a58e20c3 100644
--- a/templates/HelpFiles/AdminManageLocations.html.ep
+++ b/templates/HelpFiles/AdminManageLocations.html.ep
@@ -3,17 +3,17 @@
 %
 <p>
 	<%= maketext('Fill out the form below to add, edit, or delete locations.  Locations are used to restrict access '
-		. 'to sets based on ip address.  Locations are configured here in the administration course, then used in a '
-		. 'normal course.  When configuring a set to use a restricted ip address, the instructor can choose to '
-		. 'either restrict access to the location or deny access from a location, which are identified by their '
-		. 'name.  Instructors can select multiple locations to restrict access to.') =%>
+			. 'to sets based on ip address.  Locations are configured here in the administration course, then used in a '
+			. 'normal course.  When configuring a set to use a restricted ip address, the instructor can choose to '
+			. 'either restrict access to the location or deny access from a location, which are identified by their '
+			. 'name.  Instructors can select multiple locations to restrict access to.') =%>
 </p>
 <p>
 	<%= maketext('Locations are a list of ip addresses.  Ip addresses can be a single address (e.g. 192.168.1.101), '
-		. 'a range of ip address (e.g. 192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). '
-		. 'Enter one ip address per line, using as many lines as needed for each location.') =%>
+			. 'a range of ip address (e.g. 192.168.1.101-192.168.1.150), or an ip address mask (e.g. 192.168.1.0/24). '
+			. 'Enter one ip address per line, using as many lines as needed for each location.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Locations are edited by adding new ip addresses to the location, or deleting existing address.  '
-		. 'You must select the confirm checkbox when deleting a location, and this cannot be undone.') =%>
+			. 'You must select the confirm checkbox when deleting a location, and this cannot be undone.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminManageOTPSecrets.html.ep b/templates/HelpFiles/AdminManageOTPSecrets.html.ep
index 16c54b7ef0..46e5474a8d 100644
--- a/templates/HelpFiles/AdminManageOTPSecrets.html.ep
+++ b/templates/HelpFiles/AdminManageOTPSecrets.html.ep
@@ -3,19 +3,19 @@
 %
 <p>
 	<%= maketext('Use the tabs at top to choose between copying a single secret, copying multiple secrets, '
-		. ' or resting secrets.') =%>
+			. ' or resting secrets.') =%>
 </p>
 <p>
 	<%= maketext('If copying a single secret, choose the source course ID and user ID to copy from and choose '
-		. 'the destination course ID and user ID to copy to. This can be used to copy secrets between different '
-		. 'users in the same course, or to copy the secret to a user in a different course.') =%>
+			. 'the destination course ID and user ID to copy to. This can be used to copy secrets between different '
+			. 'users in the same course, or to copy the secret to a user in a different course.') =%>
 </p>
 <p>
 	<%= maketext('If copying multiple secrets, choose a source course ID to copy from, then chose one (or more) '
-		. 'source users to copy to one (or more) destination courses. This can be used to copy multiple secrets '
-		. 'at once, but the user IDs must be the same in the source and destination courses.') =%>
+			. 'source users to copy to one (or more) destination courses. This can be used to copy multiple secrets '
+			. 'at once, but the user IDs must be the same in the source and destination courses.') =%>
 </p>
 <p>
 	<%= maketext('If resetting secrets, choose a source course ID, then choose one (or more) users whose secrets '
-		. 'will be reset. Note, the user(s) will have to setup two factor authentication afterwards.') =%>
+			. 'will be reset. Note, the user(s) will have to setup two factor authentication afterwards.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminRenameCourse.html.ep b/templates/HelpFiles/AdminRenameCourse.html.ep
index 7cd49f1a10..b89343d9bf 100644
--- a/templates/HelpFiles/AdminRenameCourse.html.ep
+++ b/templates/HelpFiles/AdminRenameCourse.html.ep
@@ -3,6 +3,6 @@
 %
 <p class="mb-0">
 	<%= maketext('Select the course to change its Course ID, Course Title, or Institution.  Note that changing a '
-		. q{course's ID will change the URL of all links to the course, and could break links from external sites }
-		. 'such as an LMS.') =%>
+			. q{course's ID will change the URL of all links to the course, and could break links from external sites }
+			. 'such as an LMS.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminUnarchiveCourse.html.ep b/templates/HelpFiles/AdminUnarchiveCourse.html.ep
index 458d624c23..5075386768 100644
--- a/templates/HelpFiles/AdminUnarchiveCourse.html.ep
+++ b/templates/HelpFiles/AdminUnarchiveCourse.html.ep
@@ -3,16 +3,16 @@
 %
 <p>
 	<%= maketext('Select an archive to restore.  You cannot restore an archive into an existing course. '
-		. 'Instead, either rename or delete the old course, or restore the archive with a new name.  When '
-		. 'restoring a course with a new name, the name is used as the course ID, and must contain only '
-		. 'letters, numbers, hyphens, and underscores, and may have at most 40 characters.') =%>
+			. 'Instead, either rename or delete the old course, or restore the archive with a new name.  When '
+			. 'restoring a course with a new name, the name is used as the course ID, and must contain only '
+			. 'letters, numbers, hyphens, and underscores, and may have at most 40 characters.') =%>
 </p>
 <p>
 	<%= maketext('Archived courses are located inside the "archives" directory of the "admin" course.  Use '
-		. 'the "File Manager" to upload additional .tar.gz files to be unarchived.') =%>
+			. 'the "File Manager" to upload additional .tar.gz files to be unarchived.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('You may check the box to "clean" the unarchived course. This will remove student users '
-		. 'and their associated data from the database after the course is unarchived. It will also remove '
-		. 'the log files, any files in the scoring folder, and any temporary edited files.') =%>
+			. 'and their associated data from the database after the course is unarchived. It will also remove '
+			. 'the log files, any files in the scoring folder, and any temporary edited files.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminUpgradeCourses.html.ep b/templates/HelpFiles/AdminUpgradeCourses.html.ep
index 57f56dd367..c96c55e646 100644
--- a/templates/HelpFiles/AdminUpgradeCourses.html.ep
+++ b/templates/HelpFiles/AdminUpgradeCourses.html.ep
@@ -3,7 +3,7 @@
 %
 <p class="mb-0">
 	<%= maketext('Select which courses to upgrade from a previous version of WeBWorK.  The upgrade process can add '
-		. 'missing database columns, delete unused database columns, and check the course file structure.  Be sure '
-		. 'to read over the changes before confirming the upgrade.  You may want to create an archive of the course '
-		. 'before upgrading.  Only courses that need upgraded will be selectable.') =%>
+			. 'missing database columns, delete unused database columns, and check the course file structure.  Be sure '
+			. 'to read over the changes before confirming the upgrade.  You may want to create an archive of the course '
+			. 'before upgrading.  Only courses that need upgraded will be selectable.') =%>
 </p>
diff --git a/templates/HelpFiles/Grades.html.ep b/templates/HelpFiles/Grades.html.ep
index 53db57cf92..0bfc8e28f7 100644
--- a/templates/HelpFiles/Grades.html.ep
+++ b/templates/HelpFiles/Grades.html.ep
@@ -3,20 +3,20 @@
 %
 <p>
 	<%= maketext(q{This page shows the student's current grade for all assignments they are assigned to.  This page }
-		. 'only shows assignments and grades visible to the student. To view all grades, visit the "Student Progress" '
-		. q{page for the student. The student navigation menu at the top can be used to change which student's grades }
-		. 'to view') =%>
+			. 'only shows assignments and grades visible to the student. To view all grades, visit the "Student Progress" '
+			. q{page for the student. The student navigation menu at the top can be used to change which student's grades }
+			. 'to view') =%>
 </p>
 <p>
 	<%= maketext('The total grade at the top shows the total score and percent average over all open assignments.  '
-		. 'The total grade can be shown/hidden under general course configuration settings.') =%>
+			. 'The total grade can be shown/hidden under general course configuration settings.') =%>
 </p>
 <p>
 	<%= maketext('The grades are divided into open, reduced scoring, closed, and future assignments.  No grades are '
-		. 'shown for future assignments, just their open date.  Assignments are sorted using the same urgency logic '
-		. 'as the "Assignments" page.  For open assignments, a table of per problem scores are shown for homework '
-		. 'assignments. Just in time assignments only show top level problems.  Tests only show the best test version '
-		. 'provided students can see the test grade.') %>
+			. 'shown for future assignments, just their open date.  Assignments are sorted using the same urgency logic '
+			. 'as the "Assignments" page.  For open assignments, a table of per problem scores are shown for homework '
+			. 'assignments. Just in time assignments only show top level problems.  Tests only show the best test version '
+			. 'provided students can see the test grade.') %>
 </p>
 <p class="m-0">
 	<%== maketext(
@@ -26,7 +26,6 @@
 			. 'the "Email" message [_2], which will be rendered and displayed below the grade table.  The message can '
 			. 'be created on the "Email" page and the CSV file can be created/uploaded using the "File Manager".  '
 			. 'External grades can only be displayed here and are not included in any totals or statistics.',
-		'<code>[Scoring]/report_grades_data.csv</code>',
-		'<code>[TMPL]/email/report_grades.msg</code>',
+		'<code>[Scoring]/report_grades_data.csv</code>', '<code>[TMPL]/email/report_grades.msg</code>',
 	) =%>
 </p>
diff --git a/templates/HelpFiles/Hardcopy.html.ep b/templates/HelpFiles/Hardcopy.html.ep
index dff8b3c0c8..792e88fc8d 100644
--- a/templates/HelpFiles/Hardcopy.html.ep
+++ b/templates/HelpFiles/Hardcopy.html.ep
@@ -3,27 +3,28 @@
 %
 <p>
 	<%= maketext('Generate hardcopies of assignments in PDF or latex format. To produce a '
-		. 'hardcopy, one selects the users on the left and the sets on the right. '
-		. 'All users and sets are listed.') =%>
+			. 'hardcopy, one selects the users on the left and the sets on the right. '
+			. 'All users and sets are listed.') =%>
 </p>
 <p>
 	<%= maketext('In both cases, one can select the sort field, the format of the display list, and the filter. '
-		. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
-		. 'be applied in sequence, narrowing the results list. If the "Union" button is used, the updated '
-		. 'list will be the union of all results lists from the multiple filters. '
-		. '"Refresh List" must be clicked to update the list.') =%>
+			. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
+			. 'be applied in sequence, narrowing the results list. If the "Union" button is used, the updated '
+			. 'list will be the union of all results lists from the multiple filters. '
+			. '"Refresh List" must be clicked to update the list.') =%>
 </p>
 <p>
 	<%= maketext('There are many options available at the bottom:') =%>
 </p>
 <dl>
 	<dt><%= maketext('Show') %></dt>
-	<dd><%= maketext('Toggle each of the options to include or not include in the output.') %> </dd>
+	<dd><%= maketext('Toggle each of the options to include or not include in the output.') %></dd>
 
 	<dt><%= maketext('Hardcopy Format') %></dt>
 	<dd>
 		<%= maketext('If "TeX Source" is selected, a zip file containing a TeX file and other files needed to generate '
-			. 'a PDF hardcopy will be produced. If "Adobe PDF" is selected then only a PDF file will be produced.') =%>
+				. 'a PDF hardcopy will be produced. If "Adobe PDF" is selected then only a PDF file will be produced.'
+		) =%>
 	</dd>
 
 	<dt><%= maketext('Show Problem Source File') %></dt>
@@ -32,19 +33,22 @@
 	<dt><%= maketext('Hardcopy Theme') %></dt>
 	<dd>
 		<%= maketext('Choose from the available hardcopy layout themes. '
-			. 'To create a new hardcopy theme, visit the Problem Editor, Generate Hardcopy tab. '
-			. 'New hardcopy themes will be stored in the templates/hardcopyThemes/ folder.') %> </dd>
+				. 'To create a new hardcopy theme, visit the Problem Editor, Generate Hardcopy tab. '
+				. 'New hardcopy themes will be stored in the templates/hardcopyThemes/ folder.') %>
+	</dd>
 </dl>
 <p>
-	<%== maketext('Once "Generate Hardcopy for selected sets and selected users" is clicked a file in the selected '
-		. 'hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF file '
-		. 'is generated. If TeX output is selected, a zip file is generated that contains all files needed to '
-		. 'generated the hardcopy PDF file via LaTeX. The main TeX file is called [_2].',
-		'<code>hardcopy.tex</code>') =%>
+	<%== maketext(
+		'Once "Generate Hardcopy for selected sets and selected users" is clicked a file in the selected '
+			. 'hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF file '
+			. 'is generated. If TeX output is selected, a zip file is generated that contains all files needed to '
+			. 'generated the hardcopy PDF file via LaTeX. The main TeX file is called [_2].',
+		'<code>hardcopy.tex</code>'
+	) =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Note that if there are errors, they will be shown at the top of the page. '
-		. 'In some cases, a hard copy is still generated and a link called "Download Hardcopy" '
-		. 'appears. In addition, the latex file, log and error files are generated which can '
-		. 'be used in troubleshooting.') =%>
+			. 'In some cases, a hard copy is still generated and a link called "Download Hardcopy" '
+			. 'appears. In addition, the latex file, log and error files are generated which can '
+			. 'be used in troubleshooting.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorAchievementEditor.html.ep b/templates/HelpFiles/InstructorAchievementEditor.html.ep
index 1cee81f4ba..2ab7b0cc53 100644
--- a/templates/HelpFiles/InstructorAchievementEditor.html.ep
+++ b/templates/HelpFiles/InstructorAchievementEditor.html.ep
@@ -3,50 +3,60 @@
 %
 <p>
 	<%= maketext('An achievement evaluator is a perl script that is run after each problem is submitted which returns '
-		. 'a truth value of 0 (didn\'t earn) or 1 (earn). The evaluator is given access to different variables which '
-		. 'contain data about the problem and set that is used to determine if the achievement is earned or not.') =%>
+			. 'a truth value of 0 (didn\'t earn) or 1 (earn). The evaluator is given access to different variables which '
+			. 'contain data about the problem and set that is used to determine if the achievement is earned or not.'
+	) =%>
 </p>
 <p>
 	<%= maketext('Use the editor to edit the evaluator and the action form at the bottom to save the evaluator. You '
-		. 'can either overwrite the current evaluator file or save as a new evaluator file.') =%>
+			. 'can either overwrite the current evaluator file or save as a new evaluator file.') =%>
 </p>
 <h2><%= maketext('Evaluator Variables') %></h2>
 <p>
 	<%= maketext('Here is a list of the variables the evaluator has access to. Unless indicated, changes to the '
-		. 'variables will not be saved.  Evaluators are run in the same order they are listed on the achievement '
-		. 'editor page and are only run if the achievement has not been earned. Keep this in mind when using '
-		. 'persistent global data.') =%>
+			. 'variables will not be saved.  Evaluators are run in the same order they are listed on the achievement '
+			. 'editor page and are only run if the achievement has not been earned. Keep this in mind when using '
+			. 'persistent global data.') =%>
 </p>
 <ul>
-	<li><code>$problem</code>:
+	<li>
+		<code>$problem</code>:
 		<%= maketext('A hash reference which contains the problem data.') =%>
 	</li>
-	<li><code>$set</code>:
+	<li>
+		<code>$set</code>:
 		<%= maketext('A hash reference which contains the set data.') =%>
 	</li>
-	<li><code>@setProblems</code>:
+	<li>
+		<code>@setProblems</code>:
 		<%= maketext('An array which lists the hash reference of all the problems in the current set.') =%>
 	</li>
-	<li><code>$counter</code>:
+	<li>
+		<code>$counter</code>:
 		<%= maketext('The current value of the achievement counter. Changes to this variable will be saved.') =%>
 	</li>
-	<li><code>$maxCounter</code>:
+	<li>
+		<code>$maxCounter</code>:
 		<%= maketext('The goal value of the achievement counter.') =%>
 	</li>
-	<li><code>$tags</code>:
+	<li>
+		<code>$tags</code>:
 		<%= maketext('A hash reference which contains a problems metadata, such as DBsubject, DBchapter, DBsection, '
-			. ' and so on.') =%>
+				. ' and so on.') =%>
 	</li>
-	<li><code>$userAchievements</code>:
+	<li>
+		<code>$userAchievements</code>:
 		<%= maketext('A hash reference in which the keys are the achievement_id\'s assigned to the current user and '
-			. 'the values are 0 or 1 which stores if the user has earned the associated achievement or not.') =%>
+				. 'the values are 0 or 1 which stores if the user has earned the associated achievement or not.') =%>
 	</li>
-	<li><code>$localData</code>:
+	<li>
+		<code>$localData</code>:
 		<%= maketext('A hash reference which saves data for this user and this achievement. This hash is persistent '
-			. 'between evaluations and changes to this variable will be saved in the database.') =%>
+				. 'between evaluations and changes to this variable will be saved in the database.') =%>
 	</li>
-	<li><code>$globalData</code>:
+	<li>
+		<code>$globalData</code>:
 		<%= maketext('A hash reference which saves global data for this user. This hash is persistent between '
-			. 'evaluations and changes to this variable will be saved in the database.') =%>
+				. 'evaluations and changes to this variable will be saved in the database.') =%>
 	</li>
 </ul>
diff --git a/templates/HelpFiles/InstructorAchievementList.html.ep b/templates/HelpFiles/InstructorAchievementList.html.ep
index e431a642ae..357d185dde 100644
--- a/templates/HelpFiles/InstructorAchievementList.html.ep
+++ b/templates/HelpFiles/InstructorAchievementList.html.ep
@@ -3,22 +3,22 @@
 %
 <p>
 	<%= maketext('Manage achievements for the course.  The actions allow one to edit, assign, import, export, score, '
-		. 'create, or delete achievements.  The action form is at the top to select the desired action and options to '
-		. 'perform when the submit button is pressed.  Below the action form is the list of all the '
-		. 'achievements, ordered by their achievement "Number", with "level" achievements listed last.') =%>
+			. 'create, or delete achievements.  The action form is at the top to select the desired action and options to '
+			. 'perform when the submit button is pressed.  Below the action form is the list of all the '
+			. 'achievements, ordered by their achievement "Number", with "level" achievements listed last.') =%>
 </p>
 <p>
 	<%= maketext('Achievements are evaluated in the order shown below, with the exception of "level" achievements.  '
-		. 'Achievements in the "level" category are evaluated last and control the XP thresholds and rewards '
-		. '(achievement items) for reaching each level. Achievements in the "secret" category are not shown to '
-		. 'students until they earn the achievement, and is used for fun/surprise achievements.') =%>
+			. 'Achievements in the "level" category are evaluated last and control the XP thresholds and rewards '
+			. '(achievement items) for reaching each level. Achievements in the "secret" category are not shown to '
+			. 'students until they earn the achievement, and is used for fun/surprise achievements.') =%>
 </p>
 <p>
 	<%= maketext('Achievements in the same category, with sequential numbers, and whose ID starts with the same '
-		. '"prefix_" (up to the last underscore), are treated as achievement chains.  Achievement chains are a '
-		. 'sequence of achievements which build upon themselves, such as complete one problem, complete 10 problems, '
-		. 'complete 25 problems, and so on. Students will only see the achievements in the chain they have completed '
-		. 'or are currently working on.') =%>
+			. '"prefix_" (up to the last underscore), are treated as achievement chains.  Achievement chains are a '
+			. 'sequence of achievements which build upon themselves, such as complete one problem, complete 10 problems, '
+			. 'complete 25 problems, and so on. Students will only see the achievements in the chain they have completed '
+			. 'or are currently working on.') =%>
 </p>
 <h2><%= maketext('Achievement options') %></h2>
 <ul>
@@ -33,12 +33,12 @@
 	<li>
 		<strong><%= maketext('Category:') %></strong>
 		<%= maketext('Groups types of achievements. The "level" and "secret" categories are special (described '
-			. 'above), and categories can be used to create achievement chains.') =%>
+				. 'above), and categories can be used to create achievement chains.') =%>
 	</li>
 	<li>
 		<strong><%= maketext('Number:') %></strong>
 		<%= maketext('Sets the order in which achievements are listed and evaluated. Achievements in the "level" '
-			. 'category are always listed and evaluated after all other achievements.') =%>
+				. 'category are always listed and evaluated after all other achievements.') =%>
 	</li>
 	<li>
 		<strong><%= maketext('Enabled:') %></strong>
@@ -51,12 +51,13 @@
 	<li>
 		<strong><%= maketext('Counter:') %></strong>
 		<%= maketext('Used for "counting" achievements, which sets the value a counter must reach in order to earn '
-			. 'the achievement. For example this is used counting the number of completed problems.') =%>
+				. 'the achievement. For example this is used counting the number of completed problems.') =%>
 	</li>
 	<li>
 		<strong><%= maketext('Description:') %></strong>
-		<%= maketext(
-			'The description shown to students which states what action is needed to earn the achievement.') =%>
+		<%=
+			maketext('The description shown to students which states what action is needed to earn the achievement.')
+		=%>
 	</li>
 	<li>
 		<strong><%= maketext('Evaluator File:') %></strong>
@@ -76,49 +77,51 @@
 	<dt><%= maketext('Filter achievements') %></dt>
 	<dd>
 		<%= maketext('You can filter which achievements are shown by clicking the "Filter" button.  Use the drop '
-			. 'down menu to select the filter criteria, which allows you to filter achievements by their ID, '
-			. 'category, or if they are enabled or disabled.') =%>
+				. 'down menu to select the filter criteria, which allows you to filter achievements by their ID, '
+				. 'category, or if they are enabled or disabled.') =%>
 	</dd>
 	<dt><%= maketext('Edit achievement information') %></dt>
 	<dd>
 		<%= maketext('You can edit a single achievement by clicking on the pencil icon next to the achievement ID.  '
-			. 'You can edit multiple achievements by selecting which achievements to edit, then click the '
-			. '"Edit" button. You can edit all of the achievements by first selecting them all using the checkbox '
-			. 'next to "Achievement ID", then editing them with the "Edit" button.') =%>
+				. 'You can edit multiple achievements by selecting which achievements to edit, then click the '
+				. '"Edit" button. You can edit all of the achievements by first selecting them all using the checkbox '
+				. 'next to "Achievement ID", then editing them with the "Edit" button.') =%>
 	</dd>
 
 	<dt><%= maketext('Import/export achievements') %></dt>
 	<dd>
 		<%= maketext('You can import/export from their respective action tab.  Exporting saves information about the '
-			. 'achievement as a .axp file which is a CSV that lists each achievements information.  You can import '
-			. '.axp files that have been previously exported.  Use the "File Manager" to upload/download .axp files '
-			. 'to "achievements" directory (also upload/download any achievement evaluator .at files needed).') =%>
-	<dd>
+				. 'achievement as a .axp file which is a CSV that lists each achievements information.  You can import '
+				. '.axp files that have been previously exported.  Use the "File Manager" to upload/download .axp files '
+				. 'to "achievements" directory (also upload/download any achievement evaluator .at files needed).') =%>
+	</dd>
+
+	<dd></dd>
 
 	<dt><%= maketext('Assign achievements') %></dt>
 	<dd>
 		<%= maketext('You can assign selected achievements to all users by using the "Assign" action action and '
-			. 'selecting which achievements to assign.  You can select which users to assign/unassign to an '
-			. 'achievement by clicking on the link in the "Edit Users" column.') =%>
+				. 'selecting which achievements to assign.  You can select which users to assign/unassign to an '
+				. 'achievement by clicking on the link in the "Edit Users" column.') =%>
 	</dd>
 
 	<dt><%= maketext('Export achievement data') %></dt>
 	<dd>
 		<%= maketext('The "Score" tab will export achievement data to a CSV file that can be downloaded.  The export '
-			. 'contains the global data including number of achievement points and current level of each student.  '
-			. 'In addition for each selected achievement, a column for if the achievement was earned (1) or not earned '
-			. '(0) will be added to the CSV.') =%>
+				. 'contains the global data including number of achievement points and current level of each student.  '
+				. 'In addition for each selected achievement, a column for if the achievement was earned (1) or not earned '
+				. '(0) will be added to the CSV.') =%>
 	</dd>
 
 	<dt><%= maketext('Create/Delete achievements') %></dt>
 	<dd>
 		<%= maketext('Use the "Create" and "Delete" actions to create or delete achievements. Note that deleting an '
-			. 'achievement will delete all data associated to the achievement and cannot be undone.') =%>
+				. 'achievement will delete all data associated to the achievement and cannot be undone.') =%>
 	</dd>
 
 	<dt><%= maketext('Edit achievement evaluator') %></dt>
 	<dd>
 		<%= maketext('The achievement evaluator is the perl code that is run after each submit to determine if an '
-			. 'achievement is earned or not.  Click on the "Edit Evaluator" link to edit the evaluator.') =%>
+				. 'achievement is earned or not.  Click on the "Edit Evaluator" link to edit the evaluator.') =%>
 	</dd>
 </dl>
diff --git a/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep b/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep
index f3d15c1ce5..507de452ca 100644
--- a/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep
+++ b/templates/HelpFiles/InstructorAchievementNotificationEditor.html.ep
@@ -3,9 +3,9 @@
 %
 <p>
 	<%= maketext('This page allows one to edit and set the achievement email notification template for an achievement. '
-		. ' In addition to setting an email notification template for an achievement here, you must also set the '
-		. '"email address to use when sending Achievement notifications" in the optional modules of the course '
-		. 'configuration in order for email notifications to be sent.') =%>
+			. ' In addition to setting an email notification template for an achievement here, you must also set the '
+			. '"email address to use when sending Achievement notifications" in the optional modules of the course '
+			. 'configuration in order for email notifications to be sent.') =%>
 </p>
 <h2><%= maketext('Actions:') %></h2>
 <p class="mb-2"><i><%= maketext('(If an action cannot be executed it will not appear.)') %></i></p>
@@ -16,8 +16,8 @@
 	<dt><%= maketext('Save As') %></dt>
 	<dd>
 		<%= maketext(q{Makes a new copy of the file you are editing at the location relative to the course's }
-			. 'achievement notifications (~[ACHEVNOTIFYDIR~]) directory, and sets the new file to be the email '
-			. 'notification template for this achievement.') =%>
+				. 'achievement notifications (~[ACHEVNOTIFYDIR~]) directory, and sets the new file to be the email '
+				. 'notification template for this achievement.') =%>
 	</dd>
 
 	<dt><%= maketext('Use Existing Template') %></dt>
@@ -28,9 +28,12 @@
 </dl>
 <h2><%= maketext('Template Substitutions') %></h2>
 <p>
-	<%== maketext('The following variables are available for use in the template.  These variables can be used inside '
-		. '[_1] tags.  For example, [_2] will insert the description of the achievement into the email body.',
-	   	'<code>&lt;%= ... %&gt;</code>', '<code>&lt;%= $achievement->description %&gt;</code>') =%>
+	<%== maketext(
+		'The following variables are available for use in the template.  These variables can be used inside '
+			. '[_1] tags.  For example, [_2] will insert the description of the achievement into the email body.',
+		'<code>&lt;%= ... %&gt;</code>',
+		'<code>&lt;%= $achievement->description %&gt;</code>'
+	) =%>
 </p>
 <ul class="mb-0">
 	<li><code>$ce</code>: This gives access to the entire course environment.</li>
diff --git a/templates/HelpFiles/InstructorAchievementUserEditor.html.ep b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
index 1d9cd7cca4..24bfe898c2 100644
--- a/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
+++ b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
@@ -3,9 +3,9 @@
 %
 <p class="mb-0">
 	<%= maketext('This form can assign, unassign, and edit user data for a single achievement.  You can assign the '
-		. 'achievement to all current users or select which users to assign the achievement to and click Save.  You '
-		. 'can unassign the achievement by unchecking a student\'s name (note all data will be deleted).  To unassign '
-		. 'the achievement from all users, first select "Allow unassign" and then click the "Unassign from All Users" '
-		. 'button. You can also toggle the earned status with the checkbox in the "Earned" column and edit the '
-		. 'achievement counter for counting achievements.') =%>
+			. 'achievement to all current users or select which users to assign the achievement to and click Save.  You '
+			. 'can unassign the achievement by unchecking a student\'s name (note all data will be deleted).  To unassign '
+			. 'the achievement from all users, first select "Allow unassign" and then click the "Unassign from All Users" '
+			. 'button. You can also toggle the earned status with the checkbox in the "Earned" column and edit the '
+			. 'achievement counter for counting achievements.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorAddUsers.html.ep b/templates/HelpFiles/InstructorAddUsers.html.ep
index a716fe04a6..6e7a05fe40 100644
--- a/templates/HelpFiles/InstructorAddUsers.html.ep
+++ b/templates/HelpFiles/InstructorAddUsers.html.ep
@@ -3,17 +3,17 @@
 %
 <p>
 	<%= maketext('Add users to the course.  Select the number of students/users to add and '
-		. 'then add any desired information.  The only mandatory information is the "Login Name". '
-		. 'Any other fields may be left blank.') =%>
+			. 'then add any desired information.  The only mandatory information is the "Login Name". '
+			. 'Any other fields may be left blank.') =%>
 </p>
 <p>
 	<%= maketext('If a password is provided in the password field, then that will be set as the password for the '
-		. 'user.  If the password field is left blank, then the value for the selected "Fallback password source" '
-		. 'will be set as the password assuming a value for that field it is provided. If the password field is '
-		. 'left blank, and the "Fallback password source" is "None" or that field not provided, then the user '
-		. 'will not have a password and will not be able to sign in directly to the course.') =%>
+			. 'user.  If the password field is left blank, then the value for the selected "Fallback password source" '
+			. 'will be set as the password assuming a value for that field it is provided. If the password field is '
+			. 'left blank, and the "Fallback password source" is "None" or that field not provided, then the user '
+			. 'will not have a password and will not be able to sign in directly to the course.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Multiple sets may be assigned to the users by holding down the shift key or the ctrl key while '
-		. 'selecting from the list.') =%>
+			. 'selecting from the list.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorAssigner.html.ep b/templates/HelpFiles/InstructorAssigner.html.ep
index 422154f1e8..0e25133155 100644
--- a/templates/HelpFiles/InstructorAssigner.html.ep
+++ b/templates/HelpFiles/InstructorAssigner.html.ep
@@ -3,14 +3,14 @@
 %
 <p>
 	<%= maketext('Select users from the left column and sets from the right column and assign or '
-		. 'unassign the given sets. The list of users or the list of sets can be reordered using the "Sort By" '
-		. 'option, and presented using a chosen "Format".  Additionally, the user and set lists can be filtered. '
-		. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
-		. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
-		. 'list will be the union of all results lists from the multiple filters.'
-		. 'The displayed user and set lists will only be updated upon clicking "Refresh List".') =%>
+			. 'unassign the given sets. The list of users or the list of sets can be reordered using the "Sort By" '
+			. 'option, and presented using a chosen "Format".  Additionally, the user and set lists can be filtered. '
+			. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
+			. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
+			. 'list will be the union of all results lists from the multiple filters.'
+			. 'The displayed user and set lists will only be updated upon clicking "Refresh List".') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Multiple users or sets may be selected by holding down the shift key or the ctrl key while '
-		. 'selecting from the list.') =%>
+			. 'selecting from the list.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorConfig.html.ep b/templates/HelpFiles/InstructorConfig.html.ep
index f81835aaaf..99599e7127 100644
--- a/templates/HelpFiles/InstructorConfig.html.ep
+++ b/templates/HelpFiles/InstructorConfig.html.ep
@@ -3,13 +3,13 @@
 %
 <p>
 	<%= maketext('This page allows you to configure course settings such as permission levels, display modes '
-		. 'allowed, default display mode, email feedback behavior, and much more.') =%>
+			. 'allowed, default display mode, email feedback behavior, and much more.') =%>
 </p>
 <p>
 	<%= maketext('Click on each of the tabs to view the configuration items. The question mark icon provides access '
-		. 'to information about the behavior of the configuration settings.') =%>
+			. 'to information about the behavior of the configuration settings.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('The settings for all tabs are saved when "Save Changes" is clicked, including settings that '
-		. 'are not in the currently active tab.') =%>
+			. 'are not in the currently active tab.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorFileManager.html.ep b/templates/HelpFiles/InstructorFileManager.html.ep
index 95daeebb66..e9f17426a6 100644
--- a/templates/HelpFiles/InstructorFileManager.html.ep
+++ b/templates/HelpFiles/InstructorFileManager.html.ep
@@ -3,78 +3,86 @@
 %
 <p>
 	<%= maketext('This allows for the viewing, downloading, uploading and other management '
-		. 'of files in the course. Select a file or set of files (using CTRL or SHIFT) and click '
-		. 'the desired button on the right. Many actions can only be done with a single file (like '
-		. 'view). Selecting a directory or set of files and clicking "Make Archive" allows the creation '
-		. 'of a compressed tar or zip file.') =%>
+			. 'of files in the course. Select a file or set of files (using CTRL or SHIFT) and click '
+			. 'the desired button on the right. Many actions can only be done with a single file (like '
+			. 'view). Selecting a directory or set of files and clicking "Make Archive" allows the creation '
+			. 'of a compressed tar or zip file.') =%>
 </p>
 <p>
 	<%= maketext('The list of files include regular files, directories (ending in a "/") '
-		. 'and links (ending in a "@").') =%>
+			. 'and links (ending in a "@").') =%>
 </p>
 <p>
 	<%= maketext('Below the file list is a button and options for uploading files. Click the "Choose File" '
-		. 'button, select the file, then click "Upload". Generally the "automatic" option on Format will '
-		. 'correctly pick the correct type of file. A single file or a compressed tar (.tgz) file can be '
-		. 'uploaded and if the options are selected, the archive is automatically unpacked and deleted.') =%>
+			. 'button, select the file, then click "Upload". Generally the "automatic" option on Format will '
+			. 'correctly pick the correct type of file. A single file or a compressed tar (.tgz) file can be '
+			. 'uploaded and if the options are selected, the archive is automatically unpacked and deleted.') =%>
 </p>
 <p>
 	<%= maketext('WeBWorK expects many files to be in certain locations. The following describe this. '
-	. 'Note that by default the File Manager shows the "templates" directory. Other directories mentioned '
-	. 'below are at the same level and need to be accessed by going up a directory by clicking the "^" button '
-	. 'above the file list.') =%>
+			. 'Note that by default the File Manager shows the "templates" directory. Other directories mentioned '
+			. 'below are at the same level and need to be accessed by going up a directory by clicking the "^" button '
+			. 'above the file list.') =%>
 </p>
 <h2><%= maketext('Locations of files:') %></h2>
 <dl>
 	<dt><%= maketext('Set definition (".def") files') %></dt>
 	<dd>
-		<%== maketext('These are stored in the templates directory. The format of '
-			. '<strong>Set Definition files</strong> is described in the <a [_1]>Set Definition specification</a>. '
-			. 'Set definition files are mainly useful for transferring set assignments from one course to another '
-			. 'and are created when exporting a problem set from the "Sets Manager". Each set definition file '
-			. 'contains a list of problems used and the dates and times. These definitions can be imported into the '
-			. 'current course.',
-			'href="https://wiki.openwebwork.org/wiki/Set_Definition_Files" target="Webworkdocs"') =%>
+		<%== maketext(
+			'These are stored in the templates directory. The format of '
+				. '<strong>Set Definition files</strong> is described in the <a [_1]>Set Definition specification</a>. '
+				. 'Set definition files are mainly useful for transferring set assignments from one course to another '
+				. 'and are created when exporting a problem set from the "Sets Manager". Each set definition file '
+				. 'contains a list of problems used and the dates and times. These definitions can be imported into the '
+				. 'current course.',
+			'href="https://wiki.openwebwork.org/wiki/Set_Definition_Files" target="Webworkdocs"'
+		) =%>
 	</dd>
 	<dt><%= maketext('Class list (".lst") files') %></dt>
 	<dd>
-		<%== maketext('The classlist files are stored in the templates directory and provide a convenient way to enter '
-			. 'a large number of students into your class. To view the format for <strong>ClassList files</strong> see '
-			. 'the <a [_1]>ClassList specification</a> or download the [_2] file and use it as a model. '
-			. 'ClassList files can be prepared using a spreadsheet and then saved as [_3] (comma separated values) '
-			. 'text files. However, to access as a classlist file, the file suffix needs to be changed to [_4], '
-			. 'which can be done with the "Rename" button.',
+		<%== maketext(
+			'The classlist files are stored in the templates directory and provide a convenient way to enter '
+				. 'a large number of students into your class. To view the format for <strong>ClassList files</strong> see '
+				. 'the <a [_1]>ClassList specification</a> or download the [_2] file and use it as a model. '
+				. 'ClassList files can be prepared using a spreadsheet and then saved as [_3] (comma separated values) '
+				. 'text files. However, to access as a classlist file, the file suffix needs to be changed to [_4], '
+				. 'which can be done with the "Rename" button.',
 			'href="https://wiki.openwebwork.org/wiki/Classlist_Files#Format_of_classlist_files" target="Webworkdocs"',
-			'<code>demoCourse.lst</code>', '<code>.csv</code>', '<code>.lst</code>') =%>
+			'<code>demoCourse.lst</code>',
+			'<code>.csv</code>',
+			'<code>.lst</code>'
+		) =%>
 	</dd>
 	<dt><%= maketext('Scoring (".csv") files') %></dt>
 	<dd>
-		<%== maketext('The scoring files are stored in the scoring directory and are produced using the "Scoring Tools" '
-			. 'page or the scoring command in the "Instructor Tools" module. These files can be downloaded, modified '
-			. 'in a spreadsheet (for example, to add midterm scores) and then uploaded again to the scoring directory '
-			. 'to be merged with email messages. (Use a new file name, other than [_1], when '
-			. 'uploading to prevent the scoring module from overwriting an uploaded file.)',
-			'<code>courseName_totals.csv</code>') =%>
+		<%== maketext(
+			'The scoring files are stored in the scoring directory and are produced using the "Scoring Tools" '
+				. 'page or the scoring command in the "Instructor Tools" module. These files can be downloaded, modified '
+				. 'in a spreadsheet (for example, to add midterm scores) and then uploaded again to the scoring directory '
+				. 'to be merged with email messages. (Use a new file name, other than [_1], when '
+				. 'uploading to prevent the scoring module from overwriting an uploaded file.)',
+			'<code>courseName_totals.csv</code>'
+		) =%>
 	</dd>
 	<dt><%= maketext('Problem (".pg") files') %></dt>
 	<dd>
 		<%= maketext('These are the files from which problems are generated and are located in the templates '
-			. 'directory or in subdirectories. They can be edited directly using the "Edit" link on each problem '
-			. 'page or from the "Sets Manager". The File Manager allows you to upload or download these files. 	'
-			. 'Directories that start with "set" contain pg files and are generated when exporting a problem set in '
-			. 'which there are local versions of a problem.') =%>
+				. 'directory or in subdirectories. They can be edited directly using the "Edit" link on each problem '
+				. 'page or from the "Sets Manager". The File Manager allows you to upload or download these files. 	'
+				. 'Directories that start with "set" contain pg files and are generated when exporting a problem set in '
+				. 'which there are local versions of a problem.') =%>
 	</dd>
 	<dt><%= maketext('html directory') %></dt>
 	<dd>
 		<%= maketext('This directory is accessible from the web. You can use it to store html documents or image '
-			. 'documents that are used by the course. Do not store private information in this directory or in any '
-			. 'subdirectory thereof. These documents can be linked to from within problems using the htmlLink '
-			. 'macro.') =%>
+				. 'documents that are used by the course. Do not store private information in this directory or in any '
+				. 'subdirectory thereof. These documents can be linked to from within problems using the htmlLink '
+				. 'macro.') =%>
 	</dd>
 	<dt><%= maketext('templates/email directory') %></dt>
 	<dd>
 		<%= maketext('This is where email messages and templates are saved. You can upload or download files '
-			. 'in this directory if you wish to save the files for later.') =%>
+				. 'in this directory if you wish to save the files for later.') =%>
 	</dd>
 	<dt><%= maketext('templates/macros directory') %></dt>
 	<dd>
diff --git a/templates/HelpFiles/InstructorIndex.html.ep b/templates/HelpFiles/InstructorIndex.html.ep
index 6284ea3549..084cd2e471 100644
--- a/templates/HelpFiles/InstructorIndex.html.ep
+++ b/templates/HelpFiles/InstructorIndex.html.ep
@@ -3,23 +3,23 @@
 %
 <p>
 	<%= maketext('This page is a collection of tools to modify users and sets.  These tools are shortcuts for '
-		. 'common actions that allow selecting multiple users or sets to act on at once.  Because multiple users '
-		. 'and sets can be acted on at the same time, it is often more efficient to use this page when modifying '
-		. 'multiple items.  For example, you can change the close date for several users for an assignment. '
-		. 'This page also gives access to "Edit assignments and dates for one user", '
-		. 'which can be used to access settings for all sets including test versions for that user.') =%>
+			. 'common actions that allow selecting multiple users or sets to act on at once.  Because multiple users '
+			. 'and sets can be acted on at the same time, it is often more efficient to use this page when modifying '
+			. 'multiple items.  For example, you can change the close date for several users for an assignment. '
+			. 'This page also gives access to "Edit assignments and dates for one user", '
+			. 'which can be used to access settings for all sets including test versions for that user.') =%>
 </p>
 <p>
 	<%= maketext('Use the "Users" and "Sets" forms to select which users and sets to act on. '
-		. 'In both cases, one can select the sort field, the format of the display list, and the filter. '
-		. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
-		. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
-		. 'list will be the union of all results lists from the multiple filters.') =%>
+			. 'In both cases, one can select the sort field, the format of the display list, and the filter. '
+			. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
+			. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
+			. 'list will be the union of all results lists from the multiple filters.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Multiple users and sets can be selected using ctrl-click or shift-click.  The action buttons are '
-		. 'grouped into three categories.  The first is a set of actions that act on the selected users, the second is '
-		. 'a set of actions for acting on a combination of sets and users, and the third is a set of actions that act '
-		. 'on the selected sets.  If an invalid number of users or sets are selected, the action will not be '
-		. 'performed, and an error message will be placed on the page.') =%>
+			. 'grouped into three categories.  The first is a set of actions that act on the selected users, the second is '
+			. 'a set of actions for acting on a combination of sets and users, and the third is a set of actions that act '
+			. 'on the selected sets.  If an invalid number of users or sets are selected, the action will not be '
+			. 'performed, and an error message will be placed on the page.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorJobManager.html.ep b/templates/HelpFiles/InstructorJobManager.html.ep
index f9403e5c06..5e1f505438 100644
--- a/templates/HelpFiles/InstructorJobManager.html.ep
+++ b/templates/HelpFiles/InstructorJobManager.html.ep
@@ -3,15 +3,15 @@
 %
 <p>
 	<%= maketext('This page allows one to view and manage jobs in job queue. Note that completed jobs are '
-		. 'automatically removed from the job queue after two days. So there is no real need to delete jobs. '
-		. 'The importance of this page is to see the status of recently completed or in progress jobs.') =%>
+			. 'automatically removed from the job queue after two days. So there is no real need to delete jobs. '
+			. 'The importance of this page is to see the status of recently completed or in progress jobs.') =%>
 </p>
 <h2><%= maketext('Job Table Column Descriptions:') %></h2>
 <dl>
 	<dt><%= maketext('Id') %></dt>
 	<dd>
 		<%= maketext('The job id is an automatically incremented integer.  It is used internally to uniquely identify '
-			. 'jobs.  It is also used to reference jobs in messages on this page.') =%>
+				. 'jobs.  It is also used to reference jobs in messages on this page.') =%>
 	</dd>
 	<dt><%= maketext('Task') %></dt>
 	<dd>
@@ -24,23 +24,23 @@
 	<dt><%= maketext('Started') %></dt>
 	<dd>
 		<%= maketext('The time that execution of the job begins. If execution of the job has not started, '
-			. 'then this will be empty.') =%>
+				. 'then this will be empty.') =%>
 	</dd>
 	<dt><%= maketext('Finished') %></dt>
 	<dd>
 		<%= maketext('The time that execution of the job completes. If execution of the job has not yet completed, '
-			. 'then this will be empty.') =%>
+				. 'then this will be empty.') =%>
 	</dd>
 	<dt><%= maketext('State') %></dt>
 	<dd>
 		<%= maketext('The current state of the job.  This will be one of "inactive", "active", "finished", or '
-			. '"failed". If a job is "inactive" it means that the job has been added to the queue, but execution '
-			. 'of the job has not yet started. If a job is "active" it means that the job is currently being '
-			. 'executed. If a job is "finished" it means that the execution of the job has successfully '
-			. 'completed. If a job is "failed" it means that the execution of job has completed, but there were '
-			. 'errors in the execution of the job. If the job is in the "finished" or "failed" state, then there '
-			. 'will also be a button which when clicked will show a dialog containing information about what happened '
-			. 'when the job was executed.') =%>
+				. '"failed". If a job is "inactive" it means that the job has been added to the queue, but execution '
+				. 'of the job has not yet started. If a job is "active" it means that the job is currently being '
+				. 'executed. If a job is "finished" it means that the execution of the job has successfully '
+				. 'completed. If a job is "failed" it means that the execution of job has completed, but there were '
+				. 'errors in the execution of the job. If the job is in the "finished" or "failed" state, then there '
+				. 'will also be a button which when clicked will show a dialog containing information about what happened '
+				. 'when the job was executed.') =%>
 	</dd>
 </dl>
 %
@@ -49,18 +49,18 @@
 	<dt><%= maketext('Filter') %></dt>
 	<dd>
 		<%= maketext('Filter jobs that are shown in the job table. Jobs can be filtered by Id, Task, or State, '
-			. 'or by selection.') =%>
+				. 'or by selection.') =%>
 	</dd>
 	<dt><%= maketext('Sort') %></dt>
 	<dd>
 		<%= maketext('Sort jobs in the table by fields. The jobs in the table can also be sorted by clicking on '
-			. 'column headers in the table.') =%>
+				. 'column headers in the table.') =%>
 	</dd>
 	<dt><%= maketext('Delete') %></dt>
 	<dd>
 		<%= maketext('Delete selected jobs.  Note that jobs that are in the "active" state cannot be deleted. '
-			. 'Jobs that are in the "inactive" state can be deleted, but it is possible that by the time the request '
-			. 'to delete the job occurs the job may have transitioned into the "active" state.  In that case the job '
-			. 'will not be deleted. Jobs that are in the "finished" or "failed" states can always be deleted.') =%>
+				. 'Jobs that are in the "inactive" state can be deleted, but it is possible that by the time the request '
+				. 'to delete the job occurs the job may have transitioned into the "active" state.  In that case the job '
+				. 'will not be deleted. Jobs that are in the "finished" or "failed" states can always be deleted.') =%>
 	</dd>
 </dl>
diff --git a/templates/HelpFiles/InstructorLTIUpdate.html.ep b/templates/HelpFiles/InstructorLTIUpdate.html.ep
index 52b9d2bc7f..3d5400acfb 100644
--- a/templates/HelpFiles/InstructorLTIUpdate.html.ep
+++ b/templates/HelpFiles/InstructorLTIUpdate.html.ep
@@ -3,14 +3,14 @@
 %
 <p class="m-0">
 	<%= maketext('This page gives information about mass LTI grade updates '
-		. 'and allows you to trigger a grade update. ') =%>
+			. 'and allows you to trigger a grade update. ') =%>
 	% if ($ce->{LTIGradeMode} eq 'course') {
 		<%= maketext('You may trigger a grade update for all users or just one user.') =%>
 	% } elsif ($ce->{LTIGradeMode} eq 'homework') {
 		<%= maketext('You may trigger a grade update for all users or just one user, '
-			. 'for all sets or just one set. When a user is selected, the menu '
-			. 'for sets is updated to only allow selecting sets assigned to the '
-			. 'selected user. Similarly when a set is selected, the user menu '
-			. 'is updated to only allow selecting valid users.') =%>
+				. 'for all sets or just one set. When a user is selected, the menu '
+				. 'for sets is updated to only allow selecting sets assigned to the '
+				. 'selected user. Similarly when a set is selected, the user menu '
+				. 'is updated to only allow selecting valid users.') =%>
 	% }
 </p>
diff --git a/templates/HelpFiles/InstructorPGProblemEditor.html.ep b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
index f8db97adfa..4e90366426 100644
--- a/templates/HelpFiles/InstructorPGProblemEditor.html.ep
+++ b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
@@ -3,7 +3,7 @@
 %
 <p>
 	<%= maketext('This page allows one to edit the contents of PG problem files as well '
-		. 'as set headers and other files.') =%>
+			. 'as set headers and other files.') =%>
 </p>
 <h2><%= maketext('Features:') %></h2>
 <dl class="list-group">
@@ -12,7 +12,7 @@
 		<dl>
 			<dt>
 				<%= link_to maketext('Sample Problems') => url_for('sample_problem_index'),
-					target => 'techniques_window' =%>
+					target                              => 'techniques_window' =%>
 			</dt>
 			<dd><%= maketext('Sample problem code with documentation.') %></dd>
 			<dt>
@@ -24,16 +24,19 @@
 			<dt><%= link_to maketext('POD') => url_for('pod_index'), target => 'pod_docs' =%></dt>
 			<dd>
 				<%= maketext('This link gives details for many macros. It links to documentation embedded in the '
-					. 'macro files themselves.') =%>
+						. 'macro files themselves.') =%>
 			</dd>
 			<dt>
-				<%= link_to PGML => '#', class  => 'pgml-lab', target => 'PGML',
+				<%= link_to
+					PGML   => '#',
+					class  => 'pgml-lab',
+					target => 'PGML',
 					data => { source => url_escape(readFile("$ce->{webworkDirs}{assets}/pg/PGMLLab/PGML-lab.pg")) } =%>
 			</dt>
 			<dd>
-				<%= maketext(
-					'This links to a WeBWorK "problem" which allows you to try out fragments of PGML code.'
-				) =%>
+				<%=
+					maketext('This links to a WeBWorK "problem" which allows you to try out fragments of PGML code.')
+				=%>
 			</dd>
 			<dt>
 				<a href="https://wiki.openwebwork.org/wiki/Category:Authors" target="author_info">
@@ -46,7 +49,8 @@
 	<dt><%= maketext('Text Editor Window') %></dt>
 	<dd class="list-group-item">
 		<%= maketext('This is where you edit the code of the problem. Type Ctrl-Enter while this window '
-			. 'has focus to re-render the problem. In addition, the following keyboard shortcuts are available.') =%>
+				. 'has focus to re-render the problem. In addition, the following keyboard shortcuts are available.'
+		) =%>
 		<table class="table table-bordered table-sm align-middle w-auto mb-0 mx-auto">
 			<thead>
 				<tr>
@@ -61,15 +65,17 @@
 					<td>Option-Shift-m</td>
 					<td>
 						<%= maketext('Enable or disable tab-focus mode. When tab-focus mode is off, pressing Tab '
-							. 'inside the editor window indents the current line. When tab-focus mode is on '
-							. 'Tab and Shift-Tab move focus out of the editor window.') %>
+								. 'inside the editor window indents the current line. When tab-focus mode is on '
+								. 'Tab and Shift-Tab move focus out of the editor window.') %>
 					</td>
+				</tr>
+
 				<tr>
 					<td>Ctrl-Shift-[</td>
 					<td>Cmd-Option-[</td>
 					<td>
 						<%= maketext('Fold the region that begins on the current line. Triangles in the gutter '
-						. 'next to line numbers indicate which regions can be folded.') %>
+								. 'next to line numbers indicate which regions can be folded.') %>
 					</td>
 				</tr>
 				<tr>
@@ -77,9 +83,21 @@
 					<td>Cmd-Option-]</td>
 					<td><%= maketext('Unfold the region that begins on the current line.') %></td>
 				</tr>
-				<tr><td>Ctrl-Alt-[</td><td>Ctrl-Option-[</td><td><%= maketext('Fold all regions.') %></td></tr>
-				<tr><td>Ctrl-Alt-]</td><td>Ctrl-Option-]</td><td><%= maketext('Unfold all regions.') %></td></tr>
-				<tr><td>Ctrl-/</td><td>Cmd-/</td><td><%= maketext('Toggle comment.') %></td></tr>
+				<tr>
+					<td>Ctrl-Alt-[</td>
+					<td>Ctrl-Option-[</td>
+					<td><%= maketext('Fold all regions.') %></td>
+				</tr>
+				<tr>
+					<td>Ctrl-Alt-]</td>
+					<td>Ctrl-Option-]</td>
+					<td><%= maketext('Unfold all regions.') %></td>
+				</tr>
+				<tr>
+					<td>Ctrl-/</td>
+					<td>Cmd-/</td>
+					<td><%= maketext('Toggle comment.') %></td>
+				</tr>
 				<tr>
 					<td>Shift-Alt-a</td>
 					<td>Shift-Option-a</td>
@@ -93,12 +111,12 @@
 			</tbody>
 		</table>
 		<%= maketext('There are resize grips that can be moved to resize the editor windows.  This can be done by '
-			. 'clicking and dragging or by focusing the resize grip and using the arrow keys. If the resize grip is '
-			. 'focused and the Ctrl key (Ctrl + Cmd keys on Mac) is held down then the size is only changed by one '
-			. 'pixel for each arrow key press, and if the Alt key (Option key for Mac) is held down then the size is '
-			. 'changed by 50 pixels for each arrow key press. With no modifier key the size is changed by 20 pixels. '
-			. 'Double clicking on a resize grip or pressing Enter or Space while a resize grip is focused resets the '
-			. 'windows to their default sizes.') =%>
+				. 'clicking and dragging or by focusing the resize grip and using the arrow keys. If the resize grip is '
+				. 'focused and the Ctrl key (Ctrl + Cmd keys on Mac) is held down then the size is only changed by one '
+				. 'pixel for each arrow key press, and if the Alt key (Option key for Mac) is held down then the size is '
+				. 'changed by 50 pixels for each arrow key press. With no modifier key the size is changed by 20 pixels. '
+				. 'Double clicking on a resize grip or pressing Enter or Space while a resize grip is focused resets the '
+				. 'windows to their default sizes.') =%>
 	</dd>
 	<dt><%= maketext('Text Editor Options') %></dt>
 	<dd class="list-group-item">
@@ -108,19 +126,19 @@
 			<dt><%= maketext('Key Map') %></dt>
 			<dd>
 				<%= maketext('The key maps that are available are "default", "emacs", "sublime", and "vim". The '
-					. '"default" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, '
-					. 'Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the "emacs" '
-					. ' or "vim" text editors then you may choose to use one of those key maps instead.') =%>
+						. '"default" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, '
+						. 'Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the "emacs" '
+						. ' or "vim" text editors then you may choose to use one of those key maps instead.') =%>
 			</dd>
 			<dt><%= maketext('Enable Spell Checking') %></dt>
 			<dd>
 				<%= maketext('Spell check the text of the file that your are editing. Note that there will be many '
-					. 'spelling errors in the code parts of your file.') =%>
+						. 'spelling errors in the code parts of your file.') =%>
 			</dd>
 			<dt><%= maketext('Force RTL') %></dt>
 			<dd>
 				<%= maketext('Force the editor to display text from right-to-left. '
-					. '(Note that this does not persist when reloading the page.)') =%>
+						. '(Note that this does not persist when reloading the page.)') =%>
 			</dd>
 		</dl>
 	</dd>
@@ -132,10 +150,10 @@
 	<dd>
 		<p>
 			<%= maketext('Render or re-render the problem, course info file, or set header being edited. This does not '
-				. 'change the permanent file on the disk. You can view different versions of the same problem by '
-				. 'changing the seed. You can also change the manner in which the mathematics is typeset. If "Open in '
-				. 'new window" is checked, then the problem will open in a new tab or window showing the problem as it '
-				. 'will be rendered for students in the set.') =%>
+					. 'change the permanent file on the disk. You can view different versions of the same problem by '
+					. 'changing the seed. You can also change the manner in which the mathematics is typeset. If "Open in '
+					. 'new window" is checked, then the problem will open in a new tab or window showing the problem as it '
+					. 'will be rendered for students in the set.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all file types except hardcopy header files.') =%>
@@ -146,19 +164,19 @@
 	<dd>
 		<p>
 			<%= maketext('Generate a hardcopy of the problem being edited. This does not change the permanent file on '
-				. 'the disk. You can generate a hardcopy for different versions of the same problem by changing the '
-				. 'seed. You can also change the format to "PDF" or "TeX Source". If "PDF" is selected, then a PDF '
-				. 'file will be generated for download, unless there are errors. If errors occur or "TeX Source" is '
-				. 'selected, then a zip file will be generated for download that contains the TeX source file and '
-				. 'resources needed for generating the PDF file using LaTeX.') =%>
+					. 'the disk. You can generate a hardcopy for different versions of the same problem by changing the '
+					. 'seed. You can also change the format to "PDF" or "TeX Source". If "PDF" is selected, then a PDF '
+					. 'file will be generated for download, unless there are errors. If errors occur or "TeX Source" is '
+					. 'selected, then a zip file will be generated for download that contains the TeX source file and '
+					. 'resources needed for generating the PDF file using LaTeX.') =%>
 		</p>
 		<p>
 			<%= maketext('You can also click "Edit Selected Theme" to edit a hardcopy theme.  The new theme will be '
-				. 'saved to the templates/hardcopyThemes folder.') =%>
+					. 'saved to the templates/hardcopyThemes folder.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is only available for PG problem files, set header files, and hardcopy header '
-				. 'files.') =%>
+					. 'files.') =%>
 		</p>
 	</dd>
 
@@ -166,20 +184,20 @@
 	<dd>
 		<p>
 			<%= maketext('Three code maintenance tools can be utilized. First, the code can be reformatted using '
-				. 'perltidy. Using perltidy will change the code in the editor window, and save changes to the '
-				. 'temporary file. In some cases (if the code contains backslashes or double tildes) this can result '
-				. 'in odd spacing in the code. Second the code can be converted to PGML. This changes the code in text '
-				. 'blocks to use PGML features. Generally the conversion of much of the formatting and LaTeX is '
-				. 'performed correctly. However, answer blanks need attention. In any case, make sure to inspect the '
-				. 'formatted code, and edit further or revert if needed. Third, the code can be analyzed by the "PG '
-				. 'Critic." This checks that the code does not use old or deprecated features of PG and conforms to '
-				. 'current best-practices in problem authoring, and offers suggestions on how to fix issues that are '
-				. 'found.') =%>
+					. 'perltidy. Using perltidy will change the code in the editor window, and save changes to the '
+					. 'temporary file. In some cases (if the code contains backslashes or double tildes) this can result '
+					. 'in odd spacing in the code. Second the code can be converted to PGML. This changes the code in text '
+					. 'blocks to use PGML features. Generally the conversion of much of the formatting and LaTeX is '
+					. 'performed correctly. However, answer blanks need attention. In any case, make sure to inspect the '
+					. 'formatted code, and edit further or revert if needed. Third, the code can be analyzed by the "PG '
+					. 'Critic." This checks that the code does not use old or deprecated features of PG and conforms to '
+					. 'current best-practices in problem authoring, and offers suggestions on how to fix issues that are '
+					. 'found.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is only available for problem files, set header files, and hardcopy header '
-				. 'files. In addition, only the option to reformat code with perltidy is available for set header '
-				. 'files and hardcopy header files.') =%>
+					. 'files. In addition, only the option to reformat code with perltidy is available for set header '
+					. 'files and hardcopy header files.') =%>
 		</p>
 	</dd>
 
@@ -187,19 +205,19 @@
 	<dd>
 		<p>
 			<%= maketext('Save the contents of the editor window to the file on disk and re-render the problem. If '
-				. '"Open in new window" is checked, then the problem will open in a new tab or window showing the '
-				. 'problem as it will be rendered for students in the set. If "Create backup" is checked then a backup '
-				. 'of the current file on disk will be created before overwriting it with the contents of the editor '
-				. 'window. If a backup already exists, then a "Delete oldest backup" check box will be present. If '
-				. 'that is checked, then the oldest backup will be deleted when "Save" is clicked. These backups can '
-				. 'be reverted to and managed on the "Revert" tab.') =%>
+					. '"Open in new window" is checked, then the problem will open in a new tab or window showing the '
+					. 'problem as it will be rendered for students in the set. If "Create backup" is checked then a backup '
+					. 'of the current file on disk will be created before overwriting it with the contents of the editor '
+					. 'window. If a backup already exists, then a "Delete oldest backup" check box will be present. If '
+					. 'that is checked, then the oldest backup will be deleted when "Save" is clicked. These backups can '
+					. 'be reverted to and managed on the "Revert" tab.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all files, but is only active for files in the course templates '
-				. 'directory that are writable by the server. For files outside of the course templates directory, '
-				. 'such as sample problems or a new problem template, or files that are not writable by the server, '
-				. 'such as OPL problems, first use the "Save As" tab to save to a file in the course templates '
-				. 'directory.') =%>
+					. 'directory that are writable by the server. For files outside of the course templates directory, '
+					. 'such as sample problems or a new problem template, or files that are not writable by the server, '
+					. 'such as OPL problems, first use the "Save As" tab to save to a file in the course templates '
+					. 'directory.') =%>
 		</p>
 	</dd>
 
@@ -207,32 +225,32 @@
 	<dd>
 		<p>
 			<%= maketext(q{Makes a new copy of the file you are editing at the location relative to the course's }
-				. 'templates (~[TMPL~]) directory.') =%>
+					. 'templates (~[TMPL~]) directory.') =%>
 		</p>
 		<p>
 			<%= maketext('For problem files you may choose to replace the current problem in the current set, '
-				. 'append to the end of an existing set as a new problem, or create a problem that is not attached '
-				. 'to a problem set.') =%>
+					. 'append to the end of an existing set as a new problem, or create a problem that is not attached '
+					. 'to a problem set.') =%>
 		</p>
 		<p>
 			<%= maketext('For set or hardcopy header files you may choose to set the file as the same kind of header '
-				. 'for an existing problem set, or create a header file that is not attached to a problem set.') =%>
+					. 'for an existing problem set, or create a header file that is not attached to a problem set.') =%>
 		</p>
 		<p>
 			<%= maketext('When saving a problem in a new location (directory), by default all auxiliary files, such '
-				. 'as images, or other files that do not end in ".pg", will also be copied to the new location.  To '
-				. 'stop this behavior, uncheck the "Copy auxiliary files" option.') =%>
+					. 'as images, or other files that do not end in ".pg", will also be copied to the new location.  To '
+					. 'stop this behavior, uncheck the "Copy auxiliary files" option.') =%>
 		</p>
 		<p>
 			<%= maketext('You may want to create an unattached problem if you are using the current problem as a model '
-				. 'for a new problem. You can add the new file to a homework set from the Library Browser or via the '
-				. 'set detail page of the "Sets Manager".') =%>
+					. 'for a new problem. You can add the new file to a homework set from the Library Browser or via the '
+					. 'set detail page of the "Sets Manager".') =%>
 		</p>
 		<p>
 			<%= maketext('If the original problem cannot be edited than the path name must be changed in order to be '
-				. 'allowed to save the problem. Adding "local/" to the beginning of the original path is the default '
-				. 'solution. All locally created and edited files will then appear in a subdirectory named '
-				. '"local".') =%>
+					. 'allowed to save the problem. Adding "local/" to the beginning of the original path is the default '
+					. 'solution. All locally created and edited files will then appear in a subdirectory named '
+					. '"local".') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all file types except for the course information file.') =%>
@@ -243,15 +261,15 @@
 	<dd>
 		<p>
 			<%= maketext('Add this problem as the last problem of an existing set, either as a problem, as the set '
-				. 'header (the text that appears on the home page of a homework set), or the hardcopy header (the text '
-				. 'that appears in the beginning of hardcopy for a set). You can rearrange the order of the problems '
-				. 'later using the "Sets Manager".') =%>
+					. 'header (the text that appears on the home page of a homework set), or the hardcopy header (the text '
+					. 'that appears in the beginning of hardcopy for a set). You can rearrange the order of the problems '
+					. 'later using the "Sets Manager".') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is only available for problem files, set header files, and hardcopy header files, '
-				. 'but is not active for a new problem template or a sample problem. To append a new problem template '
-				. 'or sample problem to a set, first use "Save As" to save the file to the course templates '
-				. 'directory.') =%>
+					. 'but is not active for a new problem template or a sample problem. To append a new problem template '
+					. 'or sample problem to a set, first use "Save As" to save the file to the course templates '
+					. 'directory.') =%>
 		</p>
 	</dd>
 
@@ -259,11 +277,11 @@
 	<dd>
 		<p>
 			<%= maketext('Reverts to the copy of the file saved on the disk or to a backup file. All unsaved editing '
-				. 'changes will be lost. You may also delete backups that have been made with this tab.') =%>
+					. 'changes will be lost. You may also delete backups that have been made with this tab.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all files, but is only active when a temporary file or backup file '
-				. 'exists.') =%>
+					. 'exists.') =%>
 		</p>
 	</dd>
 </dl>
diff --git a/templates/HelpFiles/InstructorProblemGrader.html.ep b/templates/HelpFiles/InstructorProblemGrader.html.ep
index b9dfdd1ea1..f666b23f0b 100644
--- a/templates/HelpFiles/InstructorProblemGrader.html.ep
+++ b/templates/HelpFiles/InstructorProblemGrader.html.ep
@@ -3,14 +3,14 @@
 %
 <p>
 	<%= maketext('This page is for manually grading a problem for all assigned students.  The table of students '
-		. 'shows their last answers, percent score, and feedback comment.  The "Save" button is located below the '
-		. q(table to save any changes.  Each student's name links to that student's problem and opens up the )
-		. 'single problem grader, which grades a single student at a time.') =%>
+			. 'shows their last answers, percent score, and feedback comment.  The "Save" button is located below the '
+			. q(table to save any changes.  Each student's name links to that student's problem and opens up the )
+			. 'single problem grader, which grades a single student at a time.') =%>
 </p>
 <p class="m-0">
 	<%= maketext('The problem is shown at the top with the seed and answers of the selected student.  Use the drop '
-		. q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set )
-		. 'the score to 100%.  The feedback comment can contain LaTeX formulas using the deliminator "\\\\( ... \\)" '
-		. q(for math mode, and is placed above the student's problem.  Students can access the feedback comments by )
-		. 'going to the page for the associated set and problem number.') =%>
+			. q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set )
+			. 'the score to 100%.  The feedback comment can contain LaTeX formulas using the deliminator "\\\\( ... \\)" '
+			. q(for math mode, and is placed above the student's problem.  Students can access the feedback comments by )
+			. 'going to the page for the associated set and problem number.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorProblemSetDetail.html.ep b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
index 6d68ced690..9d9f916482 100644
--- a/templates/HelpFiles/InstructorProblemSetDetail.html.ep
+++ b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
@@ -22,21 +22,21 @@
 	<dt><%= maketext('Save Changes') %></dt>
 	<dd>
 		<%== maketext('This button is present both at top and the bottom of the page. Any and all changes made to any '
-			. 'part of the set will be saved. When editing the set for one or more students, you can choose to '
-			. 'override the default value (defined for the set in general) by providing a value. If a value is not '
-			. 'provided then the default value for the set will be used for the users currently being edited.') =%>
+				. 'part of the set will be saved. When editing the set for one or more students, you can choose to '
+				. 'override the default value (defined for the set in general) by providing a value. If a value is not '
+				. 'provided then the default value for the set will be used for the users currently being edited.') =%>
 	</dd>
 
 	<dt><%= maketext('Reset Form') %></dt>
 	<dd>
 		<%= maketext('This button is also present both at top and the bottom of the page. Discards all changes, '
-			. 'reloading the page by re-reading the database information for this set.') =%>
+				. 'reloading the page by re-reading the database information for this set.') =%>
 	</dd>
 
 	<dt><%= maketext('Renumber Problems') %></dt>
 	<dd>
 		<%= maketext('Renumber problems consecutively starting from 1. This renumbering is not saved until '
-			. '"Save Changes" is clicked.') =%>
+				. '"Save Changes" is clicked.') =%>
 	</dd>
 
 	<dt><%= maketext('Render All') %></dt>
@@ -48,28 +48,28 @@
 	<dt><%= maketext('Expand All Details') %></dt>
 	<dd>
 		<%= maketext('Expand problem details that have been collapsed. Note that the details of a single problem can '
-			. 'be expanded by clicking on the down arrow to the right of the problem source file.') =%>
+				. 'be expanded by clicking on the down arrow to the right of the problem source file.') =%>
 	</dd>
 
 	<dt><%= maketext('Collapse All Details') %></dt>
 	<dd>
 		<%= maketext('Collapse problem details to the top row of information about a problem. Note that the details '
-			. 'of a single problem can be collapsed by clicking on the up arrow to the right of the problem source '
-			. 'file.') =%>
+				. 'of a single problem can be collapsed by clicking on the up arrow to the right of the problem source '
+				. 'file.') =%>
 	</dd>
 
 	<dt><%= maketext('Expand All Nesting') %></dt>
 	<dd>
 		<%= maketext('Only present for JITAR sets. Expand JITAR nested problem groups that have been collapsed. Note '
-			. 'that the nesting of a single problem group can be expanded by clicking on the right arrow to the right '
-			. 'of the problem number.') =%>
+				. 'that the nesting of a single problem group can be expanded by clicking on the right arrow to the right '
+				. 'of the problem number.') =%>
 	</dd>
 
 	<dt><%= maketext('Collapse All Nesting') %></dt>
 	<dd>
 		<%= maketext('Only present for JITAR sets. Collapse JITAR nesting problem groups to the top row of information '
-			. 'about a problem. Note that the nesting of a single problem group can be collapsed by clicking on the '
-			. 'down arrow to the right of the problem number.') =%>
+				. 'about a problem. Note that the nesting of a single problem group can be collapsed by clicking on the '
+				. 'down arrow to the right of the problem number.') =%>
 	</dd>
 
 	<dt><%= maketext('Display Mode') %></dt>
@@ -78,21 +78,21 @@
 	<dt><%= maketext('Automatically render problems on page load.') %></dt>
 	<dd>
 		<%= maketext('Automatically render all problems in the set on this page when "Save Changes" or "Reset Form" '
-			. 'is clicked.') =%>
+				. 'is clicked.') =%>
 	</dd>
 
 	<dt><%= maketext('Force problems to be numbered consecutively from one') %></dt>
 	<dd>
 		<%= maketext('Renumber problems in the set consecutively starting from one. In the process of deleting '
-			. 'problems, the numbering can be made non-consecutive. This is useful to clean up the problem '
-			. 'numbering.') =%>
+				. 'problems, the numbering can be made non-consecutive. This is useful to clean up the problem '
+				. 'numbering.') =%>
 	</dd>
 
 	<dt><%= maketext('Add n blank problem template(s) to the end of homework set.') %></dt>
 	<dd>
 		<%= maketext('Adds new template problems to the set when the set is saved. You can modify the template '
-			. 'to create your own problem, by clicking on the "Edit Problem" link and saving to some new '
-			. 'file, e.g. "myNewProblem.pg".') =%>
+				. 'to create your own problem, by clicking on the "Edit Problem" link and saving to some new '
+				. 'file, e.g. "myNewProblem.pg".') =%>
 	</dd>
 </dl>
 
@@ -101,48 +101,48 @@
 	<dt><%= maketext('Reordering Problems') %></dt>
 	<dd>
 		<%= maketext('You can reorder problems by clicking on the arrow icon and dragging the problem. You will see a '
-			. 'box showing you where the problem will be placed. When problems are reordered any holes in the '
-			. 'numbering will be filled in.') =%>
+				. 'box showing you where the problem will be placed. When problems are reordered any holes in the '
+				. 'numbering will be filled in.') =%>
 	</dd>
 
 	<dt><%= maketext('Deleting Problems') %></dt>
 	<dd>
 		<%= maketext('You can delete problems by clicking the "Delete it?" check box and saving. If the set is already '
-			. 'active it is recommended that you instead use the "Mark Correct?" problem to mark a particular problem '
-			. 'correct for all students.') =%>
+				. 'active it is recommended that you instead use the "Mark Correct?" problem to mark a particular problem '
+				. 'correct for all students.') =%>
 	</dd>
 
 	<dt><%= maketext('Rendering Problems') %></dt>
 	<dd>
 		<%= maketext('You can render a problem by clicking the "Render Problem" icon to the right of the problem '
-		. 'number. The display mode used to render the problem is chosen using the drop down menu. You can render all '
-		. 'problems using the "Render All" button. "Hide All" will hide all rendered problems. It is also useful to '
-		. 'collapse problem details when doing this, as it makes it easier to drag problems around.') =%>
+				. 'number. The display mode used to render the problem is chosen using the drop down menu. You can render all '
+				. 'problems using the "Render All" button. "Hide All" will hide all rendered problems. It is also useful to '
+				. 'collapse problem details when doing this, as it makes it easier to drag problems around.') =%>
 	</dd>
 
 	<dt><%= maketext('Editing Problems') %></dt>
 	<dd>
 		<%= maketext('You can edit a problem by clicking the "Edit Problem" icon to the right of the problem number. '
-			. 'This will open the problem in the PG problem editor in a new tab or window.') =%>
+				. 'This will open the problem in the PG problem editor in a new tab or window.') =%>
 	</dd>
 
 	<dt><%= maketext('Viewing Problems in a New Window') %></dt>
 	<dd>
 		<%= maketext('If you click on the "Open in New Window" icon to the right of the problem number, then the '
-			. 'problem will open in the actual homework set in a new tab or window.') =%>
+				. 'problem will open in the actual homework set in a new tab or window.') =%>
 	</dd>
 
 	<dt><%= maketext('Grading Problems') %></dt>
 	<dd>
 		<%= maketext('If you click on the "Grade Problem" icon to the right of the problem number, then the problem '
-			. 'will open in the manual problem grader. This page shows the rendered problem and lists all students '
-			. 'assigned to the set and the last answer the students entered for the problem. You can then change the '
-			. 'recorded scores for students on this problem and provide instructor feedback comments.') =%>
+				. 'will open in the manual problem grader. This page shows the rendered problem and lists all students '
+				. 'assigned to the set and the last answer the students entered for the problem. You can then change the '
+				. 'recorded scores for students on this problem and provide instructor feedback comments.') =%>
 	</dd>
 
 	<dt><%= maketext('Problem Paths') =%></dt>
 	<dd>
 		<%= maketext('All of the paths for problem files are relative to the templates directory of the current '
-			. 'course. You can access this directory "directly" using the File Manager page.') =%>
+				. 'course. You can access this directory "directly" using the File Manager page.') =%>
 	</dd>
 </dl>
diff --git a/templates/HelpFiles/InstructorProblemSetList.html.ep b/templates/HelpFiles/InstructorProblemSetList.html.ep
index 7504db7150..3f9648876d 100644
--- a/templates/HelpFiles/InstructorProblemSetList.html.ep
+++ b/templates/HelpFiles/InstructorProblemSetList.html.ep
@@ -3,28 +3,28 @@
 %
 <p>
 	<%= maketext('This page manages all problem sets (including quizzes/tests). '
-		. 'The following allow editing directly of a single problem set.') =%>
+			. 'The following allow editing directly of a single problem set.') =%>
 </p>
 <dl>
 	<dt><%= maketext('"Problems" column') %></dt>
 	<dd>
 		<%= maketext('Indicates the number of problems in the set. Clicking on the link opens the set detail page '
-			. 'which allows you to modify set parameters, edit set headers, and change parameters of problems in the '
-			. 'set such as the number of allowed attempts or the weight (credit value). You can also add, remove, '
-			. 'view, edit, and reorder the problems in the set.') =%>
+				. 'which allows you to modify set parameters, edit set headers, and change parameters of problems in the '
+				. 'set such as the number of allowed attempts or the weight (credit value). You can also add, remove, '
+				. 'view, edit, and reorder the problems in the set.') =%>
 	</dd>
 	<dt><%= maketext('"Assigned Users" column') %></dt>
 	<dd>
 		<%= maketext('Shows how many instructors and students have been assigned this problem set, out of the total '
-			. 'number in the class. Clicking on this link allows you to assign the set to users, unassign this '
-			. 'set from users, and to individually edit the assignment for specific users. For changing dates for '
-			. 'individual users there are also shortcuts from the "Instructor Tools" link.') =%>
+				. 'number in the class. Clicking on this link allows you to assign the set to users, unassign this '
+				. 'set from users, and to individually edit the assignment for specific users. For changing dates for '
+				. 'individual users there are also shortcuts from the "Instructor Tools" link.') =%>
 	</dd>
 	<dt><%= maketext('Changing dates') %></dt>
 	<dd>
 		<%= maketext('Dates for problem sets can be edited by clicking the pencil icon in the "Set Name" column '
-			. 'next to the set name. To change dates for several sets at once, click the check box in the "Select" '
-			. 'column and choose "Edit selected" from the tasks above.') =%>
+				. 'next to the set name. To change dates for several sets at once, click the check box in the "Select" '
+				. 'column and choose "Edit selected" from the tasks above.') =%>
 	</dd>
 </dl>
 <h2><%= maketext('Primary Actions') %></h2>
@@ -35,7 +35,7 @@
 	<dt><%= maketext('Sort') %></dt>
 	<dd>
 		<%= maketext('Sorts the table rows by set name, due date, etc.  The table rows can also be sorted by '
-			. 'clicking on an active link at the top of the column.') %>
+				. 'clicking on an active link at the top of the column.') %>
 	</dd>
 
 	<dt><%= maketext('Edit') %></dt>
@@ -44,35 +44,35 @@
 	<dt><%= maketext('Publish') %></dt>
 	<dd>
 		<%= maketext('The sets checked below will be visible to students or hidden from students. Useful for preparing '
-			. 'sets ahead of time, but not showing them to students; or for temporarily hiding a set which has a '
-			. 'mistake in it while it is being fixed.') =%>
+				. 'sets ahead of time, but not showing them to students; or for temporarily hiding a set which has a '
+				. 'mistake in it while it is being fixed.') =%>
 	</dd>
 
 	<dt><%= maketext('Import') %></dt>
 	<dd>
 		<%= maketext('Import a single set or multiple sets from a set definition file. '
-			. '(Use the "File Manager" to upload/download set definition files.) The "Shift Dates..." '
-			. 'option is useful for problem sets that were used from other courses and will shift all of '
-			. 'the dates.' ) =%>
+				. '(Use the "File Manager" to upload/download set definition files.) The "Shift Dates..." '
+				. 'option is useful for problem sets that were used from other courses and will shift all of '
+				. 'the dates.') =%>
 	</dd>
 
 	<dt><%= maketext('Export') %></dt>
 	<dd>
 		<%= maketext('The sets checked below will written to set definition files, to be saved for future use, or to '
-			. 'be transferred to another course. The set definition files can be uploaded/downloaded using the '
-			. '"File Manager".') =%>
+				. 'be transferred to another course. The set definition files can be uploaded/downloaded using the '
+				. '"File Manager".') =%>
 	</dd>
 
 	<dt><%= maketext('Score') %></dt>
 	<dd>
 		<%= maketext('Student scores for the sets selected below will be calculated. This and other scoring '
-			. 'operations can also be done using the "Scoring Tools" link.') =%>
+				. 'operations can also be done using the "Scoring Tools" link.') =%>
 	</dd>
 
 	<dt><%= maketext('Create') %></dt>
 	<dd>
 		<%= maketext('Create a new set with a given name. This can either create an empty set or a duplicate of '
-			. 'an existing set.') =%>
+				. 'an existing set.') =%>
 	</dd>
 	<dt><%= maketext('Delete') %></dt>
 	<dd><%= maketext('Delete the sets checked below. Be careful, this cannot be undone.') %></dd>
@@ -86,12 +86,11 @@
 		<dt><%= maketext('Synchronize Set Dates with LMS.') %></dt>
 		<dd>
 			<%= maketext('Synchronize the dates for a single set or multiple sets to or from the LMS. This task is '
-				. 'performed in the job queue, and this page only enqueus that task. Go to the Job Manager to see the '
-				. 'status of the enqueued job. This will only work for sets for which the lineitem for the set is '
-				. 'available or can be obtained. That is all sets that are created via content selection from the LMS, '
-				. 'or manually created links in the LMS that have been used at least once. Note that date '
-				. 'synchronization via LTI is not supported by all LMSs.'
-				) =%>
+					. 'performed in the job queue, and this page only enqueus that task. Go to the Job Manager to see the '
+					. 'status of the enqueued job. This will only work for sets for which the lineitem for the set is '
+					. 'available or can be obtained. That is all sets that are created via content selection from the LMS, '
+					. 'or manually created links in the LMS that have been used at least once. Note that date '
+					. 'synchronization via LTI is not supported by all LMSs.') =%>
 		</dd>
 	% }
 </dl>
diff --git a/templates/HelpFiles/InstructorScoring.html.ep b/templates/HelpFiles/InstructorScoring.html.ep
index 2645ccdcdf..c21f09a9c8 100644
--- a/templates/HelpFiles/InstructorScoring.html.ep
+++ b/templates/HelpFiles/InstructorScoring.html.ep
@@ -3,17 +3,19 @@
 %
 <p>
 	<%= maketext('WeBWorK does not have a full featured scoring ability. We leave that to your favorite spreadsheet '
-		. 'application.') =%>
+			. 'application.') =%>
 </p>
 <p>
 	<%= maketext('What WeBWorK does have is good support for summarizing the scores on WeBWorK assignments '
-		. 'and exporting them in a form (.csv) which any spreadsheet can use. WeBWorK reports all of the '
-		. 'homework grades with options shown below.') =%>
+			. 'and exporting them in a form (.csv) which any spreadsheet can use. WeBWorK reports all of the '
+			. 'homework grades with options shown below.') =%>
 </p>
 <p>
-	<%== maketext('Select the sets you want scored, choose the name of the export file you want to use '
-		. '(by default: [_1]), and then click the "Score Selected Set(s) and save to" button.',
-			'<code>courseName_totals.csv</code>') =%>
+	<%== maketext(
+		'Select the sets you want scored, choose the name of the export file you want to use '
+			. '(by default: [_1]), and then click the "Score Selected Set(s) and save to" button.',
+		'<code>courseName_totals.csv</code>'
+	) =%>
 </p>
 <p>
 	<%= maketext('The following describes how the checkboxes alter the scoring output') =%>
@@ -22,28 +24,30 @@
 	<dt><b><%= maketext('Pad Fields') %></b></dt>
 	<dd>
 		<%= maketext('If selected, this adds spaces between the fields to align the commas, which makes the '
-			. 'columns easy to read when in text form but it can confuse some spreadsheet applications since the '
-			. 'extra spaces violate the csv standard (although Excel handles them with no problem). This will give '
-			. 'a visual form of the CSV file that is easy to read on the page. If you want a reliable .csv file '
-			. 'for use in any spreadsheet application unclick the "Pad Fields" option. You can download the .csv '
-			. 'file immediately by clicking on the link with the filename chosen above, or you can download it '
-			. 'using the "File Manager" from the scoring directory.') =%>
+				. 'columns easy to read when in text form but it can confuse some spreadsheet applications since the '
+				. 'extra spaces violate the csv standard (although Excel handles them with no problem). This will give '
+				. 'a visual form of the CSV file that is easy to read on the page. If you want a reliable .csv file '
+				. 'for use in any spreadsheet application unclick the "Pad Fields" option. You can download the .csv '
+				. 'file immediately by clicking on the link with the filename chosen above, or you can download it '
+				. 'using the "File Manager" from the scoring directory.') =%>
 	</dd>
 	<dt><b><%= maketext('Record Scores for Single Sets') %></b></dt>
 	<dd>
-		<%== maketext('Select this if you want to save the scores for each set in a separate file in addition to '
-			. 'saving all scores to a cumulative file. After clicking the "Score Selected Set(s) and save to" '
-			. 'button, you will get a pair of links for each selected set. The file that ends with [_1] contains '
-			. 'the number of correct and incorrect tries about each individual problem for each student. The file '
-			. 'that ends with [_2] is a summary of each problem.',
-			'<code>ful.csv</code>','<code>scr.csv</code>') =%>
+		<%== maketext(
+			'Select this if you want to save the scores for each set in a separate file in addition to '
+				. 'saving all scores to a cumulative file. After clicking the "Score Selected Set(s) and save to" '
+				. 'button, you will get a pair of links for each selected set. The file that ends with [_1] contains '
+				. 'the number of correct and incorrect tries about each individual problem for each student. The file '
+				. 'that ends with [_2] is a summary of each problem.',
+			'<code>ful.csv</code>', '<code>scr.csv</code>'
+		) =%>
 	</dd>
 	<dt><b><%= maketext('Include Success Index') %></b></dt>
 	<dd>
 		<%= maketext('If this is selected, a success index is listed in each csv file. The success '
-			. 'index is a number assigned on the basis of the number of incorrect attempts (roughly equivalent '
-			. 'to 1/the number of attempts) which seems to correlate with the relative difficulty the student had '
-			. 'with the problem.') =%>
+				. 'index is a number assigned on the basis of the number of incorrect attempts (roughly equivalent '
+				. 'to 1/the number of attempts) which seems to correlate with the relative difficulty the student had '
+				. 'with the problem.') =%>
 	</dd>
 	<dt><b><%= maketext('Include percentage grades columns for all sets') %></b></dt>
 	<dd>
@@ -52,18 +56,22 @@
 </dl>
 <p>
 	<%= maketext('To use the Email merge feature, upload a CSV with calculated grades to the scoring directory using '
-		. 'the "File Manager".') =%>
+			. 'the "File Manager".') =%>
 </p>
 <p>
-	<%== maketext('Do NOT use the file name [_1], since you might accidentally overwrite that if you '
-		. 'again export your WeBWorK homework scores. (Actually the earlier file is moved to [_2]'
-		. ' -- so you can recover using the File Manager.)',
-		'<code>COURSENAME_totals.csv</code>', '<code>COURSENAME_totals_bak1.csv</code>') =%>
+	<%== maketext(
+		'Do NOT use the file name [_1], since you might accidentally overwrite that if you '
+			. 'again export your WeBWorK homework scores. (Actually the earlier file is moved to [_2]'
+			. ' -- so you can recover using the File Manager.)',
+		'<code>COURSENAME_totals.csv</code>', '<code>COURSENAME_totals_bak1.csv</code>'
+	) =%>
 </p>
 <p class="mb-0">
-	<%== maketext('If you upload your file on the web with the name: [_1] and also create an email message with the '
-		. 'name [_2] with the appropriate [_3] variables then not only can you email the message with the embedded '
-		. 'grades to the students, but files with those exact names are automatically appended to the "Grades" page '
-		. 'seen by the students.',
-		'<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>') =%>
+	<%== maketext(
+		'If you upload your file on the web with the name: [_1] and also create an email message with the '
+			. 'name [_2] with the appropriate [_3] variables then not only can you email the message with the embedded '
+			. 'grades to the students, but files with those exact names are automatically appended to the "Grades" page '
+			. 'seen by the students.',
+		'<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>'
+	) =%>
 </p>
diff --git a/templates/HelpFiles/InstructorSendMail.html.ep b/templates/HelpFiles/InstructorSendMail.html.ep
index 0e07d17741..dc60fe424a 100644
--- a/templates/HelpFiles/InstructorSendMail.html.ep
+++ b/templates/HelpFiles/InstructorSendMail.html.ep
@@ -3,44 +3,45 @@
 %
 <p>
 	<%= maketext('Use this page to send emails to active (enrolled or auditing) students.  Emails can be sent to '
-		. 'all active students or selected students.  Use the "Students" form to sort, filter, or format how '
-		. 'the user name is displayed. If multiple filters are selected and the "Intersection" radio button is used, '
-		. 'the filters will  be applied in sequence, narrowing the results list.  If the "Union" button is used, the '
-		. 'updated list will be the union of all results lists from the multiple filters.  Click "Refresh List" to '
-		. 'apply any changes.  Use control-click or shift-click to select multiple students to email.')=%>
+			. 'all active students or selected students.  Use the "Students" form to sort, filter, or format how '
+			. 'the user name is displayed. If multiple filters are selected and the "Intersection" radio button is used, '
+			. 'the filters will  be applied in sequence, narrowing the results list.  If the "Union" button is used, the '
+			. 'updated list will be the union of all results lists from the multiple filters.  Click "Refresh List" to '
+			. 'apply any changes.  Use control-click or shift-click to select multiple students to email.') =%>
 </p>
 <p>
 	<%= maketext('Emails can contain personalized data, such as name, section, or status.  Click "List of insertable '
-		. 'macros" for a full list available variables.  Additional personal data can be included by using a merge '
-		. 'file.  A merge file is a CSV file located in the ~[Scoring~] directory in which the first column is the '
-		. 'student id, followed by additional data (such as student grades).  This data is identified by which '
-		. 'column it is in, for instance if the scores where in the 4th column of the merge file, insert them into '
-		. 'an email using the variable $COL~[4~].  The "Scoring Tools" page can export grades into a CSV that can be '
-		. 'used as a merge file.  Upload customized merge files with the "File Manager".') =%>
+			. 'macros" for a full list available variables.  Additional personal data can be included by using a merge '
+			. 'file.  A merge file is a CSV file located in the ~[Scoring~] directory in which the first column is the '
+			. 'student id, followed by additional data (such as student grades).  This data is identified by which '
+			. 'column it is in, for instance if the scores where in the 4th column of the merge file, insert them into '
+			. 'an email using the variable $COL~[4~].  The "Scoring Tools" page can export grades into a CSV that can be '
+			. 'used as a merge file.  Upload customized merge files with the "File Manager".') =%>
 </p>
 <p>
 	<%= maketext('Use the "Merge file" drop down menu to select which merge file to use, or select "None" to not '
-		. 'use any merge file.  When a merge file is selected, the data for active students will be displayed '
-		. 'above the "Email Body".  This will show you the structure of the merge file and the column variables '
-		. 'associated with each column.  Data that is longer than 7 characters will be truncated, and the data can '
-		. 'be scrolled up and down to see all rows.') =%>
+			. 'use any merge file.  When a merge file is selected, the data for active students will be displayed '
+			. 'above the "Email Body".  This will show you the structure of the merge file and the column variables '
+			. 'associated with each column.  Data that is longer than 7 characters will be truncated, and the data can '
+			. 'be scrolled up and down to see all rows.') =%>
 </p>
-<p> <%= maketext('Preview the message before sending using the "Preview Message" button.  The preview shows the '
-		. 'email that would be sent to the first selected student or the instructor if no students were selected.  '
-		. 'The preview will also list all of the students that would receive their own personalized message.  If a '
-		. 'merge file was selected, the preview will also indicate which (if any) recipient\'s merge file data '
-		. 'could not be found.') =%>
+<p>
+	<%= maketext('Preview the message before sending using the "Preview Message" button.  The preview shows the '
+			. 'email that would be sent to the first selected student or the instructor if no students were selected.  '
+			. 'The preview will also list all of the students that would receive their own personalized message.  If a '
+			. 'merge file was selected, the preview will also indicate which (if any) recipient\'s merge file data '
+			. 'could not be found.') =%>
 </p>
 <p>
 	<%= maketext('Messages can be saved to a message file (which must end in the ".msg" extension).  Use the '
-		. '"Message file" drop down menu to select which message file to load, or "None" to use a blank message. '
-		. 'To save a new message, use the "Save as" button after entering in a valid filename.  The "Save as" '
-		. 'button will not overwrite currently saved messages.  To edit a currently saved message first select it '
-		. 'using the drop down menu, then click the "Save" button to save any changes.  Use the "File Manager" to '
-		. 'delete messages, located in the "~[TMPL~]/email" directory.') =%>
+			. '"Message file" drop down menu to select which message file to load, or "None" to use a blank message. '
+			. 'To save a new message, use the "Save as" button after entering in a valid filename.  The "Save as" '
+			. 'button will not overwrite currently saved messages.  To edit a currently saved message first select it '
+			. 'using the drop down menu, then click the "Save" button to save any changes.  Use the "File Manager" to '
+			. 'delete messages, located in the "~[TMPL~]/email" directory.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('When the message is ready to send, click "Send Email". This will queue the email to be sent, which '
-		. 'can take several minutes depending on the number of students selected.  You will be notified by email '
-		. 'once all the emails have been sent.') =%>
+			. 'can take several minutes depending on the number of students selected.  You will be notified by email '
+			. 'once all the emails have been sent.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorSetMaker.html.ep b/templates/HelpFiles/InstructorSetMaker.html.ep
index fc8c33df7e..3a3bfe6611 100644
--- a/templates/HelpFiles/InstructorSetMaker.html.ep
+++ b/templates/HelpFiles/InstructorSetMaker.html.ep
@@ -3,43 +3,43 @@
 %
 <p>
 	<%= maketext('This page is used to browse problems that will be used to fill problem sets. '
-		. 'The first step is to choose which set you are working on. If you need to create a new problem set '
-		. 'fill in the blank next to the "Create a New Set in This Course" button and then press the button. '
-		. 'Then choose which set you want to work on in the drop down menu.') =%>
+			. 'The first step is to choose which set you are working on. If you need to create a new problem set '
+			. 'fill in the blank next to the "Create a New Set in This Course" button and then press the button. '
+			. 'Then choose which set you want to work on in the drop down menu.') =%>
 </p>
 <p>
 	<%= maketext('Use the options in the second box to pick a collection of problems described below. In each '
-		. 'case, clicking "View Problems" will render a fixed number of problems (default of 20). After '
-		. 'problems are shown, there will be options to show the next/previous batch of problems, add all problems '
-		. 'to the target set (set at the top of the page) or clear the current batch of problems.') =%>
+			. 'case, clicking "View Problems" will render a fixed number of problems (default of 20). After '
+			. 'problems are shown, there will be options to show the next/previous batch of problems, add all problems '
+			. 'to the target set (set at the top of the page) or clear the current batch of problems.') =%>
 </p>
 <dl>
 	<dt><%= maketext('Open Problem Library') %></dt>
 	<dd>
 		<%= maketext('This browses the Open Problem Library (OPL) in category (Subject/Chapter/Section) form. '
-			. 'Select the desired categories (all three do not need to be selected) and click "View Problems". '
-			. 'If the "Include Contrib" box is selected then those problems in the Contrib section of '
-			. 'the OPL that have the categories defined are also included. Contrib problems are problem that '
-			. q{haven't been vetted as thoroughly as OPL problems. If you want hints or solutions included while }
-			. 'browsing select the appropriate box.') =%>
+				. 'Select the desired categories (all three do not need to be selected) and click "View Problems". '
+				. 'If the "Include Contrib" box is selected then those problems in the Contrib section of '
+				. 'the OPL that have the categories defined are also included. Contrib problems are problem that '
+				. q{haven't been vetted as thoroughly as OPL problems. If you want hints or solutions included while }
+				. 'browsing select the appropriate box.') =%>
 	</dd>
 	<dt><%= maketext('Course Files') %></dt>
-	<dd><%= maketext('This option shows all pg problems in the course directory structure.')%></dd>
+	<dd><%= maketext('This option shows all pg problems in the course directory structure.') %></dd>
 	<dt><%= maketext('Course Sets') %></dt>
 	<dd><%= maketext('This option shows all problems in sets that have been created in the course.') %></dd>
 	<dt><%= maketext('Set Definition Files') %></dt>
 	<dd>
 		<%= maketext('This option shows all problems in set definition files that are located in the course '
-			. 'directory.') =%>
+				. 'directory.') =%>
 	</dd>
 	<dt><%= maketext('Other Options') %></dt>
 	<dd>
 		<%= maketext('The second row of the problem collection area is for browsing directories. The OPL '
-			. 'will be there as well as any other directories that you may set up (for example Contrib). If '
-			. 'this is selected, all subdirectories containing problems will be listed.') =%>
+				. 'will be there as well as any other directories that you may set up (for example Contrib). If '
+				. 'this is selected, all subdirectories containing problems will be listed.') =%>
 	</dd>
 </dl>
 <p class="mb-0">
 	<%= maketext('The "Edit Target Set" button at the top of the page will take you to the Set Detail page '
-		. 'which will allow you to edit dates, assign users and other information about the problem set.') =%>
+			. 'which will allow you to edit dates, assign users and other information about the problem set.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorShowAnswers.html.ep b/templates/HelpFiles/InstructorShowAnswers.html.ep
index f7a5ec16f0..d5b9a847c7 100644
--- a/templates/HelpFiles/InstructorShowAnswers.html.ep
+++ b/templates/HelpFiles/InstructorShowAnswers.html.ep
@@ -3,11 +3,11 @@
 %
 <p class="m-0">
 	<%= maketext('Show past answers.  Students can only see their own past answers, and they will not be able to see '
-		. 'which parts are correct.  Instructors can use the form to select any combination of users, sets, and '
-		. 'problems to view. For users, one can select the sort field, the format of the display list, and the filter. '
-		. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
-		. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
-		. 'list will be the union of all results lists from the multiple filters.'
-		. 'The table below will list the past answers colored according to correctness '
-		. '(green is correct).  Use control + click to select multiple users, sets, or problems.') =%>
+			. 'which parts are correct.  Instructors can use the form to select any combination of users, sets, and '
+			. 'problems to view. For users, one can select the sort field, the format of the display list, and the filter. '
+			. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
+			. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
+			. 'list will be the union of all results lists from the multiple filters.'
+			. 'The table below will list the past answers colored according to correctness '
+			. '(green is correct).  Use control + click to select multiple users, sets, or problems.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorStats.html.ep b/templates/HelpFiles/InstructorStats.html.ep
index 49a3f62517..bde5c0c098 100644
--- a/templates/HelpFiles/InstructorStats.html.ep
+++ b/templates/HelpFiles/InstructorStats.html.ep
@@ -3,7 +3,7 @@
 %
 <p class="mb-0">
 	<%= maketext('Display full set or problem statistics.  The main page lists all sets to view. When viewing '
-		. 'set statistics, the drop down menus can be used to show stats for individual sections, recitations, or '
-		. 'problems.  The overall results include all students who are assigned to the set, while the individual '
-		. 'problem results only include active (have attempted the problem) students.') =%>
+			. 'set statistics, the drop down menus can be used to show stats for individual sections, recitations, or '
+			. 'problems.  The overall results include all students who are assigned to the set, while the individual '
+			. 'problem results only include active (have attempted the problem) students.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorStudentProgress.html.ep b/templates/HelpFiles/InstructorStudentProgress.html.ep
index 3ebcf96e87..f40c79495d 100644
--- a/templates/HelpFiles/InstructorStudentProgress.html.ep
+++ b/templates/HelpFiles/InstructorStudentProgress.html.ep
@@ -3,16 +3,16 @@
 %
 <p>
 	<%= maketext('This page is useful for monitoring student progress on assignments. Student progress '
-		. 'can either be viewed for a single set or for a single student.') =%>
+			. 'can either be viewed for a single set or for a single student.') =%>
 </p>
 <p>
 	<%= maketext('When viewing student progress for a set, the score for the set and the status for problems in the '
-		. 'set are listed for all students.  The table can be sorted by clicking the links in the table header.  '
-		. q{Click the student's name to access the student's set.  When viewing progress for a test, additional }
-		. 'columns can be shown/hidden by updating the display at the top') =%>
+			. 'set are listed for all students.  The table can be sorted by clicking the links in the table header.  '
+			. q{Click the student's name to access the student's set.  When viewing progress for a test, additional }
+			. 'columns can be shown/hidden by updating the display at the top') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('When viewing progress for a single student, their grades page is shown which lists set totals and '
-		. 'per problem grades for each set assigned to the student.  This shows the same information as the '
-		. 'statistics page for the student.') =%>
+			. 'per problem grades for each set assigned to the student.  This shows the same information as the '
+			. 'statistics page for the student.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorUserDetail.html.ep b/templates/HelpFiles/InstructorUserDetail.html.ep
index 24dfa80d6e..3736b90197 100644
--- a/templates/HelpFiles/InstructorUserDetail.html.ep
+++ b/templates/HelpFiles/InstructorUserDetail.html.ep
@@ -3,23 +3,23 @@
 %
 <p>
 	<%= maketext('A student must be assigned a homework set in order for it to appear on their WeBWorK home page. '
-		. 'Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a '
-		. q{student. If a student is unassigned from a homework set, all of the student's data for that homework set }
-		. 'is deleted and cannot be recovered. Use this action cautiously!') =%>
+			. 'Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a '
+			. q{student. If a student is unassigned from a homework set, all of the student's data for that homework set }
+			. 'is deleted and cannot be recovered. Use this action cautiously!') =%>
 </p>
 <p>
 	<%= maketext('Change the due dates for an individual student on this page. Enter a new date in order to '
-		. 'override the date. (You can copy the date format from the date in the left column which indicates '
-		. 'the date when the homework set is due for the whole class.) Note that you should ensure that the close '
-		. 'date is before the answer date. If the close date for a student is extended until after the class answer '
-		. 'date for the set, then the answer date for the student must also be set to a later date. If reduced '
-		. 'scoring is enabled for the set, then the reduced scoring date must be between the open and close dates. '
-		. 'If a date is left empty, then the assignment default date will be used.') =%>
+			. 'override the date. (You can copy the date format from the date in the left column which indicates '
+			. 'the date when the homework set is due for the whole class.) Note that you should ensure that the close '
+			. 'date is before the answer date. If the close date for a student is extended until after the class answer '
+			. 'date for the set, then the answer date for the student must also be set to a later date. If reduced '
+			. 'scoring is enabled for the set, then the reduced scoring date must be between the open and close dates. '
+			. 'If a date is left empty, then the assignment default date will be used.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Click on the homework set links to edit the grades for this individual student on the homework set. '
-		. '(The grade of each problem is called the "status".) You can also change the number of allowed attempts and '
-		. q{further modify the individual student's homework set.) You will also be able to change a student's seed }
-		. q{which determines the individual values used in the individual version of the student's problem and the }
-		. 'weight (how much a problem counts toward the grade.)') =%>
+			. '(The grade of each problem is called the "status".) You can also change the number of allowed attempts and '
+			. q{further modify the individual student's homework set.) You will also be able to change a student's seed }
+			. q{which determines the individual values used in the individual version of the student's problem and the }
+			. 'weight (how much a problem counts toward the grade.)') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorUserList.html.ep b/templates/HelpFiles/InstructorUserList.html.ep
index 181df0e41e..b91906466d 100644
--- a/templates/HelpFiles/InstructorUserList.html.ep
+++ b/templates/HelpFiles/InstructorUserList.html.ep
@@ -3,13 +3,13 @@
 %
 <p>
 	<%== maketext('From this page you can <strong>add new students</strong>, <strong>edit</strong> user data '
-		. '(name, email address, student ID, enrollment status, accommodation time factor, section, recitation, '
-		. 'comment, permission level, and password), and <strong>export</strong> (save) class lists for back-up or use '
-		. 'in another course. You can also delete students from the class roster, but this cannot be undone.') =%>
+			. '(name, email address, student ID, enrollment status, accommodation time factor, section, recitation, '
+			. 'comment, permission level, and password), and <strong>export</strong> (save) class lists for back-up or use '
+			. 'in another course. You can also delete students from the class roster, but this cannot be undone.') =%>
 </p>
 <p>
 	<%= maketext('This page gives access to information about the student, independent of the assignments '
-		. 'assigned to them.') =%>
+			. 'assigned to them.') =%>
 </p>
 <p><%= maketext('To perform an action select the desired action tab and click the submit button.') %></p>
 
@@ -18,62 +18,62 @@
 	<dt><%= maketext('Restrict or sort the students displayed') %></dt>
 	<dd>
 		<%= maketext('When the class is very large not all students will be displayed. Using the first action on this '
-			. 'page you can show only the students from a given recitation or from a given section, or only students '
-			. 'whose login or last name fits a pattern match. The second action will sort the students currently being '
-			. 'displayed. You can also sort the displayed students by clicking on the active links at the top of '
-			. 'each column.') =%>
+				. 'page you can show only the students from a given recitation or from a given section, or only students '
+				. 'whose login or last name fits a pattern match. The second action will sort the students currently being '
+				. 'displayed. You can also sort the displayed students by clicking on the active links at the top of '
+				. 'each column.') =%>
 	</dd>
 
 	<dt><%= maketext('Edit class list data') %></dt>
 	<dd>
 		<%= maketext('You can edit the class list data for a single student by clicking on the pencil icon next to '
-			. 'their login name. To edit several students at once click on the "Select" checkbox next to their names, '
-			. 'click on the radio button for editing selected users and then click the "Edit" button. This might '
-			. 'take a long time load if editing a large number of users.') =%>
+				. 'their login name. To edit several students at once click on the "Select" checkbox next to their names, '
+				. 'click on the radio button for editing selected users and then click the "Edit" button. This might '
+				. 'take a long time load if editing a large number of users.') =%>
 	</dd>
 
 	<dd>
 		<%= maketext(q{The login name cannot be changed. (It is the primary key for the student's data.) If you make }
-			. 'a mistake in the login name at the beginning of the course (before any work has been done) then it is '
-			. 'best to simply add a new student with the correct entry and drop the student with the bad login name. '
-			. '(See drop and delete students below.) If the login name must be changed after a user has started '
-			. 'working assignments, then contact your system administrator, who can use the webwork2 '
-			. '"bin/change_user_id" script to change the user id.') =%>
+				. 'a mistake in the login name at the beginning of the course (before any work has been done) then it is '
+				. 'best to simply add a new student with the correct entry and drop the student with the bad login name. '
+				. '(See drop and delete students below.) If the login name must be changed after a user has started '
+				. 'working assignments, then contact your system administrator, who can use the webwork2 '
+				. '"bin/change_user_id" script to change the user id.') =%>
 	</dd>
 
 	<dd>
 		<%= maketext('When editing users a column for editing passwords will be shown.  The text input in this '
-			. 'column will show "password set" for users that have a password, and "no password set" for users '
-			. 'that do not have a password. To set or change the password for a user enter the new password '
-			. 'in the column for that user.  To delete the password for a user check the checkbox to the right. '
-			. 'This means that the user will not be able to sign into the course using a password.') =%>
+				. 'column will show "password set" for users that have a password, and "no password set" for users '
+				. 'that do not have a password. To set or change the password for a user enter the new password '
+				. 'in the column for that user.  To delete the password for a user check the checkbox to the right. '
+				. 'This means that the user will not be able to sign into the course using a password.') =%>
 	</dd>
 
 	<dt><%= maketext('Add a few students to the course.') %></dt>
 	<dd>
 		<%= maketext('Enter a number of students to add, and then click "Add". This will take you to a '
-			. 'new page where the data can be entered for one or more students. It is also possible to assign the '
-			. 'student(s) to one or more sets as they are being entered: simply select the sets from the '
-			. 'list below the data entry table. Use "command" or "control" click to select more than one '
-			. 'set.') =%>
+				. 'new page where the data can be entered for one or more students. It is also possible to assign the '
+				. 'student(s) to one or more sets as they are being entered: simply select the sets from the '
+				. 'list below the data entry table. Use "command" or "control" click to select more than one '
+				. 'set.') =%>
 	</dd>
 
 	<dt><%= maketext('Add many students to a course from a class list.') %></dt>
 	<dd>
 		<%== maketext('This is most easily done by importing a class list. The class list can be uploaded from your '
-			. 'workstation to the server using the File Manager page. The class list must be a file ending in .lst and '
-			. 'must have a specific <a href="https://wiki.openwebwork.org/wiki/Classlist_Files#Format_of_classlist_files">'
-			. 'format</a>. Once the file has been uploaded to the server the file will appear in the import action '
-			. 'pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" '
-			. 'which activate guest logins to the class list.') =%>
+				. 'workstation to the server using the File Manager page. The class list must be a file ending in .lst and '
+				. 'must have a specific <a href="https://wiki.openwebwork.org/wiki/Classlist_Files#Format_of_classlist_files">'
+				. 'format</a>. Once the file has been uploaded to the server the file will appear in the import action '
+				. 'pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" '
+				. 'which activate guest logins to the class list.') =%>
 	</dd>
 
 	<dt><%= maketext('Add a TA or an instructor (change permission level of user)') %></dt>
 	<dd>
 		<%= maketext('This is done by first entering the user as a student and then changing the permission level of '
-			. 'the user. First edit the user by clicking on the pencil next to their name (or using the technique '
-			. 'above for several users), then change their permission level -- an entry blank at the far right of the '
-			. 'screen, you may have to scroll to see it. The permission levels are') =%>
+				. 'the user. First edit the user by clicking on the pencil next to their name (or using the technique '
+				. 'above for several users), then change their permission level -- an entry blank at the far right of the '
+				. 'screen, you may have to scroll to see it. The permission levels are') =%>
 		<ul>
 			<li><%= maketext('Guest:') %> -5</li>
 			<li><%= maketext('Student:') %> 0</li>
@@ -82,86 +82,87 @@
 			<li><%= maketext('Instructor:') %> 10</li>
 		</ul>
 		<%= maketext('Note that if you set the permission level of a user to something other than "Student", you may '
-			. 'also want to set the status of the user to "Observer".  Users with the "Observer" status are not '
-			. 'included in statistics, scoring, or instructor emails.') =%>
+				. 'also want to set the status of the user to "Observer".  Users with the "Observer" status are not '
+				. 'included in statistics, scoring, or instructor emails.') =%>
 	</dd>
 
 	<dt><%= maketext('Drop student from the course') %></dt>
 	<dd>
 		<%= maketext('To drop a student or students, select them for editing as described above and then set the '
-			. 'pop-up list to enrolled, drop, or audit. Dropped students cannot log in to the course, are not assigned '
-			. 'new sets and are not sent email. They can be re-enrolled simply by changing their status back '
-			. 'to enrolled. No data is lost, any assignments assigned before they were dropped are restored '
-			. 'unchanged.') =%>
+				. 'pop-up list to enrolled, drop, or audit. Dropped students cannot log in to the course, are not assigned '
+				. 'new sets and are not sent email. They can be re-enrolled simply by changing their status back '
+				. 'to enrolled. No data is lost, any assignments assigned before they were dropped are restored '
+				. 'unchanged.') =%>
 	</dd>
 
 	<dt><%= maketext('Delete a student from a course') %></dt>
 	<dd>
 		<%= maketext('This should be done cautiously. Once a student is deleted from a course their data is lost '
-			. 'forever and cannot be recovered. They can be added to the course as a new student, but all of their '
-			. 'assignment data has been permanently deleted.') =%>
+				. 'forever and cannot be recovered. They can be added to the course as a new student, but all of their '
+				. 'assignment data has been permanently deleted.') =%>
 	</dd>
 
 	<dt><%= maketext('Reset two factor authentication for a student in the course') %></dt>
 	<dd>
 		<%= maketext('This resets two factor authentication for a student, thus making the student need to set up two '
-			. 'factor authentication again. This should only be done if a student has accidentally deleted their '
-			. 'account or for some other reason lost their key in the authenticator app, and so can no longer access '
-			. 'the course. Note that this will only appear if two factor authentication is enabled for the course.') =%>
+				. 'factor authentication again. This should only be done if a student has accidentally deleted their '
+				. 'account or for some other reason lost their key in the authenticator app, and so can no longer access '
+				. 'the course. Note that this will only appear if two factor authentication is enabled for the course.'
+		) =%>
 	</dd>
 
 	<dt><%= maketext('Assign sets to one student') %></dt>
 	<dd>
 		<%= maketext('To assign one or more sets to an individual student click in the column "Assigned Sets" in the '
-			. q{student's row. This will take you to a page where you can assign and unassign sets and }
-			. 'change the due dates for homework on an individual basis.') =%>
+				. q{student's row. This will take you to a page where you can assign and unassign sets and }
+				. 'change the due dates for homework on an individual basis.') =%>
 	</dd>
 
 	<dt><%= maketext('Change the due date for one student') %></dt>
 	<dd>
 		<%= maketext(q{Click on the column "Assigned Sets" in the student's row. This will take you to a page where }
-			. 'you can assign and unassign sets and change the due dates for homework on an '
-			. 'individual basis.') =%>
+				. 'you can assign and unassign sets and change the due dates for homework on an '
+				. 'individual basis.') =%>
 	</dd>
 
 	<dt><%= maketext('"Act as" a student') %></dt>
 	<dd>
 		<%= maketext(q{Clicking on the login name link in a student's row allows you to view the student's version of }
-			. 'the homework (rather than your own) so that you can more easily answer student questions about homework '
-			. 'problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are '
-			. 'acting as a student.) You can submit the answers (which will NOT be recorded) to check that the '
-			. 'computer is grading the problem correctly. You will also be able to view past answers submitted by the '
-			. q{student for each problem. To stop acting in the student's role click the "Stop acting" link in the }
-			. 'upper right corner of the window.') =%>
+				. 'the homework (rather than your own) so that you can more easily answer student questions about homework '
+				. 'problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are '
+				. 'acting as a student.) You can submit the answers (which will NOT be recorded) to check that the '
+				. 'computer is grading the problem correctly. You will also be able to view past answers submitted by the '
+				. q{student for each problem. To stop acting in the student's role click the "Stop acting" link in the }
+				. 'upper right corner of the window.') =%>
 	</dd>
 
 	<dt><%= maketext('Change the grades on an assignment for one student.') %></dt>
 	<dd>
 		<%= maketext(q{Click first in the "Assigned Sets" column in the student's row. This will take you to a new }
-			. 'page where you will click on the link to the assignment where the grade change is to be made. (The '
-			. 'grade for each problem is listed as "status" on this third page).') =%>
+				. 'page where you will click on the link to the assignment where the grade change is to be made. (The '
+				. 'grade for each problem is listed as "status" on this third page).') =%>
 	</dd>
 
 	<dt><%= maketext('Give one student or several students additional time for all timed tests.') %></dt>
 	<dd>
 		<%= maketext('Click on the "Select" checkbox next to the names of the students that additional time is to be '
-			. 'assigned, click on the radio button for editing selected users, and then click the "Edit" button. '
-			. 'Set the "Accommodation Time Factor" to the desired multiplier for each student selected (this must be a '
-			. 'decimal number that is greater than or equal to 1). The time that a student will have to complete a '
-			. 'timed test will be the product of the "Test Time Limit" for the test set in the "Sets Manager" and '
-			. 'the "Accommodation Time Factor" set here.') =%>
+				. 'assigned, click on the radio button for editing selected users, and then click the "Edit" button. '
+				. 'Set the "Accommodation Time Factor" to the desired multiplier for each student selected (this must be a '
+				. 'decimal number that is greater than or equal to 1). The time that a student will have to complete a '
+				. 'timed test will be the product of the "Test Time Limit" for the test set in the "Sets Manager" and '
+				. 'the "Accommodation Time Factor" set here.') =%>
 	</dd>
 
 	<dt><%= maketext('Extend the number of attempts allowed a student on a given problem.') %></dt>
 	<dd>
 		<%= maketext(q{Click first in the "Assigned Sets" column in the student's row. This will take you to a new }
-			. 'page where you will click on the link to the assignment where the grade change is to be made.') =%>
+				. 'page where you will click on the link to the assignment where the grade change is to be made.') =%>
 	</dd>
 
 	<dt><%= maketext('Assign sets to many students') %></dt>
 	<dd>
 		<%= maketext('This is done from the "Sets Manager" or from the "Instructor Tools" page if you wish to '
-			. 'assign a set to all students or a large group of students (e.g. a section).') =%>
+				. 'assign a set to all students or a large group of students (e.g. a section).') =%>
 	</dd>
 
 	<dt><%= maketext('Change dates for a set for the whole class.') %></dt>
@@ -170,8 +171,8 @@
 	<dt><%= maketext('Change the grading on a set for an entire class.') %></dt>
 	<dd>
 		<%= maketext('You might want to do this if you want to give full credit to everyone on a particular problem '
-			. q{that was not worded correctly, or wasn't working properly. This is done from the "Sets Manager" }
-			. 'page or the "Instructor Tools" page.') =%>
+				. q{that was not worded correctly, or wasn't working properly. This is done from the "Sets Manager" }
+				. 'page or the "Instructor Tools" page.') =%>
 	</dd>
 
 	<dt><%= maketext('Change the number of attempts allowed on a problem.') %></dt>
@@ -186,31 +187,30 @@
 		<dt><%= maketext('Synchronize users with the associated course in the LMS.') %></dt>
 		<dd>
 			<%= maketext('Select the "Synchronize LMS Roster" tab and click "Synchronize LMS Roster". '
-				. 'This will enqueue a job that will contact the LMS and retrieve the list of users in the associated '
-				. 'LMS course. Users that are in the LMS course but not in the WeBWorK course will be added. Users '
-				. 'that are not in the LMS course will have their status changed to "Drop". Users that are in the LMS '
-				. 'course and the WeBWorK course will have their data updated unless $LMSManageUserData is false. Note '
-				. 'that users that have a permission level above the $LTIAccountCreationCutoff will not be added or '
-				. 'modified. Go to the Job Manager to see the status of this job.'
-				) =%>
+					. 'This will enqueue a job that will contact the LMS and retrieve the list of users in the associated '
+					. 'LMS course. Users that are in the LMS course but not in the WeBWorK course will be added. Users '
+					. 'that are not in the LMS course will have their status changed to "Drop". Users that are in the LMS '
+					. 'course and the WeBWorK course will have their data updated unless $LMSManageUserData is false. Note '
+					. 'that users that have a permission level above the $LTIAccountCreationCutoff will not be added or '
+					. 'modified. Go to the Job Manager to see the status of this job.') =%>
 		</dd>
 	% }
 </dl>
 
 <p>
 	<%= maketext('Many of these editing activities can also be done more quickly from the "Instructor Tools" page '
-		. 'where students and sets can be selected simultaneously. The "Instructor Tools" page is useful for '
-		. 'quick editing of one or two students. The initial setup of the class can be done best from this page. '
-		. 'Importing and exporting class lists can only be done from this page. Deleting students can only be '
-		. 'done from this page.') =%>
+			. 'where students and sets can be selected simultaneously. The "Instructor Tools" page is useful for '
+			. 'quick editing of one or two students. The initial setup of the class can be done best from this page. '
+			. 'Importing and exporting class lists can only be done from this page. Deleting students can only be '
+			. 'done from this page.') =%>
 </p>
 
 <h2><%= maketext('Review of column functions:') %></h2>
 <ul>
 	<li>
 		<%= maketext('Clicking on any active link at the top of the column sorts the page by that column. You can do '
-			. 'lexicographic sorts: click on "First name" then "Last name" to sort by last name, sorting those with '
-			. 'the same last name by their first name.') =%>
+				. 'lexicographic sorts: click on "First name" then "Last name" to sort by last name, sorting those with '
+				. 'the same last name by their first name.') =%>
 	</li>
 	<li><%== maketext('The <strong>login name</strong> column links allow you to "act as" a student.') %></li>
 	<li>
@@ -218,13 +218,13 @@
 	</li>
 	<li>
 		<%== maketext('The <strong>Assigned sets</strong> column (x/y) indicates that x sets out of y sets available '
-			. 'have been assigned to this student. Click this link to assign or unassign sets to this student, to '
-			. 'adjust due dates, or to adjust the grades on an assignment for a student.') =%>
+				. 'have been assigned to this student. Click this link to assign or unassign sets to this student, to '
+				. 'adjust due dates, or to adjust the grades on an assignment for a student.') =%>
 	</li>
 	<li>
 		<%== maketext('Clicking the <strong>email address</strong> link will bring up your standard email application '
-			. 'so that you can send email to the student. This works even if the student has been dropped from the '
-			. 'course. To send email to an entire class or to merge grades with the email message use the "Email" page '
-			. 'link in the left margin.') =%>
+				. 'so that you can send email to the student. This works even if the student has been dropped from the '
+				. 'course. To send email to an entire class or to merge grades with the email message use the "Email" page '
+				. 'link in the left margin.') =%>
 	</li>
 </ul>
diff --git a/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
index 9fcbf2373a..dc3a56c438 100644
--- a/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
+++ b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
@@ -3,6 +3,6 @@
 %
 <p class="mb-0">
 	<%= maketext('A student needs to be assigned a set in order for them to work it. Once a student is unassigned a '
-		. 'set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change the '
-		. 'option to "Allow unassign".') =%>
+			. 'set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change the '
+			. 'option to "Allow unassign".') =%>
 </p>
diff --git a/templates/HelpFiles/Levels.html.ep b/templates/HelpFiles/Levels.html.ep
index 26a0948d49..9dceebda52 100644
--- a/templates/HelpFiles/Levels.html.ep
+++ b/templates/HelpFiles/Levels.html.ep
@@ -3,32 +3,32 @@
 %
 <p>
 	<%= maketext('Some OPL problems have been rated for difficulty/educational objective. The levels are loosely '
-		. q{inspired by Bloom's taxonomy. They are assigned numbers from 1 to 6 as follows.}) =%>
+			. q{inspired by Bloom's taxonomy. They are assigned numbers from 1 to 6 as follows.}) =%>
 </p>
 <ol>
 	<li>
 		<%= maketext('Problems with this rating should only require direct memory of a fact. Examples might be a '
-			. 'specific value of a function, or the statement of a definition. Very few WeBWorK problems fall into '
-			. 'this category.') =%>
+				. 'specific value of a function, or the statement of a definition. Very few WeBWorK problems fall into '
+				. 'this category.') =%>
 	</li>
 
 	<li>
 		<%= maketext('Usually means students must demonstrate understanding of facts. This is more than regurgitating '
-			. 'the fact. We use this category for simple and direct applications of algorithms the student has '
-			. 'studied. There should be no judgement involved in choosing the method. This would include a simple '
-			. 'application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with '
-			. 'one more advanced rule) or for integrals.') =%>
+				. 'the fact. We use this category for simple and direct applications of algorithms the student has '
+				. 'studied. There should be no judgement involved in choosing the method. This would include a simple '
+				. 'application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with '
+				. 'one more advanced rule) or for integrals.') =%>
 	</li>
 
 	<li>
 		<%= maketext('We use this for carrying out more complicated algorithms, such as derivatives using both the '
-			. 'product and chain rule or integrals which involve say both a substitution and parts.') =%>
+				. 'product and chain rule or integrals which involve say both a substitution and parts.') =%>
 	</li>
 
 	<li>
 		<%= maketext('These problems require some application of algorithms, but do not rise to the level of a full '
-			. 'word problem. For example, "Identify the local extrema for f(x) = ...". One has to apply algorithms '
-			. 'and interpret results.') =%>
+				. 'word problem. For example, "Identify the local extrema for f(x) = ...". One has to apply algorithms '
+				. 'and interpret results.') =%>
 	</li>
 
 	<li><%= maketext('Word problems') %></li>
diff --git a/templates/HelpFiles/Options.html.ep b/templates/HelpFiles/Options.html.ep
index fb1e70f614..89e62accbb 100644
--- a/templates/HelpFiles/Options.html.ep
+++ b/templates/HelpFiles/Options.html.ep
@@ -3,58 +3,57 @@
 %
 <p>
 	<%= maketext('This page allows users to change their password, email address, and display settings used in '
-		. 'problems. Note that you can hide this page entirely for students by setting permission levels to '
-		. 'login_proctor or higher for the permissions to change password, change email address, and change display '
-		. 'settings used in pg problems.') =%>
+			. 'problems. Note that you can hide this page entirely for students by setting permission levels to '
+			. 'login_proctor or higher for the permissions to change password, change email address, and change display '
+			. 'settings used in pg problems.') =%>
 </p>
 <h2><%= maketext('Name') %></h2>
 <p>
 	<%= maketext('The first and last name can be any combination of letters, numbers and special symbols. Name changes '
-		. 'and preferences can be respected here. Students should use a name that will not confuse their instructor. '
-		. 'If WeBWorK is used with an LMS (Canvas, Moodle, D2L, Blackboard, etc) the LMS might periodically override '
-		. 'a name setting here if WeBWorK is configured to allow that. Name settings will only appear here if a user '
-		. 'has permission to change their name.') =%>
+			. 'and preferences can be respected here. Students should use a name that will not confuse their instructor. '
+			. 'If WeBWorK is used with an LMS (Canvas, Moodle, D2L, Blackboard, etc) the LMS might periodically override '
+			. 'a name setting here if WeBWorK is configured to allow that. Name settings will only appear here if a user '
+			. 'has permission to change their name.') =%>
 </p>
 <h2><%= maketext('Password') %></h2>
 <p>
 	<%= maketext('The password can be any combination of letters, numbers and special symbols. Students are encouraged '
-		. 'to use all three, and stay away from dictionary words. The password should not be the same as any password '
-		. 'used elsewhere, such as for an email account. The password will only be present on the page if the user '
-		. 'has permission to change the password.') =%>
+			. 'to use all three, and stay away from dictionary words. The password should not be the same as any password '
+			. 'used elsewhere, such as for an email account. The password will only be present on the page if the user '
+			. 'has permission to change the password.') =%>
 </p>
 <h2><%= maketext('Email Address') %></h2>
 <p>
 	<%= maketext('It is important that students enter an email address or they will not receive any of the important '
-		. 'emails sent by the instructor. The email address will only be present on the page if the user has '
-		. 'permission to change the email address.') =%>
+			. 'emails sent by the instructor. The email address will only be present on the page if the user has '
+			. 'permission to change the email address.') =%>
 </p>
 <h2><%= maketext('Problem Display Settings') %></h2>
 <p>
 	<%= maketext('These options will only be shown if the user has the permission to change display settings used in '
-		. 'pg problems.') =%>
+			. 'pg problems.') =%>
 </p>
 <dl class="mb-0">
 	<dt><%= maketext('Display mode for equations') %></dt>
 	<dd>
 		<%= maketext('This may be Mathjax, images, or plainText. Only the options that are enabled for the course '
-			. 'will be available to select. This option is only visible if there is more than one display mode '
-			. 'enabled for the course.') %>
+				. 'will be available to select. This option is only visible if there is more than one display mode '
+				. 'enabled for the course.') %>
 	</dd>
 	<dt><%= maketext('Saved answers') %></dt>
 	<dd>
 		<%= maketext('This determines whether or not saved past answers are automatically filled in to the problem '
-			. 'form when a student returns to a problem after having left the problem. This option is only visible '
-			. 'if the user has the permission to show old answers.') %>
+				. 'form when a student returns to a problem after having left the problem. This option is only visible '
+				. 'if the user has the permission to show old answers.') %>
 	</dd>
 	<dt><%= maketext('Live equation rendering') %></dt>
 	<dd>
 		<%= maketext('This determines if MathQuill answer blanks are enable for the user. This option is only '
-			. 'present if MathQuill is enabled for the course.') %>
+				. 'present if MathQuill is enabled for the course.') %>
 	</dd>
 	<dt><%= maketext('Equation Editor') %></dt>
 	<dd>
 		<%= maketext('This determines if the MathView equation editor button will be appended to text answer blanks. '
-			. 'his option is only present if MathView is enabled for the course.') %>
+				. 'his option is only present if MathView is enabled for the course.') %>
 	</dd>
-
 </dl>
diff --git a/templates/HelpFiles/ProblemSets.html.ep b/templates/HelpFiles/ProblemSets.html.ep
index 5ebee8e949..1b64ccb3fc 100644
--- a/templates/HelpFiles/ProblemSets.html.ep
+++ b/templates/HelpFiles/ProblemSets.html.ep
@@ -5,13 +5,13 @@
 <p><%= maketext('It lists the assignments available for the students.') %></p>
 <p>
 	<%= maketext('The information box on the right displays information about the course. This is useful for leaving '
-		. 'course wide messages for students. It contains text from the file templates/course_info.txt. Instructors '
-		. 'can edit this file from the web (click on the "Edit" link).') =%>
+			. 'course wide messages for students. It contains text from the file templates/course_info.txt. Instructors '
+			. 'can edit this file from the web (click on the "Edit" link).') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('You can click the download icon to the right of each set to generate a PDF hardcopy of the set. '
-		. 'You can generate hardcopies for multiple sets and students including their answers as well by selecting '
-		. 'sets and students on the page that opens when that icon is clicked. Note that students will only be able '
-		. 'to generate hardcopies of a single set at a time. Students will only be able to include answers in '
-		. 'the hardcopy after the answer date.') =%>
+			. 'You can generate hardcopies for multiple sets and students including their answers as well by selecting '
+			. 'sets and students on the page that opens when that icon is clicked. Note that students will only be able '
+			. 'to generate hardcopies of a single set at a time. Students will only be able to include answers in '
+			. 'the hardcopy after the answer date.') =%>
 </p>
diff --git a/templates/HelpFiles/admin_links.html.ep b/templates/HelpFiles/admin_links.html.ep
index aeca2640c2..82dc17564a 100644
--- a/templates/HelpFiles/admin_links.html.ep
+++ b/templates/HelpFiles/admin_links.html.ep
@@ -1,12 +1,14 @@
 % layout 'help_macro';
 % title maketext('Course Administration Help');
 %
-<%== maketext('Click the icon [_1] for page and item specific help.',
-	'<a href="#"><i class="fas fa-question-circle"></i></a>') =%>
+<%== maketext(
+	'Click the icon [_1] for page and item specific help.',
+	'<a href="#"><i class="fas fa-question-circle"></i></a>'
+) =%>
 <hr>
 <p>
 	<%= maketext('This is the administration course which is used to manage courses on this server.  Use the '
-		. '"Admin Menu" to select the desired action.') =%>
+			. '"Admin Menu" to select the desired action.') =%>
 </p>
 
 <dl>
@@ -33,7 +35,7 @@
 	<dt><%= maketext('Manage LTI Course Map') %></dt>
 	<dd>
 		<%= maketext('Set LMS context ids for courses to map LMS courses to WeBWorK '
-			. 'courses for content item selection.') =%>
+				. 'courses for content item selection.') =%>
 	</dd>
 	<dt><%= maketext('Manage OTP Secrets') %></dt>
 	<dd><%= maketext('Copy OTP secrets from one course/user to another, or reset OTP secrets.') =%></dd>
diff --git a/templates/HelpFiles/instructor_links.html.ep b/templates/HelpFiles/instructor_links.html.ep
index 43959eb6e7..ca8e731f10 100644
--- a/templates/HelpFiles/instructor_links.html.ep
+++ b/templates/HelpFiles/instructor_links.html.ep
@@ -1,34 +1,36 @@
 % layout 'help_macro';
 % title maketext('Instructor Links Help');
 %
-<%== maketext('Click the [_1] icon for page and item specific help.',
-	'<i class="fas fa-question-circle"></i>') =%>
+<%== maketext('Click the [_1] icon for page and item specific help.', '<i class="fas fa-question-circle"></i>') =%>
 <hr>
-<%== maketext('The main page for WeBWorK documentation is the <a [_1]>webwork wiki</a> while specific help for '
-	. q{instructors setting up a course are in the <a [_2]>instructors' section</a>.},
+<%== maketext(
+	'The main page for WeBWorK documentation is the <a [_1]>webwork wiki</a> while specific help for '
+		. q{instructors setting up a course are in the <a [_2]>instructors' section</a>.},
 	'href="https://wiki.openwebwork.org/wiki" target="ww_wiki"',
-	'href="https://wiki.openwebwork.org/wiki/Instructors" target="ww_wiki"') =%>
+	'href="https://wiki.openwebwork.org/wiki/Instructors" target="ww_wiki"'
+) =%>
 <hr>
 
 <dl>
 	<dt><%= maketext('Instructor Tools') %></dt>
 	<dd>
 		<%== maketext('Quick access to many instructor tools, including '
-			. '<strong>Reset passwords</strong>, '
-			. '<strong>Act as student</strong>, '
-			. '<strong>Assign individual sets</strong> '
-			. 'and <strong>Edit individual due dates</strong>.') =%>
+				. '<strong>Reset passwords</strong>, '
+				. '<strong>Act as student</strong>, '
+				. '<strong>Assign individual sets</strong> '
+				. 'and <strong>Edit individual due dates</strong>.') =%>
 	</dd>
 	<dt><%= maketext('Accounts Manager') %></dt>
 	<dd>
 		<%= maketext('Edit class roster data. Add students, edit student data, drop students from class, import '
-			. 'students from a classlist, and give user professor privileges. Access to individual assignments.') =%>
+				. 'students from a classlist, and give user professor privileges. Access to individual assignments.'
+		) =%>
 	</dd>
 	<dt><%= maketext('Sets Manager') %></dt>
 	<dd>
 		<%= maketext('Edit sets for the entire class. Change set due dates, create new sets from a set '
-			. 'definition file, create new sets, make sets visible/invisible, score assignments. Assign '
-			. 'sets to the class.') =%>
+				. 'definition file, create new sets, make sets visible/invisible, score assignments. Assign '
+				. 'sets to the class.') =%>
 	</dd>
 	<dt><%= maketext('Assigner Tool') %></dt>
 	<dd><%= maketext('Assign and unassign selected exercise sets to selected users.') %></dd>
@@ -43,17 +45,17 @@
 	<dt><%= maketext('Scoring Tools') %></dt>
 	<dd>
 		<%= maketext('Score one or more sets. This can also be done from the "Sets Manager" or from the '
-			. '"Instructor Tools", but the "Scoring Tools" page allows control over parameters.') =%>
+				. '"Instructor Tools", but the "Scoring Tools" page allows control over parameters.') =%>
 	</dd>
 	<dt><%= maketext('LTI Grade Update') %></dt>
 	<dd>
 		<%= maketext('Manually initiate an LTI grade passback for selected sets or users. This link is only visible '
-			. 'if LTI grade passback is enabled for the course.') =%>
+				. 'if LTI grade passback is enabled for the course.') =%>
 	</dd>
 	<dt><%= maketext('Achievements Manager') %></dt>
 	<dd>
 		<%= maketext('Edit achievements for the course. This link is only present if achievements '
-			. 'are enabled for the course.') =%>
+				. 'are enabled for the course.') =%>
 	</dd>
 	<dt><%= maketext('Email') %></dt>
 	<dd><%= maketext('Send email to students.') %></dd>
@@ -62,14 +64,13 @@
 	<dt><%= maketext('File Manager') %></dt>
 	<dd>
 		<%= maketext('Upload, download and delete text files, including scoring spread sheets, set definition files, '
-			. 'class list spread sheets, and "PG" problems.') =%>
+				. 'class list spread sheets, and "PG" problems.') =%>
 	</dd>
 	<dt><%= maketext('Course Configuration') %></dt>
 	<dd>
 		<%= maketext('Allows configuration of certain parameters, such as permission levels, default display mode for '
-			. 'equations, and email feedback behavior, on a course by course basis.') =%>
+				. 'equations, and email feedback behavior, on a course by course basis.') =%>
 	</dd>
 </dl>
 
-<%== maketext('Click the [_1] icon for page and item specific help.',
-	'<i class="fas fa-question-circle"></i>') %>
+<%== maketext('Click the [_1] icon for page and item specific help.', '<i class="fas fa-question-circle"></i>') %>
diff --git a/templates/RPCRenderFormats/default.html.ep b/templates/RPCRenderFormats/default.html.ep
index 8ae096d1f5..e23edb8447 100644
--- a/templates/RPCRenderFormats/default.html.ep
+++ b/templates/RPCRenderFormats/default.html.ep
@@ -2,172 +2,183 @@
 %
 <!DOCTYPE html>
 <html <%== $COURSE_LANG_AND_DIR %>>
-<head>
-	<meta charset='utf-8'>
-	<base href="<%= $SITE_URL %>">
-	<title>
-		WeBWorK using host: <%= $SITE_URL %>,
-		format: <%= $formatName %>,
-		seed: <%= $problemSeed %>,
-		course: <%= $courseID %>
-	</title>
-	<link href="<%= "$ce->{webworkURLs}{htdocs}/images/favicon.ico" %>" rel="shortcut icon">
-	% # Add third party css and javascript as well as css and javascript requested by the problem.
-	% for (@$third_party_css) {
-		%= stylesheet $_
-	% }
-	% for (@$extra_css_files) {
-		%= stylesheet $_->{file}
-	% }
-	<script>const webworkConfig = <%== $c->webwork_js_config($showMathJaxErrors) %>;</script>
-	% for (@$third_party_js) {
-		%= javascript $_->[0], %{ $_->[1] // {} }
-	% }
-	% # Add the local storage javascript for the sticky format.
-	% if ($formatName eq 'sticky') {
-		%= javascript getAssetURL($ce, 'js/LocalStorage/localstorage.js'), defer => undef
-	% }
-	% for (@$extra_js_files) {
-		%= javascript $_->{file}, %{ $_->{attributes} }
-	% }
-	%== $rh_result->{header_text} // ''
-	%== $rh_result->{post_header_text} // ''
-	%== $extra_header_text
-</head>
-<body>
-	<main class="container-fluid" data-iframe-height="1">
-		<div class="row g-0">
-			<div class="col-12 problem">
-				%== $resultSummary
-				<%= form_for $FORM_ACTION_URL, id => 'problemMainForm', class => 'problem-main-form',
-					name => 'problemMainForm', method => 'POST', begin %>
-					<div id="problem_body" class="problem-content" <%== $PROBLEM_LANG_AND_DIR %>>
-						% if ($displayMode eq 'PTX' || $displayMode eq 'tex') {
-							<pre><%= "$problemText"%></pre>
-						% } else {
-							%== $problemText
-						% }
-					</div>
-					% if ($showScoreSummary) {
-						<div id="score_summary" class="scoreSummary">
-							<p><%= $lh->maketext('You received a score of [_1] for this attempt.',
-								wwRound(0, $rh_result->{problem_result}{score} * 100) . '%') %></p>
-							% if ($rh_result->{problem_result}{msg}) {
-								<p><%= $rh_result->{problem_result}{msg} %></p>
-							% }
-							% unless ($ce->{hideWasNotRecordedMessage}) {
-								<p><%= $lh->maketext('Your score was not recorded.') %></p>
-							% }
-							<%= hidden_field 'problem-result-score' => $rh_result->{problem_result}{score},
-								id => 'problem-result-score' %>
-						</div>
-					% }
-					% if ($formatName eq 'sticky') {
-						<div id="local-storage-messages">
-							<p>Your overall score for this problem is <span id="problem-overall-score"></span>.</p>
-						</div>
-					% }
-					%== $LTIGradeMessage
-					%
-					% if (stash->{disable_cookies}) {
-						%= hidden_field disableCookies => $disableCookies
-						%= hidden_field passwd         => $passwd
-					% }
-					% if (stash->{disable_cookies} || $ce->{session_management_via} ne 'session_cookie') {
-						%= hidden_field key => $key
-					% }
-					%= hidden_field user                         => $user
-					%= hidden_field sourceFilePath               => $sourceFilePath
-					%= hidden_field problemSource                => $problemSource
-					%= hidden_field rawProblemSource             => $rawProblemSource
-					%= hidden_field uriEncodedProblemSource      => $uriEncodedProblemSource
-					%= hidden_field problemSeed                  => $problemSeed
-					%= hidden_field problemUUID                  => $problemUUID
-					%= hidden_field psvn                         => $psvn
-					%= hidden_field fileName                     => $fileName
-					%= hidden_field courseID                     => $courseID
-					%= hidden_field displayMode                  => $displayMode
-					%= hidden_field outputformat                 => $formatName
-					%= hidden_field theme                        => $theme
-					%= hidden_field language                     => $formLanguage
-					%= hidden_field isInstructor                 => $isInstructor
-					%= hidden_field forceScaffoldsOpen           => $forceScaffoldsOpen
-					%= hidden_field showSummary                  => $showSummary
-					%= hidden_field showHints                    => $showHints
-					%= hidden_field showSolutions                => $showSolutions
-					%= hidden_field showPreviewButton            => $showPreviewButton
-					%= hidden_field showCheckAnswersButton       => $showCheckAnswersButton
-					%= hidden_field showCorrectAnswersButton     => $showCorrectAnswersButton
-					%= hidden_field showCorrectAnswersOnlyButton => $showCorrectAnswersOnlyButton
-					%= hidden_field showFooter                   => $showFooter
-					%= hidden_field extra_header_text            => $extra_header_text
-					%= hidden_field problem_data                 => $problem_data
-					% if ($ws->{inputs_ref}{answerPrefix}) {
-						%= hidden_field answerPrefix => $ws->{inputs_ref}{answerPrefix}
-					% }
-					% if ($formatName eq 'debug' && $ws->{inputs_ref}{clientDebug}) {
-						%= hidden_field clientDebug => $ws->{inputs_ref}{clientDebug}
-					% }
-					%
-					% if ($displayMode ne 'PTX' && $displayMode ne 'tex') {
-						<div class="submit-buttons-container col-12 mb-2">
-							% # Submit buttons (all are shown by default except the correct answer only button)
-							% if ($showPreviewButton ne '0') {
-								<%= submit_button $lh->maketext('Preview My Answers'),
-									name => 'previewAnswers', id => 'previewAnswers_id',
-									class => 'btn btn-primary mb-1' %>
-							% }
-							% if ($showCheckAnswersButton ne '0') {
-								<%= submit_button $lh->maketext('Check Answers'),
-									name => 'WWsubmit', class => 'btn btn-primary mb-1' %>
-							% }
-							% if ($showCorrectAnswersButton ne '0' && !$showCorrectAnswersOnlyButton) {
-								<%= submit_button $lh->maketext('Show Correct Answers'),
-									name => 'WWcorrectAns', class => 'btn btn-primary mb-1' %>
-							% }
-							% if ($showCorrectAnswersOnlyButton) {
-								% # This version of the show correct answers button only shows
-								% # the correct answer without any other feedback.
-								<%= submit_button $lh->maketext('Show Correct Answers'),
-									name => 'WWcorrectAnsOnly', class => 'btn btn-primary mb-1' %>
+	<head>
+		<meta charset="utf-8">
+		<base href="<%= $SITE_URL %>">
+		<title>
+			WeBWorK using host: <%= $SITE_URL %>, format: <%= $formatName %>, seed: <%= $problemSeed %>,
+			course: <%= $courseID %>
+		</title>
+		<link href="<%= "$ce->{webworkURLs}{htdocs}/images/favicon.ico" %>" rel="shortcut icon">
+		% # Add third party css and javascript as well as css and javascript requested by the problem.
+		% for (@$third_party_css) {
+			%= stylesheet $_
+		% }
+		% for (@$extra_css_files) {
+			%= stylesheet $_->{file}
+		% }
+		<script>
+			const webworkConfig = <%== $c->webwork_js_config($showMathJaxErrors) %>;
+		</script>
+		% for (@$third_party_js) {
+			%= javascript $_->[0], %{ $_->[1] // {} }
+		% }
+		% # Add the local storage javascript for the sticky format.
+		% if ($formatName eq 'sticky') {
+			%= javascript getAssetURL($ce, 'js/LocalStorage/localstorage.js'), defer => undef
+		% }
+		% for (@$extra_js_files) {
+			%= javascript $_->{file}, %{ $_->{attributes} }
+		% }
+		%== $rh_result->{header_text} // ''
+		%== $rh_result->{post_header_text} // ''
+		%== $extra_header_text
+	</head>
+	<body>
+		<main class="container-fluid" data-iframe-height="1">
+			<div class="row g-0">
+				<div class="col-12 problem">
+					%== $resultSummary
+					<%= form_for $FORM_ACTION_URL,
+						id     => 'problemMainForm',
+						class  => 'problem-main-form',
+						name   => 'problemMainForm',
+						method => 'POST',
+						begin %>
+						<div id="problem_body" class="problem-content" <%== $PROBLEM_LANG_AND_DIR %>>
+							% if ($displayMode eq 'PTX' || $displayMode eq 'tex') {
+								<pre><%= "$problemText" %></pre>
+							% } else {
+								%== $problemText
 							% }
 						</div>
-					% }
-				% end
+						% if ($showScoreSummary) {
+							<div id="score_summary" class="scoreSummary">
+								<p>
+									<%= $lh->maketext(
+										'You received a score of [_1] for this attempt.',
+										wwRound(0, $rh_result->{problem_result}{score} * 100) . '%'
+									) %>
+								</p>
+								% if ($rh_result->{problem_result}{msg}) {
+									<p><%= $rh_result->{problem_result}{msg} %></p>
+								% }
+								% unless ($ce->{hideWasNotRecordedMessage}) {
+									<p><%= $lh->maketext('Your score was not recorded.') %></p>
+								% }
+								<%= hidden_field
+									'problem-result-score' => $rh_result->{problem_result}{score},
+									id                     => 'problem-result-score' %>
+							</div>
+						% }
+						% if ($formatName eq 'sticky') {
+							<div id="local-storage-messages">
+								<p>
+									Your overall score for this problem is <span id="problem-overall-score"></span>.
+								</p>
+							</div>
+						% }
+						%== $LTIGradeMessage
+						%
+						% if (stash->{disable_cookies}) {
+							%= hidden_field disableCookies => $disableCookies
+							%= hidden_field passwd => $passwd
+						% }
+						% if (stash->{disable_cookies} || $ce->{session_management_via} ne 'session_cookie') {
+							%= hidden_field key => $key
+						% }
+						%= hidden_field user => $user
+						%= hidden_field sourceFilePath => $sourceFilePath
+						%= hidden_field problemSource => $problemSource
+						%= hidden_field rawProblemSource => $rawProblemSource
+						%= hidden_field uriEncodedProblemSource => $uriEncodedProblemSource
+						%= hidden_field problemSeed => $problemSeed
+						%= hidden_field problemUUID => $problemUUID
+						%= hidden_field psvn => $psvn
+						%= hidden_field fileName => $fileName
+						%= hidden_field courseID => $courseID
+						%= hidden_field displayMode => $displayMode
+						%= hidden_field outputformat => $formatName
+						%= hidden_field theme => $theme
+						%= hidden_field language => $formLanguage
+						%= hidden_field isInstructor => $isInstructor
+						%= hidden_field forceScaffoldsOpen => $forceScaffoldsOpen
+						%= hidden_field showSummary => $showSummary
+						%= hidden_field showHints => $showHints
+						%= hidden_field showSolutions => $showSolutions
+						%= hidden_field showPreviewButton => $showPreviewButton
+						%= hidden_field showCheckAnswersButton => $showCheckAnswersButton
+						%= hidden_field showCorrectAnswersButton => $showCorrectAnswersButton
+						%= hidden_field showCorrectAnswersOnlyButton => $showCorrectAnswersOnlyButton
+						%= hidden_field showFooter => $showFooter
+						%= hidden_field extra_header_text => $extra_header_text
+						%= hidden_field problem_data => $problem_data
+						% if ($ws->{inputs_ref}{answerPrefix}) {
+							%= hidden_field answerPrefix => $ws->{inputs_ref}{answerPrefix}
+						% }
+						% if ($formatName eq 'debug' && $ws->{inputs_ref}{clientDebug}) {
+							%= hidden_field clientDebug => $ws->{inputs_ref}{clientDebug}
+						% }
+						%
+						% if ($displayMode ne 'PTX' && $displayMode ne 'tex') {
+							<div class="submit-buttons-container col-12 mb-2">
+								% # Submit buttons (all are shown by default except the correct answer only button)
+								% if ($showPreviewButton ne '0') {
+									<%= submit_button $lh->maketext('Preview My Answers'),
+										name  => 'previewAnswers',
+										id    => 'previewAnswers_id',
+										class => 'btn btn-primary mb-1' %>
+								% }
+								% if ($showCheckAnswersButton ne '0') {
+									<%= submit_button $lh->maketext('Check Answers'),
+										name  => 'WWsubmit',
+										class => 'btn btn-primary mb-1' %>
+								% }
+								% if ($showCorrectAnswersButton ne '0' && !$showCorrectAnswersOnlyButton) {
+									<%= submit_button $lh->maketext('Show Correct Answers'),
+										name  => 'WWcorrectAns',
+										class => 'btn btn-primary mb-1' %>
+								% }
+								% if ($showCorrectAnswersOnlyButton) {
+									% # This version of the show correct answers button only shows
+									% # the correct answer without any other feedback.
+									<%= submit_button $lh->maketext('Show Correct Answers'),
+										name  => 'WWcorrectAnsOnly',
+										class => 'btn btn-primary mb-1' %>
+								% }
+							</div>
+						% }
+					% end
+				</div>
 			</div>
-		</div>
-		<%= include 'ContentGenerator/Base/problem_warning_and_debug_output',
-			warnings         => $rh_result->{pg_warnings},
-			warning_messages => ref $rh_result->{warning_messages} eq 'ARRAY' ? $rh_result->{warning_messages} : [],
-			debug_messages   =>
-				$formatName eq 'debug' && ref $rh_result->{debug_messages} eq 'ARRAY'
-				? $rh_result->{debug_messages}
-				: []
-			=%>
-		% # Additional information output only for the debug format.
-		% if ($formatName eq 'debug') {
-			% if ($ws->{inputs_ref}{clientDebug}) {
-				<h3>Webwork client data</h3>
-				%== $pretty_print->($ws)
+			<%= include 'ContentGenerator/Base/problem_warning_and_debug_output',
+				warnings         => $rh_result->{pg_warnings},
+				warning_messages => ref $rh_result->{warning_messages} eq 'ARRAY'
+				? $rh_result->{warning_messages}
+				: [],
+				debug_messages => $formatName eq 'debug'
+				&& ref $rh_result->{debug_messages} eq 'ARRAY' ? $rh_result->{debug_messages} : [] =%>
+			% # Additional information output only for the debug format.
+			% if ($formatName eq 'debug') {
+				% if ($ws->{inputs_ref}{clientDebug}) {
+					<h3>Webwork client data</h3>
+					%== $pretty_print->($ws)
+				% }
 			% }
+			% # Translator errors.
+			% if ($rh_result->{flags}{error_flag}) {
+				<div class="alert alert-danger p-1">
+					<h3>Translator errors</h3>
+					<div><%== $rh_result->{errors} %></div>
+				</div>
+			% }
+		</main>
+		% # Show the footer unless it is explicitly disabled.
+		% if ($showFooter ne '0') {
+			<footer id="footer" data-iframe-height="1">
+				WeBWorK &copy; <%= $ce->{WW_COPYRIGHT_YEARS} || 'unknown' %> | host: <%= $SITE_URL %> |
+				course: <%= $courseID %> | format: <%= $formatName %> | theme: <%= $theme %>
+			</footer>
 		% }
-		% # Translator errors.
-		% if ($rh_result->{flags}{error_flag}) {
-			<div class="alert alert-danger p-1">
-				<h3>Translator errors</h3>
-				<div><%== $rh_result->{errors} %></div>
-			</div>
-		% }
-	</main>
-	% # Show the footer unless it is explicitly disabled.
-	% if ($showFooter ne '0') {
-		<footer id="footer" data-iframe-height="1">
-			WeBWorK &copy; <%= $ce->{WW_COPYRIGHT_YEARS} || 'unknown' %> |
-			host: <%= $SITE_URL %> |
-			course: <%= $courseID %> |
-			format: <%= $formatName %> |
-			theme: <%= $theme %>
-		</footer>
-	% }
-</body>
+	</body>
 </html>
diff --git a/templates/RPCRenderFormats/ptx.html.ep b/templates/RPCRenderFormats/ptx.html.ep
index 91da854eca..13973b0747 100644
--- a/templates/RPCRenderFormats/ptx.html.ep
+++ b/templates/RPCRenderFormats/ptx.html.ep
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Static PreTeXt rendering of WeBWorK problem using host: <%= $SITE_URL %>, course: <%= $courseID %> -->
 <webwork>
-%== $problemText
-%== $answerhashXML
+	%== $problemText
+	%== $answerhashXML
 </webwork>
diff --git a/templates/exception.html.ep b/templates/exception.html.ep
index 13fe17abb1..0f39ee4500 100644
--- a/templates/exception.html.ep
+++ b/templates/exception.html.ep
@@ -1,8 +1,8 @@
 % use Date::Format;
 % use UUID::Tiny ':std';
 %
-% my $uuid = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $c->req->url->path->to_string)
-	% . "::" . create_uuid_as_string(UUID_TIME);
+% my $uuid = create_uuid_as_string(UUID_SHA1, UUID_NS_URL, $c->req->url->path->to_string) . "::"
+	% . create_uuid_as_string(UUID_TIME);
 % my $time = time2str('%a %b %d %H:%M:%S %Y', time);
 %
 % # Log the error to the Mojolicious error log
diff --git a/templates/exception_default.html.ep b/templates/exception_default.html.ep
index 586534bce7..d9c9b9970c 100644
--- a/templates/exception_default.html.ep
+++ b/templates/exception_default.html.ep
@@ -1,120 +1,126 @@
 <!DOCTYPE html>
 <html lang="en-US">
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
-	<title>WeBWorK error</title>
-</head>
-%
-<body>
-	<!-- Request ID: <%= $c->req->request_id %> -->
-	<main style="text-align:left">
-		<h1>WeBWorK error</h1>
-		<p>An error occurred while processing your request.</p>
-		<p>
-			For help, please send mail to this site's webmaster\
-			% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
-			<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
-				<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
-			<% } =%>\
-			, including all of the following information as well as what you were doing when the error occurred.
-		</p>
-		<h2>Error record identifier</h2>
-		<p style="margin-left:2em;color:#dc2a2a"><code><%= $uuid =%></code></p>
-		% if (my $warnings = stash 'warnings') {
-			<h2>Warning messages</h2>
-			<ul>
-				% for (split m/\n+/, $warnings) {
-					<li><code><%= $_ %></code></li>
-				% }
-			</ul>
-		% }
-		% if (my $exception = stash 'exception') {
-			<h2>Error messages</h2>
-			<p style="margin-left:2em;color:#dc2a2a"><code><%= $exception->message =%></code></p>
-			<h2>Context</h2>
-			<ul>
-				% for (@{$exception->lines_before}) {
-					<li><pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre></li>
-				% }
-				% if (defined $exception->line->[1]) {
-					<li>
-						<pre style="display:inline;color:#dc2a2a"><% =%>\
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
+		<title>WeBWorK error</title>
+	</head>
+	%
+	<body>
+		<!-- Request ID: <%= $c->req->request_id %> -->
+		<main style="text-align:left">
+			<h1>WeBWorK error</h1>
+			<p>An error occurred while processing your request.</p>
+			<p>
+				For help, please send mail to this site's webmaster\
+				% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
+				<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
+					<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
+				<% } =%>\
+				, including all of the following information as well as what you were doing when the error occurred.
+			</p>
+			<h2>Error record identifier</h2>
+			<p style="margin-left:2em;color:#dc2a2a"><code><%= $uuid =%></code></p>
+			% if (my $warnings = stash 'warnings') {
+				<h2>Warning messages</h2>
+				<ul>
+					% for (split m/\n+/, $warnings) {
+						<li><code><%= $_ %></code></li>
+					% }
+				</ul>
+			% }
+			% if (my $exception = stash 'exception') {
+				<h2>Error messages</h2>
+				<p style="margin-left:2em;color:#dc2a2a"><code><%= $exception->message =%></code></p>
+				<h2>Context</h2>
+				<ul>
+					% for (@{$exception->lines_before}) {
+						<li>
+							<pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre>
+						</li>
+					% }
+					% if (defined $exception->line->[1]) {
+						<li>
+							<pre style="display:inline;color:#dc2a2a"><% =%>\
 							<code><%= $exception->line->[0] %>: <%= $exception->line->[1] %></code><% =%>\
 						</pre>
-					</li>
-				% }
-				% for (@{$exception->lines_after}) {
-					<li><pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre></li>
-				% }
-			</ul>
-			<h2>Call stack</h2>
-			<ul>
-				% for (@{ $exception->frames }) {
-					<li><code>in <%= $_->[3] %> called at line <%= $_->[2] %> of <%= $_->[1] %></code></li>
-					% # Stop when the backtrace gets back to the WeBWorK handler.
-				  	% # Everything after that is in the Mojolicious library code.
-					% last if $_->[0] eq 'Mojolicious::WeBWorK::Controller::Handler';
-				% }
-			</ul>
-		% }
-		<h2>Request information</h2>
-		<div>
-			<p>The HTTP request information is included in the following table.</p>
-			<div style="overflow-x:auto;">
-				<table aria-labelledby="req_info_summary1" style="border-collapse:collapse">
-					<caption id="req_info_summary1">HTTP request information</caption>
-					<tr>
-						<th id="outer_item" style="border:1px solid black;">Item</th>
-						<th id="outer_data" style="border:1px solid black;">Data</th>
-					</tr>
-					<tr>
-						<td headers="outer_item" style="border:1px solid black;">Method</td>
-						<td headers="outer_data" style="border:1px solid black;"><%= $c->req->method %></td>
-					</tr>
-					<tr>
-						<td headers="outer_item" style="border:1px solid black;">URI</td>
-						<td headers="outer_data" style="border:1px solid black;">
-							<%= $c->req->url->to_abs->to_string %>
-						</td>
-					</tr>
-					<tr>
-						<td headers="outer_item" style="border:1px solid black;">HTTP Headers</td>
-						<td headers="outer_data" style="border:1px solid black;">
-							<table style="border-collapse:collapse" aria-labelledby="req_header_summary">
-								<caption id="req_header_summary">HTTP request headers</caption>
-								<tr>
-									<th id="header_key" style="border:1px solid black;"><small>Key</small></th>
-									<th id="header_value" style="border:1px solid black;"><small>Value</small></th>
-								</tr>
-								% my %headers = %{ $c->req->headers->to_hash };
-								% if (defined($headers{'sec-ch-ua'})) {
-									% # Avoid warnings about the value of 'sec-ch-ua'.
-									% # (It is doubtful that this is needed anymore.)
-									% $headers{'sec-ch-ua'} = join('', $headers{'sec-ch-ua'});
-									% $headers{'sec-ch-ua'} =~ s/\"//g;
-								% }
-								% for (keys %headers) {
+						</li>
+					% }
+					% for (@{$exception->lines_after}) {
+						<li>
+							<pre style="display:inline"><code><%= $_->[0] %>: <%= $_->[1] %></code></pre>
+						</li>
+					% }
+				</ul>
+				<h2>Call stack</h2>
+				<ul>
+					% for (@{ $exception->frames }) {
+						<li><code>in <%= $_->[3] %> called at line <%= $_->[2] %> of <%= $_->[1] %></code></li>
+						% # Stop when the backtrace gets back to the WeBWorK handler.
+						% # Everything after that is in the Mojolicious library code.
+						% last if $_->[0] eq 'Mojolicious::WeBWorK::Controller::Handler';
+					% }
+				</ul>
+			% }
+			<h2>Request information</h2>
+			<div>
+				<p>The HTTP request information is included in the following table.</p>
+				<div style="overflow-x:auto;">
+					<table aria-labelledby="req_info_summary1" style="border-collapse:collapse">
+						<caption id="req_info_summary1">
+							HTTP request information
+						</caption>
+						<tr>
+							<th id="outer_item" style="border:1px solid black;">Item</th>
+							<th id="outer_data" style="border:1px solid black;">Data</th>
+						</tr>
+						<tr>
+							<td headers="outer_item" style="border:1px solid black;">Method</td>
+							<td headers="outer_data" style="border:1px solid black;"><%= $c->req->method %></td>
+						</tr>
+						<tr>
+							<td headers="outer_item" style="border:1px solid black;">URI</td>
+							<td headers="outer_data" style="border:1px solid black;">
+								<%= $c->req->url->to_abs->to_string %>
+							</td>
+						</tr>
+						<tr>
+							<td headers="outer_item" style="border:1px solid black;">HTTP Headers</td>
+							<td headers="outer_data" style="border:1px solid black;">
+								<table style="border-collapse:collapse" aria-labelledby="req_header_summary">
+									<caption id="req_header_summary">
+										HTTP request headers
+									</caption>
 									<tr>
-										<td headers="header_key" style="border:1px solid black;">
-											<small><%= $_ %></small>
-										</td>
-										<td headers="header_value" style="border:1px solid black;">
-											<small><%= $headers{$_} %></small>
-										</td>
+										<th id="header_key" style="border:1px solid black;"><small>Key</small></th>
+										<th id="header_value" style="border:1px solid black;"><small>Value</small></th>
 									</tr>
-								% }
-							</table>
-						</td>
-					</tr>
-				</table>
+									% my %headers = %{ $c->req->headers->to_hash };
+									% if (defined($headers{'sec-ch-ua'})) {
+										% # Avoid warnings about the value of 'sec-ch-ua'.
+										% # (It is doubtful that this is needed anymore.)
+										% $headers{'sec-ch-ua'} = join('', $headers{'sec-ch-ua'});
+										% $headers{'sec-ch-ua'} =~ s/\"//g;
+									% }
+									% for (keys %headers) {
+										<tr>
+											<td headers="header_key" style="border:1px solid black;">
+												<small><%= $_ %></small>
+											</td>
+											<td headers="header_value" style="border:1px solid black;">
+												<small><%= $headers{$_} %></small>
+											</td>
+										</tr>
+									% }
+								</table>
+							</td>
+						</tr>
+					</table>
+				</div>
 			</div>
-		</div>
-		<h2>Time generated:</h2>
-		<p style="margin-left:2em;"><%= $time %></p>
-	</main>
-</body>
-%
+			<h2>Time generated:</h2>
+			<p style="margin-left:2em;"><%= $time %></p>
+		</main>
+	</body>
 </html>
diff --git a/templates/exception_min.html.ep b/templates/exception_min.html.ep
index 44ac28d508..5fe7f09082 100644
--- a/templates/exception_min.html.ep
+++ b/templates/exception_min.html.ep
@@ -1,31 +1,29 @@
 <!DOCTYPE html>
 <html lang="en-US">
-%
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
-	<title>WeBWorK error</title>
-</head>
-%
-<body>
-	<!-- Request ID: <%= $c->req->request_id %> -->
-	<main style="text-align:left">
-		<h1>WeBWorK error</h1>
-		<p>An error occurred while processing your request.</p>
-		<p>
-			For help, please send mail to this site's webmaster\
-			% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
-			<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
-				<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
-			<% } =%>\
-			, including the following information as well as what what you were doing when the error occurred.
-		</p>
-		<h2>Error record identifier</h2>
-		<p style="margin-left:5em;color:#dc2a2a"><code><%= $uuid %></code></p>
-		<h2>Time generated:</h2>
-		<p style="margin-left:5em;"><%= $time %></p>
-	</main>
-</body>
-%
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<link rel="icon" type="x-image/icon" href="/images/favicon.ico">
+		<title>WeBWorK error</title>
+	</head>
+	%
+	<body>
+		<!-- Request ID: <%= $c->req->request_id %> -->
+		<main style="text-align:left">
+			<h1>WeBWorK error</h1>
+			<p>An error occurred while processing your request.</p>
+			<p>
+				For help, please send mail to this site's webmaster\
+				% # $ENV{WEBWORK_SERVER_ADMIN} is set from $webwork_server_admin_email in site.conf.
+				<% if ($ENV{WEBWORK_SERVER_ADMIN}) { =%>
+					<%= link_to $ENV{WEBWORK_SERVER_ADMIN} => "mailto:$ENV{WEBWORK_SERVER_ADMIN}" %>\
+				<% } =%>\
+				, including the following information as well as what what you were doing when the error occurred.
+			</p>
+			<h2>Error record identifier</h2>
+			<p style="margin-left:5em;color:#dc2a2a"><code><%= $uuid %></code></p>
+			<h2>Time generated:</h2>
+			<p style="margin-left:5em;"><%= $time %></p>
+		</main>
+	</body>
 </html>
diff --git a/templates/layouts/help_macro.html.ep b/templates/layouts/help_macro.html.ep
index 1724c489d6..a11d3e4d68 100644
--- a/templates/layouts/help_macro.html.ep
+++ b/templates/layouts/help_macro.html.ep
@@ -1,4 +1,6 @@
-<%= link_to '#', data => { bs_toggle => 'modal', bs_target => "#${name}_help_modal" }, %$args, begin =%>
+<%= link_to '#',
+	data => { bs_toggle => 'modal', bs_target => "#${name}_help_modal" },
+	%$args, begin =%>
 	% if ($label) {
 		<%== $label =%>
 	% } else {
@@ -7,8 +9,13 @@
 	% }
 <% end =%>
 <% content_for 'modal-dialog-area' => begin =%>
-	<div class="modal fade" id="<%= "${name}_help_modal" %>" tabindex="-1"
-		aria-labelledby="<%= "${name}_help_title" %>" aria-hidden="true">
+	<div
+		class="modal fade"
+		id="<%= "${name}_help_modal" %>"
+		tabindex="-1"
+		aria-labelledby="<%= "${name}_help_title" %>"
+		aria-hidden="true"
+	>
 		<div class="modal-dialog modal-lg modal-dialog-centered modal-dialog-scrollable">
 			<div class="modal-content">
 				<div class="modal-header">
diff --git a/templates/layouts/pod_viewer.html.ep b/templates/layouts/pod_viewer.html.ep
index 116e97df2c..da6d3a7e4a 100644
--- a/templates/layouts/pod_viewer.html.ep
+++ b/templates/layouts/pod_viewer.html.ep
@@ -1,49 +1,66 @@
 <!DOCTYPE html>
 <html lang="en" dir="ltr">
-%
-<head>
-	<meta charset='UTF-8'>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
-	<title><%= title %></title>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme',  file => 'bootstrap.css' }) =%>
-	<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.css' }) =%>
-	<%= javascript $c->url({
-		type => 'webwork', name => 'htdocs',
-		file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
-		}), defer => undef =%>
-	<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.js' }),
-		defer => undef =%>
-	<link rel="icon" type="x-image/icon"
-		href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
-</head>
-%
-<body>
-	<nav class="pod-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
-		<div class="container-fluid d-flex flex-column d-md-block">
-			<h1 class="navbar-brand fw-bold fs-5 me-auto me-md-0 mb-2 mb-md-0"><%= title %></h1>
-			<button class="navbar-toggler d-md-none me-auto" type="button" data-bs-toggle="offcanvas"
-				data-bs-target="#sidebar" aria-controls="sidebar" aria-label="<%= maketext('Toggle Sidebar') %>">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-		</div>
-	</nav>
-	<aside class="offcanvas-md offcanvas-start border-end border-dark position-fixed" tabindex="-1"
-		id="sidebar" aria-labelledby="sidebar-label">
-		<div class="offcanvas-header">
-			<h2 class="offcanvas-title" id="sidebar-label"><%= $sidebar_title %></h2>
-			<button type="button" class="btn-close" data-bs-dismiss="offcanvas" data-bs-target="#sidebar"
-			   	aria-label="Close">
-			</button>
-		</div>
-		<div class="offcanvas-body p-md-3 w-100">
-			<%= content 'sidebar' %>
-		</div>
-	</aside>
-	<main class="pod-page-container d-flex">
-		<div class="container-fluid p-3 h-100" id="_podtop_">
-			<%= content =%>
-		</div>
-	</main>
-</body>
-%
+	<head>
+		<meta charset="UTF-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
+		<title><%= title %></title>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.css' }) =%>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
+			}),
+			defer => undef =%>
+		<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/PODViewer/podviewer.js' }),
+			defer => undef =%>
+		<link
+			rel="icon"
+			type="x-image/icon"
+			href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>"
+		>
+	</head>
+	%
+	<body>
+		<nav class="pod-header navbar navbar-dark bg-primary px-3 position-fixed border-bottom border-dark">
+			<div class="container-fluid d-flex flex-column d-md-block">
+				<h1 class="navbar-brand fw-bold fs-5 me-auto me-md-0 mb-2 mb-md-0"><%= title %></h1>
+				<button
+					class="navbar-toggler d-md-none me-auto"
+					type="button"
+					data-bs-toggle="offcanvas"
+					data-bs-target="#sidebar"
+					aria-controls="sidebar"
+					aria-label="<%= maketext('Toggle Sidebar') %>"
+				>
+					<span class="navbar-toggler-icon"></span>
+				</button>
+			</div>
+		</nav>
+		<aside
+			class="offcanvas-md offcanvas-start border-end border-dark position-fixed"
+			tabindex="-1"
+			id="sidebar"
+			aria-labelledby="sidebar-label"
+		>
+			<div class="offcanvas-header">
+				<h2 class="offcanvas-title" id="sidebar-label"><%= $sidebar_title %></h2>
+				<button
+					type="button"
+					class="btn-close"
+					data-bs-dismiss="offcanvas"
+					data-bs-target="#sidebar"
+					aria-label="Close"
+				></button>
+			</div>
+			<div class="offcanvas-body p-md-3 w-100">
+				<%= content 'sidebar' %>
+			</div>
+		</aside>
+		<main class="pod-page-container d-flex">
+			<div class="container-fluid p-3 h-100" id="_podtop_">
+				<%= content =%>
+			</div>
+		</main>
+	</body>
 </html>
diff --git a/templates/layouts/system.html.ep b/templates/layouts/system.html.ep
index 24aed1475d..ab4acb94f4 100644
--- a/templates/layouts/system.html.ep
+++ b/templates/layouts/system.html.ep
@@ -1,212 +1,250 @@
 <!DOCTYPE html>
 <html <%== $c->output_course_lang_and_dir %>>
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-%
-<link rel="icon" type="x-image/icon"
-	href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>">
-%
-% # CSS Loads
-<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
-<%= stylesheet $c->url({
-	type => 'webwork', name => 'htdocs',
-	file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
-}) =%>
-<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/system.css' }) =%>
-<%= content 'css' =%>
-% if ($c->exists_theme_file('math4-overrides.css')) {
-	<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.css' }) =%>
-% }
-%
-% # Webwork configuration for javascript
-<script>const webworkConfig = <%== $c->webwork_js_config %>;</script>
-%
-% # JS Loads
-% # The color scheme JavaScript must be loaded early and not deferred to prevent flickering as the color scheme is set.
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/color-scheme.js' }) =%>
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/MathJaxConfig/mathjax-config.js' }),
-	defer => undef =%>
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'node_modules/mathjax/tex-svg.js' }),
-	defer => undef =%>
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'node_modules/jquery/dist/jquery.min.js' }) %>
-<%= javascript $c->url({
-	type => 'webwork', name => 'htdocs',
-	file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
-	}), defer => undef =%>
-<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/system.js' }), defer => undef =%>
-<%= content 'js' =%>
-% if ($c->exists_theme_file('math4-overrides.js')) {
-	<%= javascript $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.js' }), defer => undef =%>
-% }
-%
-% if ($c->can('head')) {
-	<%== $c->head =%>
-% }
-%
-<title><%= $c->path({ style => 'text', text => ' : ', textonly => '1' }) %></title>
-</head>
-%
-<body>
-<%= link_to 'Skip to main content' => '#page-title',
-	class => 'visually-hidden-focusable bg-light p-2 m-3 position-absolute' =%>
-%
-% # Header
-<div class="masthead" role="banner">
-	<div class="webwork-logo">
-		% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
-			<button type="button" class="navbar-toggler fa-2x" id="toggle-sidebar"
-				aria-controls="site-navigation">
-				<span id="toggle-sidebar-icon">
-					<i class="fa-solid fa-bars" aria-hidden="true"></i>
-					<span class="visually-hidden"><%= maketext('close sidebar') %></span>
-				</span>
-			</button>
-		% }
-		<%= $c->webwork_logo %>
-	</div>
-	<div class="institution-logo p-1">
-		<%= $c->institution_logo %>
-		<div class="dropdown me-2">
-			<button class="btn btn-link p-0 dropdown-toggle d-flex align-items-center"
-				id="color-scheme-chooser" type="button" aria-expanded="false" data-bs-toggle="dropdown"
-					title="<%= maketext('Choose Color Scheme') %>" aria-label="<%= maketext('Choose Color Scheme') %>"
-						data-light-text="<%= maketext('light') %>" data-dark-text="<%= maketext('dark') %>"
-						data-auto-text="<%= maketext('auto') %>">
-				<i class="fa-solid fa-circle-half-stroke my-1 theme-icon-active" aria-hidden="true"></i>
-				<span class="visually-hidden" id="color-scheme-chooser-text">
-					<%= maketext('Choose Color Scheme') %>
-				</span>
-			</button>
-			<ul class="dropdown-menu" aria-labelledby="color-scheme-chooser-text">
-				<li>
-					<button type="button" class="dropdown-item d-flex align-items-center"
-						data-bs-theme-value="light" aria-pressed="false">
-						<i class="fa-solid fa-sun me-2 opacity-50" aria-hidden="true"></i>
-						Light
-						<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="dropdown-item d-flex align-items-center"
-						data-bs-theme-value="dark" aria-pressed="true">
-						<i class="fa-solid fa-moon me-2 opacity-50" aria-hidden="true"></i>
-						Dark
-						<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
-					</button>
-				</li>
-				<li>
-					<button type="button" class="dropdown-item d-flex align-items-center"
-						data-bs-theme-value="auto" aria-pressed="false">
-						<i class="fa-solid fa-circle-half-stroke me-2 opacity-50" aria-hidden="true"></i>
-						Auto
-						<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
-					</button>
-				</li>
-			</ul>
-		</div>
-	</div>
-	<div class="login-status d-flex flex-column justify-content-center gap-1">
-		<%= include 'ContentGenerator/Base/login_status' %>
-	</div>
-</div>
-% # Navigation
-% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
-	<nav id="site-navigation" class="d-flex flex-column bg-light" aria-label="main navigation">
-		% if ($c->can('links')) {
-			<div id="site-links"><%= $c->links %></div>
-		% }
-		% if ($c->can('siblings')) {
-			<div id="siblings"><%= $c->siblings %></div>
-		% }
-		% if ($c->can('options')) {
-			<div id="options" class="info-box"><%= $c->options %></div>
-		% }
-	</nav>
-% }
-%
-<div class="d-flex">
-	% # Main Content Area
-	<main id="content" class="container-fluid <%=
-		$c->can('links') || $c->can('siblings') || $c->can('options')
-			? 'flex-grow-1'
-			: 'flex-grow-1 toggle-width' %>">
+	<head>
+		<meta charset="utf-8">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		%
-		% # Breadcrumb
-		<div id="breadcrumb-row" class="row my-2">
-			<div class="col-12 d-flex align-items-center">
-				<nav id="breadcrumb-navigation" aria-label="breadcrumb navigation" class="w-100 bg-light">
-					<ol class="breadcrumb">
-						<%= $c->path({ style => 'bootstrap', text => '' }) =%>
-					</ol>
-				</nav>
-			</div>
-		</div>
-		% # Navigation, e.g.: Prev, Up, Next for homeworks
-		% if ($c->can('nav')) {
-			<%= $c->nav({ style => 'buttons', separator => '' }) =%>
+		<link
+			rel="icon"
+			type="x-image/icon"
+			href="<%= $c->url({ type => 'webwork', name => 'htdocs', file => 'images/favicon.ico' }) %>"
+		>
+		%
+		% # CSS Loads
+		<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'bootstrap.css' }) =%>
+		<%= stylesheet $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/@fortawesome/fontawesome-free/css/all.min.css'
+		}) =%>
+		<%= stylesheet $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/system.css' }) =%>
+		<%= content 'css' =%>
+		% if ($c->exists_theme_file('math4-overrides.css')) {
+			<%= stylesheet $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.css' }) =%>
 		% }
 		%
-		% # Page Title
-		% if ($c->can('page_title')) {
-			<div class="row">
-				<div class="col-12">
-					<h1 id="page-title" class="page-title">
-						<%== $c->page_title %>
-					</h1>
-					% if ($authen->{was_verified}
-						% && $authz->hasPermissions(param('user'), 'access_instructor_tools')) {
-						<%= $c->help({ label_size => 'fa-xs' }) %>
-					% }
-				</div>
-			</div>
+		% # Webwork configuration for javascript
+		<script>
+			const webworkConfig = <%== $c->webwork_js_config %>;
+		</script>
+		%
+ % # JS Loads
+ % # The color scheme JavaScript must be loaded early and not deferred to prevent flickering as the color scheme is set.
+		<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/color-scheme.js' }) =%>
+		<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/MathJaxConfig/mathjax-config.js' }),
+			defer => undef =%>
+		<%= javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'node_modules/mathjax/tex-svg.js' }),
+			defer => undef =%>
+		<%= javascript $c->url(
+			{ type => 'webwork', name => 'htdocs', file => 'node_modules/jquery/dist/jquery.min.js' }) %>
+		<%= javascript $c->url({
+			type => 'webwork',
+			name => 'htdocs',
+			file => 'node_modules/bootstrap/dist/js/bootstrap.bundle.min.js'
+			}),
+			defer => undef =%>
+		<%=
+			javascript $c->url({ type => 'webwork', name => 'htdocs', file => 'js/System/system.js' }), defer => undef
+		=%>
+		<%= content 'js' =%>
+		% if ($c->exists_theme_file('math4-overrides.js')) {
+			<%=
+				javascript $c->url({ type => 'webwork', name => 'theme', file => 'math4-overrides.js' }), defer => undef
+			=%>
 		% }
 		%
-		% # Message for the user
-		% if ($c->can('message')) {
-			<div id="message" class="message"><%= $c->message %></div>
+		% if ($c->can('head')) {
+			<%== $c->head =%>
 		% }
 		%
-		% # Indicate presence of perl warnings
-		% if ($c->have_warnings) {
-			<div class="row g-0">
-				<div id="alert-error" class="col-12 alert alert-danger"><%== $c->warningMessage %></div>
+		<title><%= $c->path({ style => 'text', text => ' : ', textonly => '1' }) %></title>
+	</head>
+	%
+	<body>
+		<%= link_to
+			'Skip to main content' => '#page-title',
+			class                  => 'visually-hidden-focusable bg-light p-2 m-3 position-absolute' =%>
+		%
+		% # Header
+		<div class="masthead" role="banner">
+			<div class="webwork-logo">
+				% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
+					<button
+						type="button"
+						class="navbar-toggler fa-2x"
+						id="toggle-sidebar"
+						aria-controls="site-navigation"
+					>
+						<span id="toggle-sidebar-icon">
+							<i class="fa-solid fa-bars" aria-hidden="true"></i>
+							<span class="visually-hidden"><%= maketext('close sidebar') %></span>
+						</span>
+					</button>
+				% }
+				<%= $c->webwork_logo %>
 			</div>
+			<div class="institution-logo p-1">
+				<%= $c->institution_logo %>
+				<div class="dropdown me-2">
+					<button
+						class="btn btn-link p-0 dropdown-toggle d-flex align-items-center"
+						id="color-scheme-chooser"
+						type="button"
+						aria-expanded="false"
+						data-bs-toggle="dropdown"
+						title="<%= maketext('Choose Color Scheme') %>"
+						aria-label="<%= maketext('Choose Color Scheme') %>"
+						data-light-text="<%= maketext('light') %>"
+						data-dark-text="<%= maketext('dark') %>"
+						data-auto-text="<%= maketext('auto') %>"
+					>
+						<i class="fa-solid fa-circle-half-stroke my-1 theme-icon-active" aria-hidden="true"></i>
+						<span class="visually-hidden" id="color-scheme-chooser-text">
+							<%= maketext('Choose Color Scheme') %>
+						</span>
+					</button>
+					<ul class="dropdown-menu" aria-labelledby="color-scheme-chooser-text">
+						<li>
+							<button
+								type="button"
+								class="dropdown-item d-flex align-items-center"
+								data-bs-theme-value="light"
+								aria-pressed="false"
+							>
+								<i class="fa-solid fa-sun me-2 opacity-50" aria-hidden="true"></i>
+								Light
+								<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
+							</button>
+						</li>
+						<li>
+							<button
+								type="button"
+								class="dropdown-item d-flex align-items-center"
+								data-bs-theme-value="dark"
+								aria-pressed="true"
+							>
+								<i class="fa-solid fa-moon me-2 opacity-50" aria-hidden="true"></i>
+								Dark
+								<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
+							</button>
+						</li>
+						<li>
+							<button
+								type="button"
+								class="dropdown-item d-flex align-items-center"
+								data-bs-theme-value="auto"
+								aria-pressed="false"
+							>
+								<i class="fa-solid fa-circle-half-stroke me-2 opacity-50" aria-hidden="true"></i>
+								Auto
+								<i class="fa-solid fa-check ms-auto d-none" aria-hidden="true"></i>
+							</button>
+						</li>
+					</ul>
+				</div>
+			</div>
+			<div class="login-status d-flex flex-column justify-content-center gap-1">
+				<%= include 'ContentGenerator/Base/login_status' %>
+			</div>
+		</div>
+		% # Navigation
+		% if ($c->can('links') || $c->can('siblings') || $c->can('options')) {
+			<nav id="site-navigation" class="d-flex flex-column bg-light" aria-label="main navigation">
+				% if ($c->can('links')) {
+					<div id="site-links"><%= $c->links %></div>
+				% }
+				% if ($c->can('siblings')) {
+					<div id="siblings"><%= $c->siblings %></div>
+				% }
+				% if ($c->can('options')) {
+					<div id="options" class="info-box"><%= $c->options %></div>
+				% }
+			</nav>
 		% }
 		%
-		% # Display the page body.
-		<div class="row mb-2">
-			<div class="body <%= $c->can('info') ? 'col-md-8' : 'col-12' %>">
-				<%= content =%>
-			</div>
-			% if ($c->can('info')) {
-				<div id="info-panel-right" class="col-md-4 mb-md-0 mb-2 order-md-last order-first">
-					<div class="info-box bg-light">
-						<%= $c->info =%>
+		<div class="d-flex">
+			% # Main Content Area
+			<main
+				id="content"
+				class="container-fluid <%= $c->can('links')
+					|| $c->can('siblings')
+					|| $c->can('options') ? 'flex-grow-1' : 'flex-grow-1 toggle-width' %>"
+			>
+				%
+				% # Breadcrumb
+				<div id="breadcrumb-row" class="row my-2">
+					<div class="col-12 d-flex align-items-center">
+						<nav id="breadcrumb-navigation" aria-label="breadcrumb navigation" class="w-100 bg-light">
+							<ol class="breadcrumb">
+								<%= $c->path({ style => 'bootstrap', text => '' }) =%>
+							</ol>
+						</nav>
 					</div>
 				</div>
-			% }
+				% # Navigation, e.g.: Prev, Up, Next for homeworks
+				% if ($c->can('nav')) {
+					<%= $c->nav({ style => 'buttons', separator => '' }) =%>
+				% }
+				%
+				% # Page Title
+				% if ($c->can('page_title')) {
+					<div class="row">
+						<div class="col-12">
+							<h1 id="page-title" class="page-title">
+								<%== $c->page_title %>
+							</h1>
+							% if ($authen->{was_verified}
+							% && $authz->hasPermissions(param('user'), 'access_instructor_tools')) {
+								<%= $c->help({ label_size => 'fa-xs' }) %>
+							% }
+						</div>
+					</div>
+				% }
+				%
+				% # Message for the user
+				% if ($c->can('message')) {
+					<div id="message" class="message"><%= $c->message %></div>
+				% }
+				%
+				% # Indicate presence of perl warnings
+				% if ($c->have_warnings) {
+					<div class="row g-0">
+						<div id="alert-error" class="col-12 alert alert-danger"><%== $c->warningMessage %></div>
+					</div>
+				% }
+				%
+				% # Display the page body.
+				<div class="row mb-2">
+					<div class="body <%= $c->can('info') ? 'col-md-8' : 'col-12' %>">
+						<%= content =%>
+					</div>
+					% if ($c->can('info')) {
+						<div id="info-panel-right" class="col-md-4 mb-md-0 mb-2 order-md-last order-first">
+							<div class="info-box bg-light">
+								<%= $c->info =%>
+							</div>
+						</div>
+					% }
+				</div>
+				%
+				% if ($c->have_warnings) {
+					<div class="alert alert-danger mb-2"><%= $c->warnings %></div>
+				% }
+				% if ($c->can('message')) {
+					<div id="message_bottom" class="message"><%= $c->message %></div>
+					<div>
+						<button type="button" id="dismiss-messages-btn" class="btn btn-secondary d-none">
+							<%= maketext('Dismiss All Messages') %>
+						</button>
+					</div>
+				% }
+				%
+				% # Footer
+				<%= include 'ContentGenerator/Base/footer' =%>
+			</main>
 		</div>
 		%
-		% if ($c->have_warnings) {
-			<div class="alert alert-danger mb-2"><%= $c->warnings %></div>
-		% }
-		% if ($c->can('message')) {
-			<div id="message_bottom" class="message"><%= $c->message %></div>
-			<div>
-				<button type="button" id="dismiss-messages-btn" class="btn btn-secondary d-none">
-					<%= maketext('Dismiss All Messages') %>
-				</button>
-			</div>
-		% }
-		%
-		% # Footer
-		<%= include 'ContentGenerator/Base/footer' =%>
-	</main>
-</div>
-%
-% # This is a place that modal dialog html markup can be safely placed if needed by a page.
-<%= content 'modal-dialog-area' =%>
-%
-</body>
+		% # This is a place that modal dialog html markup can be safely placed if needed by a page.
+		<%= content 'modal-dialog-area' =%>
+	</body>
 </html>

From 378f8dc87466bdf4a1beb5fa8b8a1071dbdba997 Mon Sep 17 00:00:00 2001
From: Glenn Rice <grice1@missouriwestern.edu>
Date: Tue, 21 Jul 2026 18:55:56 -0500
Subject: [PATCH 3/3] Clean up things revealed in formatting.

---
 .../AchievementList/default_table.html.ep     |  2 +-
 .../AchievementList/delete_form.html.ep       |  2 +-
 .../ProblemSet/auxiliary_tools.html.ep        |  5 +-
 templates/HelpFiles/AdminHideCourses.html.ep  |  8 +-
 .../HelpFiles/AdminManageLTICourseMap.html.ep |  6 +-
 .../HelpFiles/AdminManageLocations.html.ep    |  4 +-
 .../HelpFiles/AdminUpgradeCourses.html.ep     |  4 +-
 templates/HelpFiles/Grades.html.ep            | 16 ++--
 templates/HelpFiles/Hardcopy.html.ep          |  6 +-
 .../InstructorAchievementEditor.html.ep       |  8 +-
 .../InstructorAchievementList.html.ep         | 25 ++---
 .../InstructorAchievementUserEditor.html.ep   | 10 +-
 .../HelpFiles/InstructorFileManager.html.ep   | 18 ++--
 templates/HelpFiles/InstructorIndex.html.ep   |  8 +-
 .../HelpFiles/InstructorJobManager.html.ep    | 11 ++-
 .../InstructorPGProblemEditor.html.ep         | 90 ++++++++---------
 .../HelpFiles/InstructorProblemGrader.html.ep |  8 +-
 .../InstructorProblemSetDetail.html.ep        | 23 ++---
 .../InstructorProblemSetList.html.ep          | 14 +--
 templates/HelpFiles/InstructorScoring.html.ep |  4 +-
 .../HelpFiles/InstructorSendMail.html.ep      | 13 +--
 .../HelpFiles/InstructorShowAnswers.html.ep   |  4 +-
 .../HelpFiles/InstructorUserDetail.html.ep    | 22 ++---
 .../HelpFiles/InstructorUserList.html.ep      | 96 ++++++++++---------
 .../InstructorUsersAssignedToSet.html.ep      |  4 +-
 templates/HelpFiles/Levels.html.ep            |  4 +-
 templates/HelpFiles/Options.html.ep           | 18 ++--
 templates/HelpFiles/ProblemSets.html.ep       |  8 +-
 templates/RPCRenderFormats/default.html.ep    | 13 ++-
 29 files changed, 235 insertions(+), 219 deletions(-)

diff --git a/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
index e62e0cfedb..80cddaa315 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/default_table.html.ep
@@ -68,7 +68,7 @@
 					</td>
 					<td class="text-nowrap">
 						<%= link_to $c->systemLink(
-							url_for('instructor_achievement_notification', achievementID => $achievement_id),),
+							url_for('instructor_achievement_notification', achievementID => $achievement_id)),
 							begin =%>
 							<%= $_->email_template
 								? maketext('Edit Email Template')
diff --git a/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
index 6a6290d0d2..44cdb6ca02 100644
--- a/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
+++ b/templates/ContentGenerator/Instructor/AchievementList/delete_form.html.ep
@@ -9,7 +9,7 @@
 		<div class="col-auto">
 			<%= select_field
 				'action.delete.confirm' =>
-				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ], ],
+				[ [ maketext('No') => 'no', selected => undef ], [ maketext('Yes') => 'yes' ] ],
 				id    => 'delete_select',
 				class => 'form-select form-select-sm d-inline w-auto me-3' =%>
 		</div>
diff --git a/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep b/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
index 0405e6290f..905ecc6a49 100644
--- a/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
+++ b/templates/ContentGenerator/ProblemSet/auxiliary_tools.html.ep
@@ -57,7 +57,10 @@
 									<dt class="fs-4"><%= $item->name %></dt>
 									<dd class="mx-3 mb-4">
 										% if (param('user') eq param('effectiveUser')) {
-											<%= form_for current_route, method => 'POST', name => 'use_reward', begin =%>
+											<%= form_for current_route,
+												method => 'POST',
+												name   => 'use_reward',
+												begin =%>
 												<%= hidden_field 'use_achievement_item_id' => $item->id %>
 												<%= $form %>
 												% unless ($item->{hideUseButton}) {
diff --git a/templates/HelpFiles/AdminHideCourses.html.ep b/templates/HelpFiles/AdminHideCourses.html.ep
index 0f2de07f07..b758551ce4 100644
--- a/templates/HelpFiles/AdminHideCourses.html.ep
+++ b/templates/HelpFiles/AdminHideCourses.html.ep
@@ -3,8 +3,8 @@
 %
 <p class="mb-0">
 	<%= maketext('Select the course(s) you want to hide (or unhide) and then click "Hide Courses" (or "Unhide '
-			. 'Courses"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise unhiding '
-			. 'a course that is already visible does no harm (the action is skipped). Hidden courses are still active '
-			. 'but are not listed in the list of WeBWorK courses on the opening page. To access the course, an '
-			. 'instructor or student must know the full URL address for the course.') =%>
+			. 'Courses"). Hiding a course that is already hidden does no harm (the action is skipped). Likewise '
+			. 'unhiding a course that is already visible does no harm (the action is skipped). Hidden courses are '
+			. 'still active but are not listed in the list of WeBWorK courses on the opening page. To access the '
+			. 'course, an instructor or student must know the full URL address for the course.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminManageLTICourseMap.html.ep b/templates/HelpFiles/AdminManageLTICourseMap.html.ep
index 75acf46a68..2c76324d44 100644
--- a/templates/HelpFiles/AdminManageLTICourseMap.html.ep
+++ b/templates/HelpFiles/AdminManageLTICourseMap.html.ep
@@ -12,7 +12,7 @@
 <p class="mb-0">
 	<%= maketext('Note that two courses in different LMSs might have the same context id. If that is the case, then '
 			. 'these courses must must have different LTI configurations. For LTI 1.1, this means they must have the '
-			. 'consumer key set to different values in the two LMSs and that must be set in the LTI 1.1 configuration for '
-			. 'the courses in WeBWorK. For LTI 1.3, two different LMSs will always have different configurations. Make '
-			. 'sure the two configurations are correct in WeBWorK.') =%>
+			. 'consumer key set to different values in the two LMSs and that must be set in the LTI 1.1 configuration '
+			. 'for the courses in WeBWorK. For LTI 1.3, two different LMSs will always have different configurations. '
+			. 'Make sure the two configurations are correct in WeBWorK.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminManageLocations.html.ep b/templates/HelpFiles/AdminManageLocations.html.ep
index 19a58e20c3..3a9ba07151 100644
--- a/templates/HelpFiles/AdminManageLocations.html.ep
+++ b/templates/HelpFiles/AdminManageLocations.html.ep
@@ -3,8 +3,8 @@
 %
 <p>
 	<%= maketext('Fill out the form below to add, edit, or delete locations.  Locations are used to restrict access '
-			. 'to sets based on ip address.  Locations are configured here in the administration course, then used in a '
-			. 'normal course.  When configuring a set to use a restricted ip address, the instructor can choose to '
+			. 'to sets based on ip address.  Locations are configured here in the administration course, then used in '
+			. 'a normal course.  When configuring a set to use a restricted ip address, the instructor can choose to '
 			. 'either restrict access to the location or deny access from a location, which are identified by their '
 			. 'name.  Instructors can select multiple locations to restrict access to.') =%>
 </p>
diff --git a/templates/HelpFiles/AdminUpgradeCourses.html.ep b/templates/HelpFiles/AdminUpgradeCourses.html.ep
index c96c55e646..c7f55036e8 100644
--- a/templates/HelpFiles/AdminUpgradeCourses.html.ep
+++ b/templates/HelpFiles/AdminUpgradeCourses.html.ep
@@ -4,6 +4,6 @@
 <p class="mb-0">
 	<%= maketext('Select which courses to upgrade from a previous version of WeBWorK.  The upgrade process can add '
 			. 'missing database columns, delete unused database columns, and check the course file structure.  Be sure '
-			. 'to read over the changes before confirming the upgrade.  You may want to create an archive of the course '
-			. 'before upgrading.  Only courses that need upgraded will be selectable.') =%>
+			. 'to read over the changes before confirming the upgrade.  You may want to create an archive of the '
+			. 'course before upgrading.  Only courses that need upgraded will be selectable.') =%>
 </p>
diff --git a/templates/HelpFiles/Grades.html.ep b/templates/HelpFiles/Grades.html.ep
index 0bfc8e28f7..2c81f446b5 100644
--- a/templates/HelpFiles/Grades.html.ep
+++ b/templates/HelpFiles/Grades.html.ep
@@ -2,10 +2,10 @@
 % title maketext('Grades Help');
 %
 <p>
-	<%= maketext(q{This page shows the student's current grade for all assignments they are assigned to.  This page }
-			. 'only shows assignments and grades visible to the student. To view all grades, visit the "Student Progress" '
-			. q{page for the student. The student navigation menu at the top can be used to change which student's grades }
-			. 'to view') =%>
+	<%= maketext(q{This page shows the student's current grade for all assignments they are assigned to.  This }
+			. 'page only shows assignments and grades visible to the student. To view all grades, visit the '
+			. '"Student Progress" page for the student. The student navigation menu at the top can be used to '
+			. q{change which student's grades to view}) =%>
 </p>
 <p>
 	<%= maketext('The total grade at the top shows the total score and percent average over all open assignments.  '
@@ -13,10 +13,10 @@
 </p>
 <p>
 	<%= maketext('The grades are divided into open, reduced scoring, closed, and future assignments.  No grades are '
-			. 'shown for future assignments, just their open date.  Assignments are sorted using the same urgency logic '
-			. 'as the "Assignments" page.  For open assignments, a table of per problem scores are shown for homework '
-			. 'assignments. Just in time assignments only show top level problems.  Tests only show the best test version '
-			. 'provided students can see the test grade.') %>
+			. 'shown for future assignments, just their open date.  Assignments are sorted using the same urgency '
+			. 'logic as the "Assignments" page.  For open assignments, a table of per problem scores are shown for '
+			. 'homework assignments. Just in time assignments only show top level problems.  Tests only show the best'
+			. ' test version provided students can see the test grade.') %>
 </p>
 <p class="m-0">
 	<%== maketext(
diff --git a/templates/HelpFiles/Hardcopy.html.ep b/templates/HelpFiles/Hardcopy.html.ep
index 792e88fc8d..45f7472cf0 100644
--- a/templates/HelpFiles/Hardcopy.html.ep
+++ b/templates/HelpFiles/Hardcopy.html.ep
@@ -40,9 +40,9 @@
 <p>
 	<%== maketext(
 		'Once "Generate Hardcopy for selected sets and selected users" is clicked a file in the selected '
-			. 'hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF file '
-			. 'is generated. If TeX output is selected, a zip file is generated that contains all files needed to '
-			. 'generated the hardcopy PDF file via LaTeX. The main TeX file is called [_2].',
+			. 'hardcopy format will be generated and offered for download. If PDF output was selected, a single PDF '
+			. 'file is generated. If TeX output is selected, a zip file is generated that contains all files needed '
+			. 'to generated the hardcopy PDF file via LaTeX. The main TeX file is called [_2].',
 		'<code>hardcopy.tex</code>'
 	) =%>
 </p>
diff --git a/templates/HelpFiles/InstructorAchievementEditor.html.ep b/templates/HelpFiles/InstructorAchievementEditor.html.ep
index 2ab7b0cc53..49e9f7dd7b 100644
--- a/templates/HelpFiles/InstructorAchievementEditor.html.ep
+++ b/templates/HelpFiles/InstructorAchievementEditor.html.ep
@@ -2,10 +2,10 @@
 % title maketext('Achievement Evaluator Editor Help');
 %
 <p>
-	<%= maketext('An achievement evaluator is a perl script that is run after each problem is submitted which returns '
-			. 'a truth value of 0 (didn\'t earn) or 1 (earn). The evaluator is given access to different variables which '
-			. 'contain data about the problem and set that is used to determine if the achievement is earned or not.'
-	) =%>
+	<%= maketext('An achievement evaluator is a perl script that is run after each problem is submitted which '
+			. q{returns a truth value of 0 (didn't earn) or 1 (earn). The evaluator is given access to different }
+			. 'variables which contain data about the problem and set that is used to determine if the achievement '
+			. 'is earned or not.') =%>
 </p>
 <p>
 	<%= maketext('Use the editor to edit the evaluator and the action form at the bottom to save the evaluator. You '
diff --git a/templates/HelpFiles/InstructorAchievementList.html.ep b/templates/HelpFiles/InstructorAchievementList.html.ep
index 357d185dde..e01616d06f 100644
--- a/templates/HelpFiles/InstructorAchievementList.html.ep
+++ b/templates/HelpFiles/InstructorAchievementList.html.ep
@@ -3,8 +3,8 @@
 %
 <p>
 	<%= maketext('Manage achievements for the course.  The actions allow one to edit, assign, import, export, score, '
-			. 'create, or delete achievements.  The action form is at the top to select the desired action and options to '
-			. 'perform when the submit button is pressed.  Below the action form is the list of all the '
+			. 'create, or delete achievements.  The action form is at the top to select the desired action and options '
+			. 'to perform when the submit button is pressed.  Below the action form is the list of all the '
 			. 'achievements, ordered by their achievement "Number", with "level" achievements listed last.') =%>
 </p>
 <p>
@@ -16,9 +16,9 @@
 <p>
 	<%= maketext('Achievements in the same category, with sequential numbers, and whose ID starts with the same '
 			. '"prefix_" (up to the last underscore), are treated as achievement chains.  Achievement chains are a '
-			. 'sequence of achievements which build upon themselves, such as complete one problem, complete 10 problems, '
-			. 'complete 25 problems, and so on. Students will only see the achievements in the chain they have completed '
-			. 'or are currently working on.') =%>
+			. 'sequence of achievements which build upon themselves, such as complete one problem, complete 10 '
+			. 'problems, complete 25 problems, and so on. Students will only see the achievements in the chain they '
+			. 'have completed or are currently working on.') =%>
 </p>
 <h2><%= maketext('Achievement options') %></h2>
 <ul>
@@ -90,10 +90,11 @@
 
 	<dt><%= maketext('Import/export achievements') %></dt>
 	<dd>
-		<%= maketext('You can import/export from their respective action tab.  Exporting saves information about the '
-				. 'achievement as a .axp file which is a CSV that lists each achievements information.  You can import '
-				. '.axp files that have been previously exported.  Use the "File Manager" to upload/download .axp files '
-				. 'to "achievements" directory (also upload/download any achievement evaluator .at files needed).') =%>
+		<%= maketext('You can import/export from their respective action tab.  Exporting saves information about '
+				. 'the achievement as a .axp file which is a CSV that lists each achievements information.  You can '
+				. 'import .axp files that have been previously exported.  Use the "File Manager" to upload/download '
+				. '.axp files to "achievements" directory (also upload/download any achievement evaluator .at files '
+				. 'needed).') =%>
 	</dd>
 
 	<dd></dd>
@@ -108,9 +109,9 @@
 	<dt><%= maketext('Export achievement data') %></dt>
 	<dd>
 		<%= maketext('The "Score" tab will export achievement data to a CSV file that can be downloaded.  The export '
-				. 'contains the global data including number of achievement points and current level of each student.  '
-				. 'In addition for each selected achievement, a column for if the achievement was earned (1) or not earned '
-				. '(0) will be added to the CSV.') =%>
+				. 'contains the global data including number of achievement points and current level of each student. '
+				. 'In addition for each selected achievement, a column for if the achievement was earned (1) or not '
+				. 'earned (0) will be added to the CSV.') =%>
 	</dd>
 
 	<dt><%= maketext('Create/Delete achievements') %></dt>
diff --git a/templates/HelpFiles/InstructorAchievementUserEditor.html.ep b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
index 24bfe898c2..cc80452c77 100644
--- a/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
+++ b/templates/HelpFiles/InstructorAchievementUserEditor.html.ep
@@ -3,9 +3,9 @@
 %
 <p class="mb-0">
 	<%= maketext('This form can assign, unassign, and edit user data for a single achievement.  You can assign the '
-			. 'achievement to all current users or select which users to assign the achievement to and click Save.  You '
-			. 'can unassign the achievement by unchecking a student\'s name (note all data will be deleted).  To unassign '
-			. 'the achievement from all users, first select "Allow unassign" and then click the "Unassign from All Users" '
-			. 'button. You can also toggle the earned status with the checkbox in the "Earned" column and edit the '
-			. 'achievement counter for counting achievements.') =%>
+			. 'achievement to all current users or select which users to assign the achievement to and click Save.  '
+			. 'You can unassign the achievement by unchecking a student\'s name (note all data will be deleted). '
+			. 'To unassign the achievement from all users, first select "Allow unassign" and then click the '
+			. '"Unassign from All Users" button. You can also toggle the earned status with the checkbox in the '
+			. '"Earned" column and edit the achievement counter for counting achievements.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorFileManager.html.ep b/templates/HelpFiles/InstructorFileManager.html.ep
index e9f17426a6..ea5a6e2e31 100644
--- a/templates/HelpFiles/InstructorFileManager.html.ep
+++ b/templates/HelpFiles/InstructorFileManager.html.ep
@@ -33,8 +33,8 @@
 				. '<strong>Set Definition files</strong> is described in the <a [_1]>Set Definition specification</a>. '
 				. 'Set definition files are mainly useful for transferring set assignments from one course to another '
 				. 'and are created when exporting a problem set from the "Sets Manager". Each set definition file '
-				. 'contains a list of problems used and the dates and times. These definitions can be imported into the '
-				. 'current course.',
+				. 'contains a list of problems used and the dates and times. These definitions can be imported into '
+				. 'the current course.',
 			'href="https://wiki.openwebwork.org/wiki/Set_Definition_Files" target="Webworkdocs"'
 		) =%>
 	</dd>
@@ -42,8 +42,8 @@
 	<dd>
 		<%== maketext(
 			'The classlist files are stored in the templates directory and provide a convenient way to enter '
-				. 'a large number of students into your class. To view the format for <strong>ClassList files</strong> see '
-				. 'the <a [_1]>ClassList specification</a> or download the [_2] file and use it as a model. '
+				. 'a large number of students into your class. To view the format for <strong>ClassList files</strong> '
+				. 'see the <a [_1]>ClassList specification</a> or download the [_2] file and use it as a model. '
 				. 'ClassList files can be prepared using a spreadsheet and then saved as [_3] (comma separated values) '
 				. 'text files. However, to access as a classlist file, the file suffix needs to be changed to [_4], '
 				. 'which can be done with the "Rename" button.',
@@ -57,9 +57,9 @@
 	<dd>
 		<%== maketext(
 			'The scoring files are stored in the scoring directory and are produced using the "Scoring Tools" '
-				. 'page or the scoring command in the "Instructor Tools" module. These files can be downloaded, modified '
-				. 'in a spreadsheet (for example, to add midterm scores) and then uploaded again to the scoring directory '
-				. 'to be merged with email messages. (Use a new file name, other than [_1], when '
+				. 'page or the scoring command in the "Instructor Tools" module. These files can be downloaded, '
+				. 'modified in a spreadsheet (for example, to add midterm scores) and then uploaded again to the '
+				. 'scoring directory to be merged with email messages. (Use a new file name, other than [_1], when '
 				. 'uploading to prevent the scoring module from overwriting an uploaded file.)',
 			'<code>courseName_totals.csv</code>'
 		) =%>
@@ -69,8 +69,8 @@
 		<%= maketext('These are the files from which problems are generated and are located in the templates '
 				. 'directory or in subdirectories. They can be edited directly using the "Edit" link on each problem '
 				. 'page or from the "Sets Manager". The File Manager allows you to upload or download these files. 	'
-				. 'Directories that start with "set" contain pg files and are generated when exporting a problem set in '
-				. 'which there are local versions of a problem.') =%>
+				. 'Directories that start with "set" contain pg files and are generated when exporting a problem set '
+				. 'in which there are local versions of a problem.') =%>
 	</dd>
 	<dt><%= maketext('html directory') %></dt>
 	<dd>
diff --git a/templates/HelpFiles/InstructorIndex.html.ep b/templates/HelpFiles/InstructorIndex.html.ep
index 084cd2e471..3b4e6db52d 100644
--- a/templates/HelpFiles/InstructorIndex.html.ep
+++ b/templates/HelpFiles/InstructorIndex.html.ep
@@ -18,8 +18,8 @@
 </p>
 <p class="mb-0">
 	<%= maketext('Multiple users and sets can be selected using ctrl-click or shift-click.  The action buttons are '
-			. 'grouped into three categories.  The first is a set of actions that act on the selected users, the second is '
-			. 'a set of actions for acting on a combination of sets and users, and the third is a set of actions that act '
-			. 'on the selected sets.  If an invalid number of users or sets are selected, the action will not be '
-			. 'performed, and an error message will be placed on the page.') =%>
+			. 'grouped into three categories.  The first is a set of actions that act on the selected users, the '
+			. 'second is a set of actions for acting on a combination of sets and users, and the third is a set of '
+			. 'actions that act on the selected sets.  If an invalid number of users or sets are selected, the action '
+			. 'will not be performed, and an error message will be placed on the page.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorJobManager.html.ep b/templates/HelpFiles/InstructorJobManager.html.ep
index 5e1f505438..4d5bb388a7 100644
--- a/templates/HelpFiles/InstructorJobManager.html.ep
+++ b/templates/HelpFiles/InstructorJobManager.html.ep
@@ -39,8 +39,8 @@
 				. 'executed. If a job is "finished" it means that the execution of the job has successfully '
 				. 'completed. If a job is "failed" it means that the execution of job has completed, but there were '
 				. 'errors in the execution of the job. If the job is in the "finished" or "failed" state, then there '
-				. 'will also be a button which when clicked will show a dialog containing information about what happened '
-				. 'when the job was executed.') =%>
+				. 'will also be a button which when clicked will show a dialog containing information about what '
+				. 'happened when the job was executed.') =%>
 	</dd>
 </dl>
 %
@@ -59,8 +59,9 @@
 	<dt><%= maketext('Delete') %></dt>
 	<dd>
 		<%= maketext('Delete selected jobs.  Note that jobs that are in the "active" state cannot be deleted. '
-				. 'Jobs that are in the "inactive" state can be deleted, but it is possible that by the time the request '
-				. 'to delete the job occurs the job may have transitioned into the "active" state.  In that case the job '
-				. 'will not be deleted. Jobs that are in the "finished" or "failed" states can always be deleted.') =%>
+				. 'Jobs that are in the "inactive" state can be deleted, but it is possible that by the time the '
+				. 'request to delete the job occurs the job may have transitioned into the "active" state.  In that '
+				. 'case the job will not be deleted. Jobs that are in the "finished" or "failed" states can always '
+				. 'be deleted.') =%>
 	</dd>
 </dl>
diff --git a/templates/HelpFiles/InstructorPGProblemEditor.html.ep b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
index 4e90366426..38cad5850f 100644
--- a/templates/HelpFiles/InstructorPGProblemEditor.html.ep
+++ b/templates/HelpFiles/InstructorPGProblemEditor.html.ep
@@ -111,12 +111,12 @@
 			</tbody>
 		</table>
 		<%= maketext('There are resize grips that can be moved to resize the editor windows.  This can be done by '
-				. 'clicking and dragging or by focusing the resize grip and using the arrow keys. If the resize grip is '
-				. 'focused and the Ctrl key (Ctrl + Cmd keys on Mac) is held down then the size is only changed by one '
-				. 'pixel for each arrow key press, and if the Alt key (Option key for Mac) is held down then the size is '
-				. 'changed by 50 pixels for each arrow key press. With no modifier key the size is changed by 20 pixels. '
-				. 'Double clicking on a resize grip or pressing Enter or Space while a resize grip is focused resets the '
-				. 'windows to their default sizes.') =%>
+				. 'clicking and dragging or by focusing the resize grip and using the arrow keys. If the resize grip '
+				. 'is focused and the Ctrl key (Ctrl + Cmd keys on Mac) is held down then the size is only changed by '
+				. 'one pixel for each arrow key press, and if the Alt key (Option key for Mac) is held down then the '
+				. 'size is changed by 50 pixels for each arrow key press. With no modifier key the size is changed by '
+				. '20 pixels. Double clicking on a resize grip or pressing Enter or Space while a resize grip is '
+				. 'focused resets the windows to their default sizes.') =%>
 	</dd>
 	<dt><%= maketext('Text Editor Options') %></dt>
 	<dd class="list-group-item">
@@ -126,8 +126,8 @@
 			<dt><%= maketext('Key Map') %></dt>
 			<dd>
 				<%= maketext('The key maps that are available are "default", "emacs", "sublime", and "vim". The '
-						. '"default" key map has the standard behavior of a browser text area. You can use Ctrl-C to copy, '
-						. 'Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the "emacs" '
+						. '"default" key map has the standard behavior of a browser text area. You can use Ctrl-C to '
+						. 'copy, Ctrl-V to paste, Ctrl-F to search, etc. If you are more comfortable with the "emacs" '
 						. ' or "vim" text editors then you may choose to use one of those key maps instead.') =%>
 			</dd>
 			<dt><%= maketext('Enable Spell Checking') %></dt>
@@ -151,9 +151,9 @@
 		<p>
 			<%= maketext('Render or re-render the problem, course info file, or set header being edited. This does not '
 					. 'change the permanent file on the disk. You can view different versions of the same problem by '
-					. 'changing the seed. You can also change the manner in which the mathematics is typeset. If "Open in '
-					. 'new window" is checked, then the problem will open in a new tab or window showing the problem as it '
-					. 'will be rendered for students in the set.') =%>
+					. 'changing the seed. You can also change the manner in which the mathematics is typeset. If "Open '
+					. 'in new window" is checked, then the problem will open in a new tab or window showing the '
+					. 'problem as it will be rendered for students in the set.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all file types except hardcopy header files.') =%>
@@ -164,11 +164,11 @@
 	<dd>
 		<p>
 			<%= maketext('Generate a hardcopy of the problem being edited. This does not change the permanent file on '
-					. 'the disk. You can generate a hardcopy for different versions of the same problem by changing the '
-					. 'seed. You can also change the format to "PDF" or "TeX Source". If "PDF" is selected, then a PDF '
-					. 'file will be generated for download, unless there are errors. If errors occur or "TeX Source" is '
-					. 'selected, then a zip file will be generated for download that contains the TeX source file and '
-					. 'resources needed for generating the PDF file using LaTeX.') =%>
+					. 'the disk. You can generate a hardcopy for different versions of the same problem by changing '
+					. 'the seed. You can also change the format to "PDF" or "TeX Source". If "PDF" is selected, then a '
+					. 'PDF file will be generated for download, unless there are errors. If errors occur or '
+					. '"TeX Source" is selected, then a zip file will be generated for download that contains the TeX '
+					. 'source file and resources needed for generating the PDF file using LaTeX.') =%>
 		</p>
 		<p>
 			<%= maketext('You can also click "Edit Selected Theme" to edit a hardcopy theme.  The new theme will be '
@@ -185,14 +185,14 @@
 		<p>
 			<%= maketext('Three code maintenance tools can be utilized. First, the code can be reformatted using '
 					. 'perltidy. Using perltidy will change the code in the editor window, and save changes to the '
-					. 'temporary file. In some cases (if the code contains backslashes or double tildes) this can result '
-					. 'in odd spacing in the code. Second the code can be converted to PGML. This changes the code in text '
-					. 'blocks to use PGML features. Generally the conversion of much of the formatting and LaTeX is '
-					. 'performed correctly. However, answer blanks need attention. In any case, make sure to inspect the '
-					. 'formatted code, and edit further or revert if needed. Third, the code can be analyzed by the "PG '
-					. 'Critic." This checks that the code does not use old or deprecated features of PG and conforms to '
-					. 'current best-practices in problem authoring, and offers suggestions on how to fix issues that are '
-					. 'found.') =%>
+					. 'temporary file. In some cases (if the code contains backslashes or double tildes) this can '
+					. 'result in odd spacing in the code. Second the code can be converted to PGML. This changes the '
+					. 'code in text blocks to use PGML features. Generally the conversion of much of the formatting '
+					. 'and LaTeX is performed correctly. However, answer blanks need attention. In any case, make sure '
+					. 'to inspect the formatted code, and edit further or revert if needed. Third, the code can be '
+					. 'analyzed by the "PG Critic." This checks that the code does not use old or deprecated features '
+					. 'of PG and conforms to current best-practices in problem authoring, and offers suggestions on '
+					. 'how to fix issues that are found.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is only available for problem files, set header files, and hardcopy header '
@@ -206,18 +206,18 @@
 		<p>
 			<%= maketext('Save the contents of the editor window to the file on disk and re-render the problem. If '
 					. '"Open in new window" is checked, then the problem will open in a new tab or window showing the '
-					. 'problem as it will be rendered for students in the set. If "Create backup" is checked then a backup '
-					. 'of the current file on disk will be created before overwriting it with the contents of the editor '
-					. 'window. If a backup already exists, then a "Delete oldest backup" check box will be present. If '
-					. 'that is checked, then the oldest backup will be deleted when "Save" is clicked. These backups can '
-					. 'be reverted to and managed on the "Revert" tab.') =%>
+					. 'problem as it will be rendered for students in the set. If "Create backup" is checked then a '
+					. 'backup of the current file on disk will be created before overwriting it with the contents of '
+					. 'the editor window. If a backup already exists, then a "Delete oldest backup" check box will be '
+					. 'present. If that is checked, then the oldest backup will be deleted when "Save" is clicked. '
+					. 'These backups can be reverted to and managed on the "Revert" tab.') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all files, but is only active for files in the course templates '
 					. 'directory that are writable by the server. For files outside of the course templates directory, '
-					. 'such as sample problems or a new problem template, or files that are not writable by the server, '
-					. 'such as OPL problems, first use the "Save As" tab to save to a file in the course templates '
-					. 'directory.') =%>
+					. 'such as sample problems or a new problem template, or files that are not writable by the '
+					. 'server, such as OPL problems, first use the "Save As" tab to save to a file in the course '
+					. 'templates directory.') =%>
 		</p>
 	</dd>
 
@@ -238,19 +238,19 @@
 		</p>
 		<p>
 			<%= maketext('When saving a problem in a new location (directory), by default all auxiliary files, such '
-					. 'as images, or other files that do not end in ".pg", will also be copied to the new location.  To '
-					. 'stop this behavior, uncheck the "Copy auxiliary files" option.') =%>
+					. 'as images, or other files that do not end in ".pg", will also be copied to the new location. '
+					. 'To stop this behavior, uncheck the "Copy auxiliary files" option.') =%>
 		</p>
 		<p>
 			<%= maketext('You may want to create an unattached problem if you are using the current problem as a model '
-					. 'for a new problem. You can add the new file to a homework set from the Library Browser or via the '
-					. 'set detail page of the "Sets Manager".') =%>
+					. 'for a new problem. You can add the new file to a homework set from the Library Browser or via '
+					. 'the set detail page of the "Sets Manager".') =%>
 		</p>
 		<p>
 			<%= maketext('If the original problem cannot be edited than the path name must be changed in order to be '
-					. 'allowed to save the problem. Adding "local/" to the beginning of the original path is the default '
-					. 'solution. All locally created and edited files will then appear in a subdirectory named '
-					. '"local".') =%>
+					. 'allowed to save the problem. Adding "local/" to the beginning of the original path is the '
+					. 'default solution. All locally created and edited files will then appear in a subdirectory '
+					. 'named "local".') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is available for all file types except for the course information file.') =%>
@@ -261,15 +261,15 @@
 	<dd>
 		<p>
 			<%= maketext('Add this problem as the last problem of an existing set, either as a problem, as the set '
-					. 'header (the text that appears on the home page of a homework set), or the hardcopy header (the text '
-					. 'that appears in the beginning of hardcopy for a set). You can rearrange the order of the problems '
-					. 'later using the "Sets Manager".') =%>
+					. 'header (the text that appears on the home page of a homework set), or the hardcopy header (the '
+					. 'text that appears in the beginning of hardcopy for a set). You can rearrange the order of the '
+					. 'problems later using the "Sets Manager".') =%>
 		</p>
 		<p>
 			<%= maketext('This tab is only available for problem files, set header files, and hardcopy header files, '
-					. 'but is not active for a new problem template or a sample problem. To append a new problem template '
-					. 'or sample problem to a set, first use "Save As" to save the file to the course templates '
-					. 'directory.') =%>
+					. 'but is not active for a new problem template or a sample problem. To append a new problem '
+					. 'template or sample problem to a set, first use "Save As" to save the file to the course '
+					. 'templates directory.') =%>
 		</p>
 	</dd>
 
diff --git a/templates/HelpFiles/InstructorProblemGrader.html.ep b/templates/HelpFiles/InstructorProblemGrader.html.ep
index f666b23f0b..3c9fe87339 100644
--- a/templates/HelpFiles/InstructorProblemGrader.html.ep
+++ b/templates/HelpFiles/InstructorProblemGrader.html.ep
@@ -9,8 +9,8 @@
 </p>
 <p class="m-0">
 	<%= maketext('The problem is shown at the top with the seed and answers of the selected student.  Use the drop '
-			. q(down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to set )
-			. 'the score to 100%.  The feedback comment can contain LaTeX formulas using the deliminator "\\\\( ... \\)" '
-			. q(for math mode, and is placed above the student's problem.  Students can access the feedback comments by )
-			. 'going to the page for the associated set and problem number.') =%>
+			. q{down menu to change which student's seed and answers are shown.  Use the "Mark Correct" checkbox to }
+			. 'set the score to 100%.  The feedback comment can contain LaTeX formulas using the deliminator '
+			. q{"\\\\( ... \\)" for math mode, and is placed above the student's problem.  Students can access the }
+			. 'feedback comments by going to the page for the associated set and problem number.') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorProblemSetDetail.html.ep b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
index 9d9f916482..0301f70004 100644
--- a/templates/HelpFiles/InstructorProblemSetDetail.html.ep
+++ b/templates/HelpFiles/InstructorProblemSetDetail.html.ep
@@ -61,15 +61,15 @@
 	<dt><%= maketext('Expand All Nesting') %></dt>
 	<dd>
 		<%= maketext('Only present for JITAR sets. Expand JITAR nested problem groups that have been collapsed. Note '
-				. 'that the nesting of a single problem group can be expanded by clicking on the right arrow to the right '
-				. 'of the problem number.') =%>
+				. 'that the nesting of a single problem group can be expanded by clicking on the right arrow to the '
+				. 'right of the problem number.') =%>
 	</dd>
 
 	<dt><%= maketext('Collapse All Nesting') %></dt>
 	<dd>
 		<%= maketext('Only present for JITAR sets. Collapse JITAR nesting problem groups to the top row of information '
-				. 'about a problem. Note that the nesting of a single problem group can be collapsed by clicking on the '
-				. 'down arrow to the right of the problem number.') =%>
+				. 'about a problem. Note that the nesting of a single problem group can be collapsed by clicking on '
+				. 'the down arrow to the right of the problem number.') =%>
 	</dd>
 
 	<dt><%= maketext('Display Mode') %></dt>
@@ -108,16 +108,17 @@
 	<dt><%= maketext('Deleting Problems') %></dt>
 	<dd>
 		<%= maketext('You can delete problems by clicking the "Delete it?" check box and saving. If the set is already '
-				. 'active it is recommended that you instead use the "Mark Correct?" problem to mark a particular problem '
-				. 'correct for all students.') =%>
+				. 'active it is recommended that you instead use the "Mark Correct?" problem to mark a particular '
+				. 'problem correct for all students.') =%>
 	</dd>
 
 	<dt><%= maketext('Rendering Problems') %></dt>
 	<dd>
 		<%= maketext('You can render a problem by clicking the "Render Problem" icon to the right of the problem '
-				. 'number. The display mode used to render the problem is chosen using the drop down menu. You can render all '
-				. 'problems using the "Render All" button. "Hide All" will hide all rendered problems. It is also useful to '
-				. 'collapse problem details when doing this, as it makes it easier to drag problems around.') =%>
+				. 'number. The display mode used to render the problem is chosen using the drop down menu. You can '
+				. 'render all problems using the "Render All" button. "Hide All" will hide all rendered problems. It '
+				. 'is also useful to collapse problem details when doing this, as it makes it easier to drag '
+				. 'problems around.') =%>
 	</dd>
 
 	<dt><%= maketext('Editing Problems') %></dt>
@@ -136,8 +137,8 @@
 	<dd>
 		<%= maketext('If you click on the "Grade Problem" icon to the right of the problem number, then the problem '
 				. 'will open in the manual problem grader. This page shows the rendered problem and lists all students '
-				. 'assigned to the set and the last answer the students entered for the problem. You can then change the '
-				. 'recorded scores for students on this problem and provide instructor feedback comments.') =%>
+				. 'assigned to the set and the last answer the students entered for the problem. You can then change '
+				. 'the recorded scores for students on this problem and provide instructor feedback comments.') =%>
 	</dd>
 
 	<dt><%= maketext('Problem Paths') =%></dt>
diff --git a/templates/HelpFiles/InstructorProblemSetList.html.ep b/templates/HelpFiles/InstructorProblemSetList.html.ep
index 3f9648876d..43a8515188 100644
--- a/templates/HelpFiles/InstructorProblemSetList.html.ep
+++ b/templates/HelpFiles/InstructorProblemSetList.html.ep
@@ -9,9 +9,9 @@
 	<dt><%= maketext('"Problems" column') %></dt>
 	<dd>
 		<%= maketext('Indicates the number of problems in the set. Clicking on the link opens the set detail page '
-				. 'which allows you to modify set parameters, edit set headers, and change parameters of problems in the '
-				. 'set such as the number of allowed attempts or the weight (credit value). You can also add, remove, '
-				. 'view, edit, and reorder the problems in the set.') =%>
+				. 'which allows you to modify set parameters, edit set headers, and change parameters of problems in '
+				. 'the set such as the number of allowed attempts or the weight (credit value). You can also add, '
+				. 'remove, view, edit, and reorder the problems in the set.') =%>
 	</dd>
 	<dt><%= maketext('"Assigned Users" column') %></dt>
 	<dd>
@@ -86,10 +86,10 @@
 		<dt><%= maketext('Synchronize Set Dates with LMS.') %></dt>
 		<dd>
 			<%= maketext('Synchronize the dates for a single set or multiple sets to or from the LMS. This task is '
-					. 'performed in the job queue, and this page only enqueus that task. Go to the Job Manager to see the '
-					. 'status of the enqueued job. This will only work for sets for which the lineitem for the set is '
-					. 'available or can be obtained. That is all sets that are created via content selection from the LMS, '
-					. 'or manually created links in the LMS that have been used at least once. Note that date '
+					. 'performed in the job queue, and this page only enqueus that task. Go to the Job Manager to see '
+					. 'the status of the enqueued job. This will only work for sets for which the lineitem for the set '
+					. 'is available or can be obtained. That is all sets that are created via content selection from '
+					. 'the LMS, or manually created links in the LMS that have been used at least once. Note that date '
 					. 'synchronization via LTI is not supported by all LMSs.') =%>
 		</dd>
 	% }
diff --git a/templates/HelpFiles/InstructorScoring.html.ep b/templates/HelpFiles/InstructorScoring.html.ep
index c21f09a9c8..1d69d7d825 100644
--- a/templates/HelpFiles/InstructorScoring.html.ep
+++ b/templates/HelpFiles/InstructorScoring.html.ep
@@ -70,8 +70,8 @@
 	<%== maketext(
 		'If you upload your file on the web with the name: [_1] and also create an email message with the '
 			. 'name [_2] with the appropriate [_3] variables then not only can you email the message with the embedded '
-			. 'grades to the students, but files with those exact names are automatically appended to the "Grades" page '
-			. 'seen by the students.',
+			. 'grades to the students, but files with those exact names are automatically appended to the "Grades" '
+			. 'page seen by the students.',
 		'<code>report_grades_data.csv</code>', '<code>report_grade.msg</code>', '<code>$COL</code>'
 	) =%>
 </p>
diff --git a/templates/HelpFiles/InstructorSendMail.html.ep b/templates/HelpFiles/InstructorSendMail.html.ep
index dc60fe424a..b0482a2923 100644
--- a/templates/HelpFiles/InstructorSendMail.html.ep
+++ b/templates/HelpFiles/InstructorSendMail.html.ep
@@ -4,10 +4,11 @@
 <p>
 	<%= maketext('Use this page to send emails to active (enrolled or auditing) students.  Emails can be sent to '
 			. 'all active students or selected students.  Use the "Students" form to sort, filter, or format how '
-			. 'the user name is displayed. If multiple filters are selected and the "Intersection" radio button is used, '
-			. 'the filters will  be applied in sequence, narrowing the results list.  If the "Union" button is used, the '
-			. 'updated list will be the union of all results lists from the multiple filters.  Click "Refresh List" to '
-			. 'apply any changes.  Use control-click or shift-click to select multiple students to email.') =%>
+			. 'the user name is displayed. If multiple filters are selected and the "Intersection" radio button is '
+			. 'used, the filters will  be applied in sequence, narrowing the results list.  If the "Union" button is '
+			. 'used, the updated list will be the union of all results lists from the multiple filters.  Click '
+			. '"Refresh List" to apply any changes.  Use control-click or shift-click to select multiple '
+			. 'students to email.') =%>
 </p>
 <p>
 	<%= maketext('Emails can contain personalized data, such as name, section, or status.  Click "List of insertable '
@@ -15,8 +16,8 @@
 			. 'file.  A merge file is a CSV file located in the ~[Scoring~] directory in which the first column is the '
 			. 'student id, followed by additional data (such as student grades).  This data is identified by which '
 			. 'column it is in, for instance if the scores where in the 4th column of the merge file, insert them into '
-			. 'an email using the variable $COL~[4~].  The "Scoring Tools" page can export grades into a CSV that can be '
-			. 'used as a merge file.  Upload customized merge files with the "File Manager".') =%>
+			. 'an email using the variable $COL~[4~].  The "Scoring Tools" page can export grades into a CSV that can '
+			. 'be used as a merge file.  Upload customized merge files with the "File Manager".') =%>
 </p>
 <p>
 	<%= maketext('Use the "Merge file" drop down menu to select which merge file to use, or select "None" to not '
diff --git a/templates/HelpFiles/InstructorShowAnswers.html.ep b/templates/HelpFiles/InstructorShowAnswers.html.ep
index d5b9a847c7..b2f7a5200b 100644
--- a/templates/HelpFiles/InstructorShowAnswers.html.ep
+++ b/templates/HelpFiles/InstructorShowAnswers.html.ep
@@ -4,8 +4,8 @@
 <p class="m-0">
 	<%= maketext('Show past answers.  Students can only see their own past answers, and they will not be able to see '
 			. 'which parts are correct.  Instructors can use the form to select any combination of users, sets, and '
-			. 'problems to view. For users, one can select the sort field, the format of the display list, and the filter. '
-			. 'If multiple filters are selected and the "Intersection" radio button is used, the filters will '
+			. 'problems to view. For users, one can select the sort field, the format of the display list, and the '
+			. 'filter. If multiple filters are selected and the "Intersection" radio button is used, the filters will '
 			. 'be applied in sequence, narrowing the results list.  If the "Union" button is used, the updated '
 			. 'list will be the union of all results lists from the multiple filters.'
 			. 'The table below will list the past answers colored according to correctness '
diff --git a/templates/HelpFiles/InstructorUserDetail.html.ep b/templates/HelpFiles/InstructorUserDetail.html.ep
index 3736b90197..743c73a7a1 100644
--- a/templates/HelpFiles/InstructorUserDetail.html.ep
+++ b/templates/HelpFiles/InstructorUserDetail.html.ep
@@ -3,23 +3,23 @@
 %
 <p>
 	<%= maketext('A student must be assigned a homework set in order for it to appear on their WeBWorK home page. '
-			. 'Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign a '
-			. q{student. If a student is unassigned from a homework set, all of the student's data for that homework set }
-			. 'is deleted and cannot be recovered. Use this action cautiously!') =%>
+			. 'Check the box in the left column to assign a student to that homework set. Uncheck the box to unassign '
+			. q{a student. If a student is unassigned from a homework set, all of the student's data for that homework }
+			. 'set is deleted and cannot be recovered. Use this action cautiously!') =%>
 </p>
 <p>
 	<%= maketext('Change the due dates for an individual student on this page. Enter a new date in order to '
 			. 'override the date. (You can copy the date format from the date in the left column which indicates '
 			. 'the date when the homework set is due for the whole class.) Note that you should ensure that the close '
-			. 'date is before the answer date. If the close date for a student is extended until after the class answer '
-			. 'date for the set, then the answer date for the student must also be set to a later date. If reduced '
-			. 'scoring is enabled for the set, then the reduced scoring date must be between the open and close dates. '
-			. 'If a date is left empty, then the assignment default date will be used.') =%>
+			. 'date is before the answer date. If the close date for a student is extended until after the class '
+			. 'answer date for the set, then the answer date for the student must also be set to a later date. If '
+			. 'reduced scoring is enabled for the set, then the reduced scoring date must be between the open and '
+			. 'close dates. If a date is left empty, then the assignment default date will be used.') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('Click on the homework set links to edit the grades for this individual student on the homework set. '
-			. '(The grade of each problem is called the "status".) You can also change the number of allowed attempts and '
-			. q{further modify the individual student's homework set.) You will also be able to change a student's seed }
-			. q{which determines the individual values used in the individual version of the student's problem and the }
-			. 'weight (how much a problem counts toward the grade.)') =%>
+			. '(The grade of each problem is called the "status".) You can also change the number of allowed attempts '
+			. q{and further modify the individual student's homework set.) You will also be able to change a student's }
+			. q{seed which determines the individual values used in the individual version of the student's problem }
+			. 'and the weight (how much a problem counts toward the grade.)') =%>
 </p>
diff --git a/templates/HelpFiles/InstructorUserList.html.ep b/templates/HelpFiles/InstructorUserList.html.ep
index b91906466d..e4e8d541c2 100644
--- a/templates/HelpFiles/InstructorUserList.html.ep
+++ b/templates/HelpFiles/InstructorUserList.html.ep
@@ -4,8 +4,9 @@
 <p>
 	<%== maketext('From this page you can <strong>add new students</strong>, <strong>edit</strong> user data '
 			. '(name, email address, student ID, enrollment status, accommodation time factor, section, recitation, '
-			. 'comment, permission level, and password), and <strong>export</strong> (save) class lists for back-up or use '
-			. 'in another course. You can also delete students from the class roster, but this cannot be undone.') =%>
+			. 'comment, permission level, and password), and <strong>export</strong> (save) class lists for back-up '
+			. 'or use in another course. You can also delete students from the class roster, but this cannot'
+			. 'be undone.') =%>
 </p>
 <p>
 	<%= maketext('This page gives access to information about the student, independent of the assignments '
@@ -18,26 +19,26 @@
 	<dt><%= maketext('Restrict or sort the students displayed') %></dt>
 	<dd>
 		<%= maketext('When the class is very large not all students will be displayed. Using the first action on this '
-				. 'page you can show only the students from a given recitation or from a given section, or only students '
-				. 'whose login or last name fits a pattern match. The second action will sort the students currently being '
-				. 'displayed. You can also sort the displayed students by clicking on the active links at the top of '
-				. 'each column.') =%>
+				. 'page you can show only the students from a given recitation or from a given section, or only '
+				. 'students whose login or last name fits a pattern match. The second action will sort the students '
+				. 'currently being displayed. You can also sort the displayed students by clicking on the active '
+				. 'links at the top of each column.') =%>
 	</dd>
 
 	<dt><%= maketext('Edit class list data') %></dt>
 	<dd>
 		<%= maketext('You can edit the class list data for a single student by clicking on the pencil icon next to '
-				. 'their login name. To edit several students at once click on the "Select" checkbox next to their names, '
-				. 'click on the radio button for editing selected users and then click the "Edit" button. This might '
-				. 'take a long time load if editing a large number of users.') =%>
+				. 'their login name. To edit several students at once click on the "Select" checkbox next to their '
+				. 'names, click on the radio button for editing selected users and then click the "Edit" button. This'
+				. ' might take a long time load if editing a large number of users.') =%>
 	</dd>
 
 	<dd>
 		<%= maketext(q{The login name cannot be changed. (It is the primary key for the student's data.) If you make }
-				. 'a mistake in the login name at the beginning of the course (before any work has been done) then it is '
-				. 'best to simply add a new student with the correct entry and drop the student with the bad login name. '
-				. '(See drop and delete students below.) If the login name must be changed after a user has started '
-				. 'working assignments, then contact your system administrator, who can use the webwork2 '
+				. 'a mistake in the login name at the beginning of the course (before any work has been done) then it '
+				. 'is best to simply add a new student with the correct entry and drop the student with the bad login '
+				. 'name. (See drop and delete students below.) If the login name must be changed after a user has '
+				. 'started working assignments, then contact your system administrator, who can use the webwork2 '
 				. '"bin/change_user_id" script to change the user id.') =%>
 	</dd>
 
@@ -60,20 +61,20 @@
 
 	<dt><%= maketext('Add many students to a course from a class list.') %></dt>
 	<dd>
-		<%== maketext('This is most easily done by importing a class list. The class list can be uploaded from your '
-				. 'workstation to the server using the File Manager page. The class list must be a file ending in .lst and '
-				. 'must have a specific <a href="https://wiki.openwebwork.org/wiki/Classlist_Files#Format_of_classlist_files">'
-				. 'format</a>. Once the file has been uploaded to the server the file will appear in the import action '
-				. 'pop-up list (5th action). demoCourse.lst is available for most courses and adds the "practice users" '
-				. 'which activate guest logins to the class list.') =%>
+		<%== maketext('This is most easily done by importing a class list. The class list can be uploaded from '
+				. 'your workstation to the server using the File Manager page. The class list must be a file '
+				. 'ending in .lst and must have a specific <a href="https://wiki.openwebwork.org/wiki/Classlist_Files'
+				. '#Format_of_classlist_files">format</a>. Once the file has been uploaded to the server the file '
+				. 'will appear in the import action pop-up list (5th action). demoCourse.lst is available for most '
+				. 'courses and adds the "practice users" which activate guest logins to the class list.') =%>
 	</dd>
 
 	<dt><%= maketext('Add a TA or an instructor (change permission level of user)') %></dt>
 	<dd>
 		<%= maketext('This is done by first entering the user as a student and then changing the permission level of '
 				. 'the user. First edit the user by clicking on the pencil next to their name (or using the technique '
-				. 'above for several users), then change their permission level -- an entry blank at the far right of the '
-				. 'screen, you may have to scroll to see it. The permission levels are') =%>
+				. 'above for several users), then change their permission level -- an entry blank at the far right of '
+				. 'the screen, you may have to scroll to see it. The permission levels are') =%>
 		<ul>
 			<li><%= maketext('Guest:') %> -5</li>
 			<li><%= maketext('Student:') %> 0</li>
@@ -89,9 +90,9 @@
 	<dt><%= maketext('Drop student from the course') %></dt>
 	<dd>
 		<%= maketext('To drop a student or students, select them for editing as described above and then set the '
-				. 'pop-up list to enrolled, drop, or audit. Dropped students cannot log in to the course, are not assigned '
-				. 'new sets and are not sent email. They can be re-enrolled simply by changing their status back '
-				. 'to enrolled. No data is lost, any assignments assigned before they were dropped are restored '
+				. 'pop-up list to enrolled, drop, or audit. Dropped students cannot log in to the course, are not '
+				. 'assigned new sets and are not sent email. They can be re-enrolled simply by changing their status '
+				. 'back to enrolled. No data is lost, any assignments assigned before they were dropped are restored '
 				. 'unchanged.') =%>
 	</dd>
 
@@ -106,9 +107,9 @@
 	<dd>
 		<%= maketext('This resets two factor authentication for a student, thus making the student need to set up two '
 				. 'factor authentication again. This should only be done if a student has accidentally deleted their '
-				. 'account or for some other reason lost their key in the authenticator app, and so can no longer access '
-				. 'the course. Note that this will only appear if two factor authentication is enabled for the course.'
-		) =%>
+				. 'account or for some other reason lost their key in the authenticator app, and so can no longer '
+				. 'access the course. Note that this will only appear if two factor authentication is enabled for '
+				. 'the course.') =%>
 	</dd>
 
 	<dt><%= maketext('Assign sets to one student') %></dt>
@@ -128,12 +129,12 @@
 	<dt><%= maketext('"Act as" a student') %></dt>
 	<dd>
 		<%= maketext(q{Clicking on the login name link in a student's row allows you to view the student's version of }
-				. 'the homework (rather than your own) so that you can more easily answer student questions about homework '
-				. 'problems. (A "acting as xxx" alert will appear in the upper right corner of each window while you are '
-				. 'acting as a student.) You can submit the answers (which will NOT be recorded) to check that the '
-				. 'computer is grading the problem correctly. You will also be able to view past answers submitted by the '
-				. q{student for each problem. To stop acting in the student's role click the "Stop acting" link in the }
-				. 'upper right corner of the window.') =%>
+				. 'the homework (rather than your own) so that you can more easily answer student questions about '
+				. 'homework problems. (A "acting as xxx" alert will appear in the upper right corner of each window '
+				. 'while you are acting as a student.) You can submit the answers (which will NOT be recorded) to '
+				. 'check that the computer is grading the problem correctly. You will also be able to view past '
+				. q{answers submitted by the student for each problem. To stop acting in the student's role click the }
+				. '"Stop acting" link in the upper right corner of the window.') =%>
 	</dd>
 
 	<dt><%= maketext('Change the grades on an assignment for one student.') %></dt>
@@ -147,10 +148,10 @@
 	<dd>
 		<%= maketext('Click on the "Select" checkbox next to the names of the students that additional time is to be '
 				. 'assigned, click on the radio button for editing selected users, and then click the "Edit" button. '
-				. 'Set the "Accommodation Time Factor" to the desired multiplier for each student selected (this must be a '
-				. 'decimal number that is greater than or equal to 1). The time that a student will have to complete a '
-				. 'timed test will be the product of the "Test Time Limit" for the test set in the "Sets Manager" and '
-				. 'the "Accommodation Time Factor" set here.') =%>
+				. 'Set the "Accommodation Time Factor" to the desired multiplier for each student selected (this must '
+				. 'be a decimal number that is greater than or equal to 1). The time that a student will have to '
+				. 'complete a timed test will be the product of the "Test Time Limit" for the test set in the '
+				. '"Sets Manager" and the "Accommodation Time Factor" set here.') =%>
 	</dd>
 
 	<dt><%= maketext('Extend the number of attempts allowed a student on a given problem.') %></dt>
@@ -187,12 +188,13 @@
 		<dt><%= maketext('Synchronize users with the associated course in the LMS.') %></dt>
 		<dd>
 			<%= maketext('Select the "Synchronize LMS Roster" tab and click "Synchronize LMS Roster". '
-					. 'This will enqueue a job that will contact the LMS and retrieve the list of users in the associated '
-					. 'LMS course. Users that are in the LMS course but not in the WeBWorK course will be added. Users '
-					. 'that are not in the LMS course will have their status changed to "Drop". Users that are in the LMS '
-					. 'course and the WeBWorK course will have their data updated unless $LMSManageUserData is false. Note '
-					. 'that users that have a permission level above the $LTIAccountCreationCutoff will not be added or '
-					. 'modified. Go to the Job Manager to see the status of this job.') =%>
+					. 'This will enqueue a job that will contact the LMS and retrieve the list of users in the '
+					. 'associated LMS course. Users that are in the LMS course but not in the WeBWorK course will be '
+					. 'added. Users that are not in the LMS course will have their status changed to "Drop". Users '
+					. 'that are in the LMS course and the WeBWorK course will have their data updated unless '
+					. '$LMSManageUserData is false. Note that users that have a permission level above the '
+					. '$LTIAccountCreationCutoff will not be added or modified. Go to the Job Manager to see the '
+					. 'status of this job.') =%>
 		</dd>
 	% }
 </dl>
@@ -209,8 +211,8 @@
 <ul>
 	<li>
 		<%= maketext('Clicking on any active link at the top of the column sorts the page by that column. You can do '
-				. 'lexicographic sorts: click on "First name" then "Last name" to sort by last name, sorting those with '
-				. 'the same last name by their first name.') =%>
+				. 'lexicographic sorts: click on "First name" then "Last name" to sort by last name, sorting those '
+				. 'with the same last name by their first name.') =%>
 	</li>
 	<li><%== maketext('The <strong>login name</strong> column links allow you to "act as" a student.') %></li>
 	<li>
@@ -224,7 +226,7 @@
 	<li>
 		<%== maketext('Clicking the <strong>email address</strong> link will bring up your standard email application '
 				. 'so that you can send email to the student. This works even if the student has been dropped from the '
-				. 'course. To send email to an entire class or to merge grades with the email message use the "Email" page '
-				. 'link in the left margin.') =%>
+				. 'course. To send email to an entire class or to merge grades with the email message use the "Email" '
+				. 'page link in the left margin.') =%>
 	</li>
 </ul>
diff --git a/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
index dc3a56c438..167eb58243 100644
--- a/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
+++ b/templates/HelpFiles/InstructorUsersAssignedToSet.html.ep
@@ -3,6 +3,6 @@
 %
 <p class="mb-0">
 	<%= maketext('A student needs to be assigned a set in order for them to work it. Once a student is unassigned a '
-			. 'set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change the '
-			. 'option to "Allow unassign".') =%>
+			. 'set, all the data for them is lost and there is no way to undo it. When unassigning be sure to change '
+			. 'the option to "Allow unassign".') =%>
 </p>
diff --git a/templates/HelpFiles/Levels.html.ep b/templates/HelpFiles/Levels.html.ep
index 9dceebda52..e3099ade82 100644
--- a/templates/HelpFiles/Levels.html.ep
+++ b/templates/HelpFiles/Levels.html.ep
@@ -16,8 +16,8 @@
 		<%= maketext('Usually means students must demonstrate understanding of facts. This is more than regurgitating '
 				. 'the fact. We use this category for simple and direct applications of algorithms the student has '
 				. 'studied. There should be no judgement involved in choosing the method. This would include a simple '
-				. 'application of a rule for differentiation (e.g., can combine rules for sums and constant multiples with '
-				. 'one more advanced rule) or for integrals.') =%>
+				. 'application of a rule for differentiation (e.g., can combine rules for sums and constant multiples '
+				. 'with one more advanced rule) or for integrals.') =%>
 	</li>
 
 	<li>
diff --git a/templates/HelpFiles/Options.html.ep b/templates/HelpFiles/Options.html.ep
index 89e62accbb..d70ee67b1a 100644
--- a/templates/HelpFiles/Options.html.ep
+++ b/templates/HelpFiles/Options.html.ep
@@ -4,23 +4,23 @@
 <p>
 	<%= maketext('This page allows users to change their password, email address, and display settings used in '
 			. 'problems. Note that you can hide this page entirely for students by setting permission levels to '
-			. 'login_proctor or higher for the permissions to change password, change email address, and change display '
-			. 'settings used in pg problems.') =%>
+			. 'login_proctor or higher for the permissions to change password, change email address, and change '
+			. 'display settings used in pg problems.') =%>
 </p>
 <h2><%= maketext('Name') %></h2>
 <p>
 	<%= maketext('The first and last name can be any combination of letters, numbers and special symbols. Name changes '
-			. 'and preferences can be respected here. Students should use a name that will not confuse their instructor. '
-			. 'If WeBWorK is used with an LMS (Canvas, Moodle, D2L, Blackboard, etc) the LMS might periodically override '
-			. 'a name setting here if WeBWorK is configured to allow that. Name settings will only appear here if a user '
-			. 'has permission to change their name.') =%>
+			. 'and preferences can be respected here. Students should use a name that will not confuse their '
+			. 'instructor. If WeBWorK is used with an LMS (Canvas, Moodle, D2L, Blackboard, etc) the LMS might '
+			. 'periodically override a name setting here if WeBWorK is configured to allow that. Name settings will '
+			. 'only appear here if a user has permission to change their name.') =%>
 </p>
 <h2><%= maketext('Password') %></h2>
 <p>
 	<%= maketext('The password can be any combination of letters, numbers and special symbols. Students are encouraged '
-			. 'to use all three, and stay away from dictionary words. The password should not be the same as any password '
-			. 'used elsewhere, such as for an email account. The password will only be present on the page if the user '
-			. 'has permission to change the password.') =%>
+			. 'to use all three, and stay away from dictionary words. The password should not be the same as any '
+			. 'password used elsewhere, such as for an email account. The password will only be present on the page '
+			. 'if the user has permission to change the password.') =%>
 </p>
 <h2><%= maketext('Email Address') %></h2>
 <p>
diff --git a/templates/HelpFiles/ProblemSets.html.ep b/templates/HelpFiles/ProblemSets.html.ep
index 1b64ccb3fc..8204b84fee 100644
--- a/templates/HelpFiles/ProblemSets.html.ep
+++ b/templates/HelpFiles/ProblemSets.html.ep
@@ -5,13 +5,13 @@
 <p><%= maketext('It lists the assignments available for the students.') %></p>
 <p>
 	<%= maketext('The information box on the right displays information about the course. This is useful for leaving '
-			. 'course wide messages for students. It contains text from the file templates/course_info.txt. Instructors '
-			. 'can edit this file from the web (click on the "Edit" link).') =%>
+			. 'course wide messages for students. It contains text from the file templates/course_info.txt. '
+			. 'Instructors can edit this file from the web (click on the "Edit" link).') =%>
 </p>
 <p class="mb-0">
 	<%= maketext('You can click the download icon to the right of each set to generate a PDF hardcopy of the set. '
 			. 'You can generate hardcopies for multiple sets and students including their answers as well by selecting '
-			. 'sets and students on the page that opens when that icon is clicked. Note that students will only be able '
-			. 'to generate hardcopies of a single set at a time. Students will only be able to include answers in '
+			. 'sets and students on the page that opens when that icon is clicked. Note that students will only be '
+			. 'able to generate hardcopies of a single set at a time. Students will only be able to include answers in '
 			. 'the hardcopy after the answer date.') =%>
 </p>
diff --git a/templates/RPCRenderFormats/default.html.ep b/templates/RPCRenderFormats/default.html.ep
index e23edb8447..245c24b30a 100644
--- a/templates/RPCRenderFormats/default.html.ep
+++ b/templates/RPCRenderFormats/default.html.ep
@@ -5,8 +5,11 @@
 	<head>
 		<meta charset="utf-8">
 		<base href="<%= $SITE_URL %>">
+		<!-- prettier-ignore -->
 		<title>
-			WeBWorK using host: <%= $SITE_URL %>, format: <%= $formatName %>, seed: <%= $problemSeed %>,
+			WeBWorK using host: <%= $SITE_URL %>,
+		   	format: <%= $formatName %>,
+		   	seed: <%= $problemSeed %>,
 			course: <%= $courseID %>
 		</title>
 		<link href="<%= "$ce->{webworkURLs}{htdocs}/images/favicon.ico" %>" rel="shortcut icon">
@@ -175,9 +178,13 @@
 		</main>
 		% # Show the footer unless it is explicitly disabled.
 		% if ($showFooter ne '0') {
+			<!-- prettier-ignore -->
 			<footer id="footer" data-iframe-height="1">
-				WeBWorK &copy; <%= $ce->{WW_COPYRIGHT_YEARS} || 'unknown' %> | host: <%= $SITE_URL %> |
-				course: <%= $courseID %> | format: <%= $formatName %> | theme: <%= $theme %>
+				WeBWorK &copy; <%= $ce->{WW_COPYRIGHT_YEARS} || 'unknown' %> |
+			   	host: <%= $SITE_URL %> |
+				course: <%= $courseID %> |
+			   	format: <%= $formatName %> |
+			   	theme: <%= $theme %>
 			</footer>
 		% }
 	</body>