From e9414915d905cedb2b8011ffefbab52ec4c8ee0d Mon Sep 17 00:00:00 2001
From: Sam Ottenhoff <ottenhoff@longsight.com>
Date: Mon, 22 Apr 2024 14:12:56 -0400
Subject: [PATCH] SAK-49989 Gradebook upgrade wicket 6 to wicket 9 (#12513)

Co-authored-by: Code Hugger (Matthew Jones) <jonespm@umich.edu>

https://sakaiproject.atlassian.net/browse/SAK-49989
---
 gradebookng/pom.xml                           |   2 +-
 gradebookng/tool/pom.xml                      |   4 +-
 .../gradebookng/GradebookNgApplication.java   |  21 +--
 .../business/GradebookNgBusinessService.java  |   2 +-
 .../gradebookng/business/model/GbGroup.java   |  66 ++-----
 .../business/util/CourseGradeFormatter.java   |   6 +-
 .../business/util/FormatHelper.java           |  20 +-
 .../GradebookNgStringResourceLoader.java      |   9 +-
 .../tool/actions/ViewGradeSummaryAction.java  |   4 +-
 .../tool/chart/AssignmentGradeChart.java      |  20 +-
 .../tool/component/GbGradeTable.java          |   1 +
 .../tool/model/GbGradebookData.java           |   4 +-
 .../gradebookng/tool/pages/BasePage.html      |   3 +-
 .../gradebookng/tool/pages/ErrorPage.java     |   2 +-
 .../gradebookng/tool/pages/GradebookPage.html |   3 +-
 .../gradebookng/tool/pages/GradebookPage.java |  29 +--
 .../tool/pages/PermissionsPage.html           |   1 +
 .../tool/pages/PermissionsPage.java           |  26 +--
 .../tool/pages/QuickEntryPage.html            |  12 +-
 .../tool/pages/QuickEntryPage.java            |  73 ++++----
 .../gradebookng/tool/pages/SettingsPage.java  |   6 +-
 .../gradebookng/tool/pages/StudentPage.java   |   2 +-
 .../tool/panels/AddOrEditGradeItemPanel.java  |  12 +-
 .../AddOrEditGradeItemPanelContent.java       |  16 +-
 .../panels/AssignmentStatisticsPanel.java     |   2 +-
 .../tool/panels/BulkEditItemsPanel.html       |  24 ++-
 .../tool/panels/BulkEditItemsPanel.java       |  20 +-
 .../panels/CourseGradeBreakdownPanel.java     |   4 +-
 .../panels/CourseGradeOverrideLogPanel.java   |  12 +-
 .../tool/panels/CourseGradeOverridePanel.java |  13 +-
 .../tool/panels/DeleteItemPanel.java          |  10 +-
 .../panels/EditCourseGradeCommentPanel.java   |  22 +--
 .../tool/panels/EditGradeCommentPanel.java    |  32 ++--
 .../tool/panels/GradeLogPanel.java            |  11 +-
 .../tool/panels/GradeSummaryTablePanel.html   |   3 +-
 .../tool/panels/GradeSummaryTablePanel.java   |  22 +--
 .../tool/panels/RubricGradePanel.java         |  10 +-
 .../tool/panels/RubricPreviewPanel.java       |   4 +-
 .../tool/panels/SettingsCategoryPanel.html    |   7 +-
 .../tool/panels/SettingsCategoryPanel.java    |  19 +-
 .../tool/panels/SettingsGradeEntryPanel.java  |   7 +-
 .../panels/SettingsGradeReleasePanel.html     |   3 +-
 .../panels/SettingsGradeReleasePanel.java     |   2 +-
 .../panels/SettingsGradingSchemaPanel.java    |  21 +--
 .../tool/panels/SettingsStatisticsPanel.html  |   1 +
 .../tool/panels/SortGradeItemsPanel.java      |  43 ++---
 .../StudentAssignmentStatisticsPanel.java     |   4 +-
 .../panels/StudentCompareGradesPanel.java     |   2 +-
 .../tool/panels/StudentGradeSummaryPanel.html |   3 +-
 .../tool/panels/StudentGradeSummaryPanel.java |  33 ++--
 .../panels/ToggleGradeItemsToolbarPanel.html  |   9 +-
 .../panels/ToggleGradeItemsToolbarPanel.java  |   6 +-
 .../tool/panels/UpdateUngradedItemsPanel.html |   3 +-
 .../tool/panels/UpdateUngradedItemsPanel.java |  27 +--
 .../tool/panels/ZeroUngradedItemsPanel.java   |   4 +-
 .../importExport/CreateGradeItemStep.java     |  17 +-
 .../tool/panels/importExport/ExportPanel.java |  13 +-
 .../GradeImportConfirmationStep.java          |   6 +-
 .../importExport/GradeImportUploadStep.java   |  12 +-
 .../GradeItemImportOmissionsPanel.java        |   6 +-
 .../GradeItemImportSelectionStep.java         |   6 +-
 .../PreviewImportedGradesPanel.java           |   4 +-
 .../webapp/scripts/gradebook-quick-entry.js   |  12 +-
 master/pom.xml                                |   5 +
 wicket/pom.xml                                |   1 +
 wicket/wicket6/pom.xml                        |   2 +-
 wicket/wicket9/pom.xml                        |  41 ++++
 .../AbstractSakaiSpinnerAjaxCallListener.java |  44 +++++
 .../wicket/component/SakaiAjaxButton.java     |  62 ++++++
 .../wicket/component/SakaiDateTimeField.java  | 176 ++++++++++++++++++
 .../component/SakaiDateTimeField.properties   |   2 +
 .../SakaiDateTimeField_ar.properties          |   1 +
 .../SakaiDateTimeField_bg.properties          |   1 +
 .../SakaiDateTimeField_ca.properties          |   2 +
 .../SakaiDateTimeField_es.properties          |   2 +
 .../SakaiDateTimeField_eu.properties          |   2 +
 .../SakaiDateTimeField_ro_RO.properties       |   1 +
 .../SakaiDateTimeField_sr.properties          |   1 +
 .../SakaiDateTimeField_tr_TR.properties       |   1 +
 .../SakaiSpinnerAjaxCallListener.java         |  58 ++++++
 80 files changed, 767 insertions(+), 438 deletions(-)
 create mode 100644 wicket/wicket9/pom.xml
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/AbstractSakaiSpinnerAjaxCallListener.java
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiAjaxButton.java
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.java
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ar.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_bg.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ca.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_es.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_eu.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ro_RO.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_sr.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_tr_TR.properties
 create mode 100644 wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiSpinnerAjaxCallListener.java

diff --git a/gradebookng/pom.xml b/gradebookng/pom.xml
index baaa4c86062b..e28af9c818a2 100644
--- a/gradebookng/pom.xml
+++ b/gradebookng/pom.xml
@@ -14,7 +14,7 @@
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<wicket.version>6.30.0</wicket.version>
+		<wicket.version>9.17.0</wicket.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
diff --git a/gradebookng/tool/pom.xml b/gradebookng/tool/pom.xml
index 5620837215ee..75afa9212f00 100644
--- a/gradebookng/tool/pom.xml
+++ b/gradebookng/tool/pom.xml
@@ -80,7 +80,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.sakaiproject.wicket</groupId>
-			<artifactId>wicket-tool-6</artifactId>
+			<artifactId>wicket-tool-9</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -160,7 +160,7 @@
 			<artifactId>chartjs</artifactId>
 			<version>2.7.0</version>
 		</dependency>
-	</dependencies>
+    </dependencies>
 	<build>
         <sourceDirectory>src/java</sourceDirectory>
         <scriptSourceDirectory>src/webapp</scriptSourceDirectory>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.java
index 7297c09a91ac..4061ce6c5f12 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.java
@@ -19,10 +19,9 @@
 import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
 import org.apache.wicket.request.cycle.RequestCycle;
 import org.apache.wicket.request.resource.PackageResourceReference;
-import org.apache.wicket.settings.IRequestCycleSettings.RenderStrategy;
+import org.apache.wicket.settings.RequestCycleSettings.RenderStrategy;
 import org.apache.wicket.spring.injection.annot.SpringComponentInjector;
 
 import org.sakaiproject.gradebookng.framework.GradebookNgStringResourceLoader;
@@ -55,6 +54,9 @@ public void init() {
 		mountPage("/accessdenied", AccessDeniedPage.class);
 		mountPage("/error", ErrorPage.class);
 
+		// Allow Sakai portal to handle CSP
+		getCspSettings().blocking().disabled();
+
 		// remove the version number from the URL so that browser refreshes re-render the page
 		getRequestCycleSettings().setRenderStrategy(RenderStrategy.ONE_PASS_RENDER);
 
@@ -70,21 +72,6 @@ public void init() {
 		// Remove the wicket specific tags from the generated markup
 		getMarkupSettings().setStripWicketTags(true);
 
-		// Don't add any extra tags around a disabled link (default is <em></em>)
-		getMarkupSettings().setDefaultBeforeDisabledLink(null);
-		getMarkupSettings().setDefaultAfterDisabledLink(null);
-
-		// On Wicket session timeout, redirect to main page
-		// getApplicationSettings().setPageExpiredErrorPage(getHomePage());
-
-		// Intercept any unexpected error stacktrace and take to our page
-		getRequestCycleListeners().add(new AbstractRequestCycleListener() {
-			@Override
-			public IRequestHandler onException(final RequestCycle cycle, final Exception e) {
-				return new RenderPageRequestHandler(new PageProvider(new ErrorPage(e)));
-			}
-		});
-
 		// Disable Wicket's loading of jQuery - we load Sakai's preferred version in BasePage.java
 		getJavaScriptLibrarySettings().setJQueryReference(new PackageResourceReference(GradebookNgApplication.class, "empty.js"));
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
index 11b86f8a624e..4300c3d9b78c 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/GradebookNgBusinessService.java
@@ -1791,7 +1791,7 @@ public List<GbStudentGradeInfo> sortGradeMatrix(Map<String, GbStudentGradeInfo>
 	/**
 	 * Get a list of sections and groups in a site
 	 *
-	 * @return
+	 * @return a list of sections and groups in the current site
 	 */
 	public List<GbGroup> getSiteSectionsAndGroups() {
 		final String siteId = getCurrentSiteId();
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/model/GbGroup.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/model/GbGroup.java
index 7a1d2cf5c574..1667e459fbd7 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/model/GbGroup.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/model/GbGroup.java
@@ -16,11 +16,11 @@
 package org.sakaiproject.gradebookng.business.model;
 
 import java.io.Serializable;
+import java.util.Comparator;
 
-import org.apache.commons.lang3.builder.CompareToBuilder;
-import org.apache.commons.lang3.builder.EqualsBuilder;
-import org.apache.commons.lang3.builder.HashCodeBuilder;
-
+import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.NonNull;
 import lombok.Getter;
 import lombok.ToString;
 
@@ -31,21 +31,17 @@
  *
  */
 
+@Getter
 @ToString
+@AllArgsConstructor
+@EqualsAndHashCode
 public class GbGroup implements Comparable<GbGroup>, Serializable {
 
 	private static final long serialVersionUID = 1L;
 
-	@Getter
 	private final String id;
-
-	@Getter
 	private final String title;
-
-	@Getter
 	private final String reference;
-
-	@Getter
 	private final Type type;
 
 	/**
@@ -57,51 +53,11 @@ public enum Type {
 		ALL;
 	}
 
-	public GbGroup(final String id, final String title, final String reference, final Type type) {
-		this.id = id;
-		this.title = title;
-		this.reference = reference;
-		this.type = type;
-	}
-
-	@Override
-	public int compareTo(final GbGroup other) {
-		return new CompareToBuilder()
-				.append(this.title, other.getTitle())
-				.append(this.type, other.getType())
-				.toComparison();
-
-	}
-
-	@Override
-	public boolean equals(final Object o) {
-		if (o == null) {
-			return false;
-		}
-		if (o == this) {
-			return true;
-		}
-		if (o.getClass() != getClass()) {
-			return false;
-		}
-		final GbGroup other = (GbGroup) o;
-		return new EqualsBuilder()
-				.appendSuper(super.equals(o))
-				.append(this.id, other.id)
-				.append(this.title, other.title)
-				.append(this.reference, other.reference)
-				.append(this.type, other.type)
-				.isEquals();
-	}
-
 	@Override
-	public int hashCode() {
-		return new HashCodeBuilder()
-				.append(this.id)
-				.append(this.title)
-				.append(this.reference)
-				.append(this.type)
-				.toHashCode();
+	public int compareTo(final @NonNull GbGroup other) {
+		return Comparator.comparing(GbGroup::getTitle)
+				.thenComparing(GbGroup::getType)
+				.compare(this, other);
 	}
 
 }
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/CourseGradeFormatter.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/CourseGradeFormatter.java
index d213165a0bad..207a6c5fefa2 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/CourseGradeFormatter.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/CourseGradeFormatter.java
@@ -141,11 +141,9 @@ private String build(final CourseGradeTransferBean courseGrade) {
 		if (StringUtils.isNotBlank(calculatedGrade)
 				&& (this.gradebook.getCourseAverageDisplayed() || shouldDisplayFullCourseGrade())) {
 			if (parts.isEmpty()) {
-				parts.add(new StringResourceModel("coursegrade.display.percentage-first", null,
-						new Object[] { calculatedGrade }).getString());
+				parts.add(new StringResourceModel("coursegrade.display.percentage-first").setParameters(calculatedGrade).getString());
 			} else {
-				parts.add(new StringResourceModel("coursegrade.display.percentage-second", null,
-						new Object[] { calculatedGrade }).getString());
+				parts.add(new StringResourceModel("coursegrade.display.percentage-second").setParameters(calculatedGrade).getString());
 			}
 		}
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/FormatHelper.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/FormatHelper.java
index 6d7d1d343444..7d4f5cbf03b6 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/FormatHelper.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/FormatHelper.java
@@ -272,18 +272,6 @@ public static String formatDate(final Date date, final String ifNull) {
 		return formatDate(date);
 	}
 
-	/**
-	 * Format a date with a time e.g. MM/dd/yyyy HH:mm
-	 *
-	 * @param date
-	 * @return
-	 */
-	public static String formatDateTime(final Date date) {
-		final String dateTimeFormatString = MessageHelper.getString("format.datetime");
-		final SimpleDateFormat df = new SimpleDateFormat(dateTimeFormatString);
-		return df.format(date);
-	}
-
 	/**
 	 * Strips out line breaks
 	 *
@@ -407,8 +395,8 @@ public static String htmlUnescape(String input){
 	 * @return fully formatted string ready for display
 	 */
 	public static String getGradeFromNumber(String newGrade, Map<String, Double> schema, Locale currentUserLocale) {
-		Double currentGradeValue = new Double(0.0);
-		Double maxValue = new Double(0.0);
+		Double currentGradeValue = 0.0;
+		Double maxValue = 0.0;
 		String returnGrade = newGrade;
 		try	{
 			NumberFormat nf = NumberFormat.getInstance(currentUserLocale);
@@ -467,9 +455,9 @@ public static String transformNewGrade(String newGrade, Locale locale) {
 			if (parsePosition.getIndex() != newGrade.length()) {
 				throw new NumberFormatException("Grade has a bad format.");
 			}
-			Double dValue = n.doubleValue();
+			double dValue = n.doubleValue();
 
-			return (dValue.toString());
+			return (Double.toString(dValue));
 
 		}
 		catch (NumberFormatException e) {
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/framework/GradebookNgStringResourceLoader.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/framework/GradebookNgStringResourceLoader.java
index 02bdc7b02b28..bb3626558204 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/framework/GradebookNgStringResourceLoader.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/framework/GradebookNgStringResourceLoader.java
@@ -26,7 +26,7 @@
  */
 public class GradebookNgStringResourceLoader implements IStringResourceLoader {
 
-	private ResourceLoader loader = new ResourceLoader("gradebookng");
+	private final ResourceLoader loader = new ResourceLoader("gradebookng");
 
 	@Override
 	public String loadStringResource(Class<?> clazz, String key, Locale locale, String style, String variation) {
@@ -43,6 +43,11 @@ private String loadString(Locale locale, String key) {
 		if (locale != null && sakaiLocale == null) {
 			loader.setContextLocale(locale);
 		}
-		return loader.getString(key);
+		// Check the validity first because loader.getString will return a "missing key" string if not found
+		if (loader.getIsValid(key)) {
+			return loader.getString(key);
+		}
+		// Return null so the Wicket default loader can try to load the string
+		return null;
 	}
 }
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/ViewGradeSummaryAction.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/ViewGradeSummaryAction.java
index 865f552f9208..e1cc0fa3c7a3 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/ViewGradeSummaryAction.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/actions/ViewGradeSummaryAction.java
@@ -71,8 +71,8 @@ public ActionResponse handleEvent(final JsonNode params, final AjaxRequestTarget
 		window.setStudentToReturnFocusTo(studentUuid);
 		content.setOutputMarkupId(true);
 
-		final String modalTitle = (new StringResourceModel("heading.studentsummary",
-				null, new Object[] { student.getDisplayName(), student.getDisplayId() })).getString();
+		final String modalTitle = (new StringResourceModel("heading.studentsummary")
+				.setParameters(student.getDisplayName(), student.getDisplayId())).getString();
 
 		window.setTitle(modalTitle);
 		window.show(target);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/chart/AssignmentGradeChart.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/chart/AssignmentGradeChart.java
index 50620b8bc3d6..a39b4ad0644f 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/chart/AssignmentGradeChart.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/chart/AssignmentGradeChart.java
@@ -65,18 +65,16 @@ protected GbChartData getData() {
 
 			// get all grades for this assignment
 			final List<Double> allGrades = new ArrayList<>();
-			for (int i = 0; i < gradeInfo.size(); i++) {
-				final GbStudentGradeInfo studentGradeInfo = gradeInfo.get(i);
+            for (final GbStudentGradeInfo studentGradeInfo : gradeInfo) {
+                final Map<Long, GbGradeInfo> studentGrades = studentGradeInfo.getGrades();
+                final GbGradeInfo grade = studentGrades.get(this.assignmentId);
 
-				final Map<Long, GbGradeInfo> studentGrades = studentGradeInfo.getGrades();
-				final GbGradeInfo grade = studentGrades.get(this.assignmentId);
+                if (grade == null || grade.getGrade() == null) {
+                    continue;
+                }
 
-				if (grade == null || grade.getGrade() == null) {
-					continue;
-				}
-
-				allGrades.add(Double.valueOf(grade.getGrade()));
-			}
+                allGrades.add(Double.valueOf(grade.getGrade()));
+            }
 			Collections.sort(allGrades);
 
 			final GbChartData data = new GbChartData();
@@ -124,7 +122,7 @@ protected GbChartData getData() {
 	 * @return eg "0-50" as a string, depending on translation
 	 */
 	private String buildRangeLabel(final int start, final int end) {
-		return new StringResourceModel("label.statistics.chart.range", null, start, end).getString();
+		return new StringResourceModel("label.statistics.chart.range").setParameters(start, end).getString();
 	}
 
 	/**
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java
index 616942714269..ed9fbf583e4d 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/component/GbGradeTable.java
@@ -114,6 +114,7 @@ protected void onEvent(final AjaxRequestTarget target) {
 		add(component);
 	}
 
+	@Override
 	public void renderHead(final IHeaderResponse response) {
 		final GbGradeTableData gbGradeTableData = (GbGradeTableData) getDefaultModelObject();
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/model/GbGradebookData.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/model/GbGradebookData.java
index bf450aaa7de2..846f906ba2b1 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/model/GbGradebookData.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/model/GbGradebookData.java
@@ -591,7 +591,7 @@ private List<ColumnDefinition> loadColumns(final List<Assignment> assignments) {
 					&& (a2 == null || !a1.getCategoryId().equals(a2.getCategoryId()))) {
 				result.add(new CategoryAverageDefinition(a1.getCategoryId(),
 						FormatHelper.abbreviateMiddle(a1.getCategoryName()),
-						(new StringResourceModel("label.gradeitem.categoryaverage", null, new Object[] { a1.getCategoryName() }))
+						(new StringResourceModel("label.gradeitem.categoryaverage").setParameters(a1.getCategoryName()))
 								.getString(),
 						nullable(categoryWeight),
 						getCategoryPoints(a1.getCategoryId()),
@@ -617,7 +617,7 @@ private List<ColumnDefinition> loadColumns(final List<Assignment> assignments) {
 					result.add(new CategoryAverageDefinition(
 							category.getId(),
 							FormatHelper.abbreviateMiddle(category.getName()),
-							(new StringResourceModel("label.gradeitem.categoryaverage", null, new Object[] { category.getName() }))
+							(new StringResourceModel("label.gradeitem.categoryaverage").setParameters(category.getName()))
 									.getString(),
 							nullable(categoryWeight),
 							category.getTotalPoints(),
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.html
index 6b30360d661c..49964aeba92b 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
  
@@ -55,4 +56,4 @@
 	
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ErrorPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ErrorPage.java
index 172f84780729..bd7ea773cfc4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ErrorPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/ErrorPage.java
@@ -48,7 +48,7 @@ public ErrorPage(final Exception e) {
 		final String code = RandomStringUtils.randomAlphanumeric(10);
 		log.error("User supplied error code for the above stacktrace: {}", code);
 
-		final Label error = new Label("error", new StringResourceModel("errorpage.text", null, new Object[] { code }));
+		final Label error = new Label("error", new StringResourceModel("errorpage.text").setParameters(code));
 		error.setEscapeModelStrings(false);
 		add(error);
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.html
index ff7ac08729ab..21a1da52569e 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -73,7 +74,7 @@
                 <li>
                     <div class="gb-student-filter">
                         <label for="studentFilterInput" class="sr-only"><wicket:message key="filter.students"/></label>
-                        <input type="text" id="studentFilterInput" class="form-control" aria-controls="gradeTable" wicket:id="studentFilter" wicket:message="placeholder:filter.students" accesskey="f">
+                        <input type="text" id="studentFilterInput" class="form-control" aria-controls="gradeTable" wicket:id="studentFilter" wicket:message="placeholder:filter.students" accesskey="f" />
                         <a class="gb-student-filter-clear-button" wicket:message="title:filter.studentsclear" href="javascript:void(0)">
                             <i class="fa fa-times-circle" aria-hidden="true"></i>
                         </a>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
index 3b7610525921..9541848839c4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/GradebookPage.java
@@ -155,7 +155,7 @@ public GradebookPage() {
 			// no perms
 			this.permissions = this.businessService.getPermissionsForUser(this.currentUserUuid);
 			if (this.permissions.isEmpty()
-					|| (this.permissions.size() == 1 && StringUtils.equals(((PermissionDefinition) this.permissions.get(0)).getFunctionName(), GraderPermission.NONE.toString()))) {
+					|| (this.permissions.size() == 1 && StringUtils.equals(this.permissions.get(0).getFunctionName(), GraderPermission.NONE.toString()))) {
 				sendToAccessDeniedPage(getString("ta.nopermission"));
 			}
 		}
@@ -249,9 +249,6 @@ else if (!this.businessService.isUserAbleToEditAssessments()) {
 		// categories enabled?
 		final boolean categoriesEnabled = this.businessService.categoriesAreEnabled();
 
-		// grading type?
-		final Integer gradingType = gradebook.getGradeType();
-
 		this.tableArea = new WebMarkupContainer("gradeTableArea");
 		if (!this.hasGradebookItems) {
 			this.tableArea.add(AttributeModifier.append("class", "gradeTableArea"));
@@ -335,7 +332,7 @@ protected void onInitialize() {
 			}
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 				settings.setGroupedByCategory(!settings.isGroupedByCategory());
 				setUiSettings(settings, true);
 
@@ -351,7 +348,7 @@ public boolean isVisible() {
 		toolbarColumnTools.add(toggleCategoriesToolbarItem);
 
 		// sort grade items button
-		final GbAjaxLink sortGradeItemsToolbarItem = new GbAjaxLink("sortGradeItemsToolbarItem") {
+		final GbAjaxLink<Void> sortGradeItemsToolbarItem = new GbAjaxLink<>("sortGradeItemsToolbarItem") {
 			@Override
 			public void onClick(final AjaxRequestTarget target) {
 				final GbModalWindow window = GradebookPage.this.getSortGradeItemsWindow();
@@ -374,7 +371,7 @@ public boolean isVisible() {
 		toolbarColumnTools.add(sortGradeItemsToolbarItem);
 
 		// bulk edit items button
-		final GbAjaxLink bulkEditItemsToolbarItem = new GbAjaxLink("bulkEditItemsToolbarItem") {
+		final GbAjaxLink<Void> bulkEditItemsToolbarItem = new GbAjaxLink<>("bulkEditItemsToolbarItem") {
 			@Override
 			public void onClick(final AjaxRequestTarget target) {
 				final GbModalWindow window = GradebookPage.this.getBulkEditItemsWindow();
@@ -433,10 +430,10 @@ public boolean isVisible() {
 					allGroupsTitle = getString("groups.available");
 				}
 			}
-			groups.add(0, new GbGroup(null, allGroupsTitle, null, GbGroup.Type.ALL));
+			groups.add(0, new GbGroup("allGroups", allGroupsTitle, null, GbGroup.Type.ALL));
 		}
 
-		final DropDownChoice<GbGroup> groupFilter = new DropDownChoice<GbGroup>("groupFilter", new Model<GbGroup>(),
+		final DropDownChoice<GbGroup> groupFilter = new DropDownChoice<>("groupFilter", new Model<>(),
 				groups, new ChoiceRenderer<GbGroup>() {
 					private static final long serialVersionUID = 1L;
 
@@ -449,14 +446,11 @@ public Object getDisplayValue(final GbGroup g) {
 					public String getIdValue(final GbGroup g, final int index) {
 						return g.getId();
 					}
-
 				});
 
-		groupFilter.add(new AjaxFormComponentUpdatingBehavior("onchange") {
-
+		groupFilter.add(new AjaxFormComponentUpdatingBehavior("change") {
 			@Override
 			protected void onUpdate(final AjaxRequestTarget target) {
-
 				final GbGroup selected = (GbGroup) groupFilter.getDefaultModelObject();
 
 				// store selected group (null ok)
@@ -467,7 +461,6 @@ protected void onUpdate(final AjaxRequestTarget target) {
 				// refresh
 				setResponsePage(GradebookPage.class);
 			}
-
 		});
 
 		// set selected group, or first item in list
@@ -575,7 +568,7 @@ public GradebookUiSettings getUiSettings() {
 		// See if the user has a database-persisted preference for Group by Category
 		String userGbUiCatPref = this.businessService.getUserGbPreference("GROUP_BY_CAT");
 		if (StringUtils.isNotBlank(userGbUiCatPref)) {
-			settings.setGroupedByCategory(Boolean.valueOf(userGbUiCatPref));
+			settings.setGroupedByCategory(Boolean.parseBoolean(userGbUiCatPref));
 		}
  
 		return settings;
@@ -663,12 +656,8 @@ public GbAddButton(final String id) {
 			super(id);
 		}
 
-		public GbAddButton(final String id, final Form<?> form) {
-			super(id, form);
-		}
-
 		@Override
-		public void onSubmit(final AjaxRequestTarget target, final Form form) {
+		public void onSubmit(final AjaxRequestTarget target) {
 			final GbModalWindow window = getAddOrEditGradeItemWindow();
 			window.setTitle(getString("heading.addgradeitem"));
 			window.setComponentToReturnFocusTo(this);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.html
index c76896fefe8a..f84d8968cac4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java
index de5cbe4bf81c..c09f83b1ed0d 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/PermissionsPage.java
@@ -17,7 +17,6 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
@@ -28,7 +27,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
-import org.apache.wicket.markup.head.IHeaderResponse;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Button;
@@ -46,7 +44,6 @@
 import org.sakaiproject.gradebookng.business.model.GbGroup;
 import org.sakaiproject.gradebookng.business.model.GbUser;
 import org.sakaiproject.gradebookng.tool.component.GbAjaxButton;
-import org.sakaiproject.portal.util.PortalUtils;
 import org.sakaiproject.grading.api.CategoryDefinition;
 import org.sakaiproject.grading.api.GraderPermission;
 import org.sakaiproject.grading.api.PermissionDefinition;
@@ -70,7 +67,7 @@ public class PermissionsPage extends BasePage {
 	// they should not conflict with any real values that might be passed in
 	// and they are parsed out on save
 	private final String ALL_GROUPS = "-1";
-	private final Long ALL_CATEGORIES = new Long(-1);
+	private final Long ALL_CATEGORIES = (long) -1;
 
 	public PermissionsPage() {
 
@@ -150,8 +147,8 @@ public void onInitialize() {
 
 					@Override
 					public Object getDisplayValue(final GbUser u) {
-						return new StringResourceModel("permissionspage.label.tausername", null,
-								new Object[] { u.getSortName(), u.getDisplayId() }).getString();
+						return new StringResourceModel("permissionspage.label.tausername")
+								.setParameters(u.getSortName(), u.getDisplayId()).getString();
 					}
 
 					@Override
@@ -167,7 +164,7 @@ public String getIdValue(final GbUser u, final int index) {
 		}
 
 		// add the onchange to the chooser
-		taChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		taChooser.add(new AjaxFormComponentUpdatingBehavior("change") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -229,8 +226,7 @@ public boolean isVisible() {
 		add(noPermissions);
 
 		// FORM
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		final Form form = new Form("form", Model.of(pageModel)) {
+		final Form form = new Form<>("form", Model.of(pageModel)) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -432,7 +428,7 @@ public String getIdValue(final String groupRef, final int index) {
 					private static final long serialVersionUID = 1L;
 
 					@Override
-					public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+					public void onSubmit(final AjaxRequestTarget target) {
 
 						// remove current item
 						final PermissionDefinition current = item.getModelObject();
@@ -459,7 +455,7 @@ public boolean isVisible() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 
 				// add a new entry with default values so the dropdowns are sane
 				final PermissionDefinition newDef = new PermissionDefinition();
@@ -497,16 +493,14 @@ private void refreshPage(String userUUID) {
 	/**
 	 * Class for wrapping up the data used by this page
 	 */
-	private class PermissionsPageModel implements Serializable {
+	@Setter
+    @Getter
+    private class PermissionsPageModel implements Serializable {
 
 		private static final long serialVersionUID = 1L;
 
-		@Getter
-		@Setter
 		private List<PermissionDefinition> permissions;
 
-		@Getter
-		@Setter
 		private Boolean viewCourseGrade;
 
 		public PermissionsPageModel() {
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.html
index 346b66508172..17b45e287e3f 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.html
@@ -6,7 +6,7 @@ <h2>
         <wicket:message key="quickentry.title" />
     </h2>
     <wicket:message key="quickentry.caption" />
-    <form wicket:id="form" >
+    <form wicket:id="form" id="gbQuickEntryForm" class="quickEntryForm">
         <h3><wicket:message key="quickentry.itemlabel" /></h3>
         <select wicket:id="itempicker" />
         <hr />
@@ -14,7 +14,7 @@ <h3 wicket:id="itemtitle" />
         <span class="detailsFont" wicket:id="itemdetails" />
         <div class="quickentrySpacing">
             <span>
-                <strong><span wicket:id="summarycount" /></strong>
+                <strong><span wicket:id="summarycount" id="summarycount" /></strong>
                 <select wicket:id="groupicker" />
             </span>
             <span class="buttons">
@@ -45,7 +45,7 @@ <h3 wicket:id="itemtitle" />
                     <i wicket:id="lockicon" />
                 </td>
                 <td>
-                    <textarea wicket:id="studentComment" />
+                    <textarea wicket:id="studentComment" class="quickEntryComment" />
                 </td>
                 <td>
                     <input type="checkbox" wicket:id="studentExcuse" />
@@ -54,8 +54,8 @@ <h3 wicket:id="itemtitle" />
             </tbody>
         </table>
         <div class="act" >
-            <button wicket:id="submit" class="btn btn-primary active"><wicket:message key="button.update" /></button>
-            <button wicket:id="reset" class="btn-link" ><wicket:message key="quickentry.reset" /></button>
+            <button wicket:id="submit" class="btn btn-primary active" id="quickentrySubmit" disabled="disabled"><wicket:message key="button.update" /></button>
+            <button wicket:id="reset" class="btn-link" id="quickentryReset"><wicket:message key="quickentry.reset" /></button>
             <button wicket:id="cancel" class="btn-link" ><wicket:message key="button.cancel" /></button>
         </div>
         <div wicket:id="bulkGradeModal" />
@@ -63,4 +63,4 @@ <h3 wicket:id="itemtitle" />
     </form>
 </wicket:extend>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.java
index 398ec75cb5b7..0b59b15e48df 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/QuickEntryPage.java
@@ -26,7 +26,6 @@
 import org.sakaiproject.gradebookng.business.model.GbGroup;
 import org.sakaiproject.gradebookng.business.model.GbUser;
 import org.sakaiproject.gradebookng.tool.panels.BulkGradePanel;
-import org.sakaiproject.portal.util.PortalUtils;
 import org.sakaiproject.grading.api.Assignment;
 import org.sakaiproject.grading.api.SortType;
 
@@ -38,7 +37,7 @@ public class QuickEntryPage extends BasePage {
 
     private Assignment assignmentNow;
     private GbGroup groupNow;
-    private String assignmentIdNow;
+
     @Getter
     private ModalWindow bulkGrade;
     @Getter
@@ -52,6 +51,7 @@ public QuickEntryPage() {
     @Override
     public void onInitialize() {
         super.onInitialize();
+
         Integer gradeType = this.businessService.getGradebookSettings().getGradeType();
         SortType sortBy = SortType.SORT_BY_NAME;
         final List<Assignment> assignments = this.businessService.getGradebookAssignments(sortBy);
@@ -66,7 +66,7 @@ public String getIdValue(final Assignment a,final int index) {
                 return String.valueOf(a.getId());
             }
         });
-        itempicker.add(new AjaxFormComponentUpdatingBehavior("onchange") {  // add the onchange to the chooser
+        itempicker.add(new AjaxFormComponentUpdatingBehavior("change") {  // add the onchange to the chooser
             private static final long serialVersionUID = 1L;
             @Override
             protected void onUpdate(final AjaxRequestTarget target) {
@@ -91,7 +91,7 @@ public String getIdValue(final GbGroup g, final int index) {
                 return g.getId();
             }
         });
-        groupFilter.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+        groupFilter.add(new AjaxFormComponentUpdatingBehavior("change") {
             @Override
             protected void onUpdate(final AjaxRequestTarget target) {
                 final GbGroup selectedgroup = (GbGroup) groupFilter.getDefaultModelObject();
@@ -105,26 +105,27 @@ protected void onUpdate(final AjaxRequestTarget target) {
         });
         final PageParameters params = getPageParameters();
         final String selecteditem = params.get("selected").toOptionalString();
-        groupFilter.setVisible(groups.size() > 0 && !params.get("selected").isNull());  // if only one item or no assignment, hide the dropdown
+        groupFilter.setVisible(!groups.isEmpty() && !params.get("selected").isNull());  // if only one item or no assignment, hide the dropdown
         groupFilter.setNullValid(true);
         final QuickEntryPageModel pageModel = new QuickEntryPageModel();
         pageModel.setItemgrades(new ArrayList<>());
-        final Form form = new Form("form", Model.of(pageModel)) {
+
+        final Form<?> form = new Form<>("form", Model.of(pageModel)) {
             private static final long serialVersionUID = 1L;
+
             @Override
             public void onSubmit(){
                 noErrors = true;    //reset on every submission; we should be assessing this from scratch every time
-                QuickEntryPageModel dataNow = (QuickEntryPageModel) this.getModelObject();
+                QuickEntryPageModel dataNow = this.getModelObject();
                 ArrayList<QuickEntryRowModel> allgrades = dataNow.getItemgrades();
                 Long itemId = dataNow.getItemIdNow();
                 for(QuickEntryRowModel row: allgrades){ //first loop vor validation only
                     try {
-                        Double gradeValidator = Double.valueOf(row.getGrade());
+                        double gradeValidator = Double.parseDouble(row.getGrade());
                         if(gradeValidator<0){
                             getSession().error(MessageFormat.format(getString("quickentry.error"),row.getName()));
                             row.setHasError(true);
                             noErrors = false;
-                            continue;
                         } else {
                             row.setHasError(false);
                         }
@@ -132,7 +133,6 @@ public void onSubmit(){
                         getSession().error(MessageFormat.format(getString("quickentry.error"),row.getName()));
                         row.setHasError(true);
                         noErrors = false;
-                        continue;
                     } catch (NullPointerException n){
                         row.setGrade("");   //NPE is actually ok, we just need to turn it into a blank string.
                     }
@@ -184,7 +184,6 @@ public void onSubmit(){
                 }
             }
         };
-        form.add(new AttributeModifier("class","quickEntryForm"));
         WebMarkupContainer tableVisibility = new WebMarkupContainer("tableVisibility");
         if(StringUtils.isNotBlank(selecteditem)){
             for (final Assignment a : assignments) {
@@ -251,13 +250,12 @@ public int compare(QuickEntryRowModel quickEntryRowModel, QuickEntryRowModel t1)
                     return quickEntryRowModel.getName().compareTo(t1.getName());
                 }
             });
-            form.add(new Label("summarycount",MessageFormat.format(getString("quickentry.count"),studentsnow,totalstudents)).add(new AttributeModifier("class","summarycount")));
+            form.add(new Label("summarycount",MessageFormat.format(getString("quickentry.count"),studentsnow,totalstudents)));
             ListView<QuickEntryRowModel> userFields = new ListView<QuickEntryRowModel>("studentRow",rows){
                 @Override
                 protected void populateItem(final ListItem<QuickEntryRowModel> item) {
                     item.add(new Label("studentName",item.getModelObject().getName()));
-                    TextField gradeNow = new TextField<String>("studentGrade", new PropertyModel<String>(item.getModelObject(),"grade"));
-                    gradeNow.add(new AttributeModifier("onchange","enableUpdate()"));
+                    TextField<String> gradeNow = new TextField<>("studentGrade", new PropertyModel<>(item.getModelObject(),"grade"));
                     String gradeClass = "enabledGrade";
                     if(item.getModelObject().isLocked()){
                         gradeNow.setEnabled(false);
@@ -271,19 +269,21 @@ protected void populateItem(final ListItem<QuickEntryRowModel> item) {
                     }
                     gradeNow.add(new AttributeModifier("class",gradeClass));
                     item.add(gradeNow);
-                    item.add(new TextArea<String>("studentComment",new PropertyModel<String>(item.getModelObject(),"comment")).add(new AttributeModifier("class","quickEntryComment")).add(new AttributeModifier("onchange","enableUpdate()")));
-                    AjaxCheckBox excused = new AjaxCheckBox("studentExcuse",new PropertyModel<Boolean>(item.getModelObject(), "excused")){
+
+                    item.add(new TextArea<>("studentComment", new PropertyModel<String>(item.getModelObject(), "comment")));
+                    AjaxCheckBox excused = new AjaxCheckBox("studentExcuse",new PropertyModel<>(item.getModelObject(), "excused")){
                         @Override
-                        public void onUpdate(AjaxRequestTarget target){}    //necessary for compliance but not actual functionality.
+                        public void onUpdate(AjaxRequestTarget target) {}
                     };
-                    excused.add(new AttributeModifier("onchange","enableUpdate()"));
                     item.add(excused);
                 }
             };
             tableVisibility.add(userFields);
+
+            // Submit is disabled until user modifies a grade or comment
             final SubmitLink submit = new SubmitLink("submit");
-            submit.add(new AttributeModifier("id","quickentrySubmit")).add(new AttributeModifier("disabled",""));
             form.add(submit);
+
             Button reset = new Button("reset"){
                 private static final long serialVersionUID = 1L;
                 @Override
@@ -299,7 +299,6 @@ public void onSubmit(){
                 }
             };
             reset = reset.setDefaultFormProcessing(false);
-            reset.add(new AttributeModifier("id","quickentryReset"));
             form.add(reset);
         } else {
             WebMarkupContainer itemtitle = new WebMarkupContainer("itemtitle",null);
@@ -317,6 +316,7 @@ public void onSubmit(){
             tableVisibility.setVisible(false);
         }
         form.add(tableVisibility);
+
         form.add(new Button("cancel"){
             private static final long serialVersionUID = 1L;
             @Override
@@ -324,9 +324,11 @@ public void onSubmit(){
                 setResponsePage(GradebookPage.class, null);
             }
         }.setDefaultFormProcessing(false).setVisible(this.assignmentNow != null));
+
         form.add(this.bulkGrade = new ModalWindow("bulkGradeModal"));
         bulkGrade.setTitle(getString("quickentry.replacegradelabel"));
         bulkGrade.setInitialHeight(240);
+
         form.add(new AjaxLink<Void>("showBulkGrade") {
             @Override
             public void onClick(AjaxRequestTarget target)
@@ -341,6 +343,7 @@ public boolean isVisible(){
         form.add(this.bulkComment = new ModalWindow("bulkCommentModal"));
         bulkComment.setTitle(getString("quickentry.comment.caption"));
         bulkComment.setInitialHeight(300);
+
         form.add(new AjaxLink<Void>("showBulkComment") {
             @Override
             public void onClick(AjaxRequestTarget target)
@@ -369,23 +372,27 @@ public void renderHead(final IHeaderResponse response) {
         response.render(JavaScriptHeaderItem.forUrl("/gradebookng-tool/scripts/gradebook-quick-entry.js"));
     }
 
-    private class QuickEntryPageModel implements Serializable {
+    @Setter
+    @Getter
+    private static class QuickEntryPageModel implements Serializable {
         private static final long serialVersionUID = 1L;
-        @Getter @Setter private Long itemIdNow;
-        @Getter @Setter private ArrayList<QuickEntryRowModel> itemgrades;
+        private Long itemIdNow;
+        private ArrayList<QuickEntryRowModel> itemgrades;
     }
 
-    private class QuickEntryRowModel implements Serializable {
+    @Setter
+    @Getter
+    private static class QuickEntryRowModel implements Serializable {
         private static final long serialVersionUID = 1L;
-        @Getter @Setter private String studentid;
-        @Getter @Setter private String name;
-        @Getter @Setter private String grade;
-        @Getter @Setter private String comment;
-        @Getter @Setter private String originalComment;
-        @Getter @Setter private boolean excused = false;
-        @Getter @Setter private boolean locked;
-        @Getter @Setter private double maxGrade;
-        @Getter @Setter private boolean hasError;
+        private String studentid;
+        private String name;
+        private String grade;
+        private String comment;
+        private String originalComment;
+        private boolean excused = false;
+        private boolean locked;
+        private double maxGrade;
+        private boolean hasError;
 
         public boolean commentChanged() {
             return !StringUtils.equals(comment, originalComment);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java
index e7dd581258ee..4861be3743af 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/SettingsPage.java
@@ -215,9 +215,9 @@ else if (catWeight.doubleValue() > 1) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form f) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				super.onSubmit();
-				final GbSettings model = (GbSettings) f.getModelObject();
+				final GbSettings model = form.getModelObject();
 
 				Page responsePage = new SettingsPage(SettingsPage.this.gradeEntryPanel.isExpanded(),
 						SettingsPage.this.gradeReleasePanel.isExpanded(), SettingsPage.this.statisticsPanel.isExpanded(),
@@ -244,7 +244,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form f) {
 			}
 
 			@Override
-			public void onError(final AjaxRequestTarget target, final Form<?> form) {
+			public void onError(final AjaxRequestTarget target) {
 				target.add(SettingsPage.this.feedbackPanel);
 				target.appendJavaScript("scroll(0,0);");// Scroll to the top to see the message error
 			}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/StudentPage.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/StudentPage.java
index fd08b060a11f..16a1a82df2a3 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/StudentPage.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/StudentPage.java
@@ -54,7 +54,7 @@ public StudentPage() {
 		userData.put("studentUuid", u.getId());
 		userData.put("groupedByCategoryByDefault", true);
 
-		add(new Label("heading", new StringResourceModel("heading.studentpage", null, new Object[] { u.getDisplayName() })));
+		add(new Label("heading", new StringResourceModel("heading.studentpage").setParameters(u.getDisplayName())));
 		add(new StudentGradeSummaryGradesPanel("summary", Model.ofMap(userData)));
 
 		EventHelper.postStudentViewEvent(this.businessService.getGradebook(), u.getId());
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanel.java
index f2c416743e37..dcd80d1a5205 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanel.java
@@ -103,12 +103,12 @@ public AddOrEditGradeItemPanel(final String id, final GbModalWindow window, fina
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				createGradeItem(target, form, false);
 			}
 
 			@Override
-			protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onError(final AjaxRequestTarget target) {
 				target.addChildren(form, FeedbackPanel.class);
 			}
 		};
@@ -121,12 +121,12 @@ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				createGradeItem(target, form, true);
 			}
 
 			@Override
-			protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onError(final AjaxRequestTarget target) {
 				target.addChildren(form, FeedbackPanel.class);
 			}
 
@@ -148,7 +148,7 @@ public boolean isVisible() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				window.close(target);
 			}
 		};
@@ -161,7 +161,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 	/**
 	 * Helper to get the model for the button
 	 *
-	 * @return
+	 * @return ResourceModel
 	 */
 	private ResourceModel getSubmitButtonLabel() {
 		if (this.mode == UiMode.EDIT) {
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java
index d72e8a10ee0c..d8ecc73adaf9 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AddOrEditGradeItemPanelContent.java
@@ -155,15 +155,11 @@ protected void onUpdate(final AjaxRequestTarget target) {
 					final Double existing = AddOrEditGradeItemPanelContent.this.existingPoints;
 					final Double current = points.getModelObject();
 
-					log.debug("existingPoints: " + existing);
-					log.debug("currentPoints: " + current);
+                    log.debug("existingPoints: {}", existing);
+                    log.debug("currentPoints: {}", current);
+                    AddOrEditGradeItemPanelContent.this.scaleGradesTriggered = existing != null && !existing.equals(current);
 
-					AddOrEditGradeItemPanelContent.this.scaleGradesTriggered = false;
-					if (existing != null && existing != current) {
-						AddOrEditGradeItemPanelContent.this.scaleGradesTriggered = true;
-					}
-
-					log.debug("scaleGradesTriggered: " + AddOrEditGradeItemPanelContent.this.scaleGradesTriggered);
+                    log.debug("scaleGradesTriggered: {}", AddOrEditGradeItemPanelContent.this.scaleGradesTriggered);
 
 					target.add(AddOrEditGradeItemPanelContent.this.scaleGradesContainer);
 				}
@@ -317,7 +313,7 @@ protected void onUpdate(final AjaxRequestTarget target) {
 
 		// behaviour for when a category is chosen. If the category is extra
 		// credit, deselect and disable extra credit checkbox
-		categoryDropDown.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		categoryDropDown.add(new AjaxFormComponentUpdatingBehavior("change") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -368,8 +364,8 @@ public void setDueDate(ZonedDateTime zoned)	{
 		asn.setDueDate(zoned == null ? null : Date.from(zoned.toInstant()));
 	}
 
+	@Override
 	public void renderHead(final IHeaderResponse response) {
-
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
 			"<script type=\"module\" src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AssignmentStatisticsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AssignmentStatisticsPanel.java
index fcf7b8d2e325..53c655d69cb0 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AssignmentStatisticsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/AssignmentStatisticsPanel.java
@@ -49,7 +49,7 @@ public void onInitialize() {
 		final Assignment assignment = this.businessService.getAssignment(assignmentId.longValue());
 
 		AssignmentStatisticsPanel.this.window.setTitle(
-				new StringResourceModel("label.statistics.title.assignment", getDefaultModel(), null, assignment.getName()).getString());
+				new StringResourceModel("label.statistics.title.assignment").setParameters(assignment.getName()).getString());
 
 		final AssignmentGradeChart chart = new AssignmentGradeChart("gradingSchemaChart", assignmentId, null);
 		add(chart);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.html
index 44b1213f08ed..729ca9ab294a 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -10,9 +11,24 @@
 				<thead>
 					<tr>
 						<th class="col-md-4"><wicket:message key="bulkedit.column.header.gradebookitem" /></th>
-						<th class="col-md-1"><wicket:message key="bulkedit.column.header.release" /><br/><input type="checkbox" id="releaseToggleAll" onchange="releaseToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.release.toggle.all"> <label for="releaseToggleAll" wicket:id="releaseToggleAllLabel">Toggle All</label></th>
-						<th class="col-md-1"><wicket:message key="bulkedit.column.header.include" /><br/><input type="checkbox" id="includeToggleAll" onchange="includeToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.include.toggle.all"> <label for="includeToggleAll" wicket:id="includeToggleAllLabel">Toggle All</label></th>
-						<th class="col-md-1"><wicket:message key="bulkedit.column.header.delete" /><br/><input type="checkbox" id="deleteToggleAll" onchange="deleteToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.delete.toggle.all"> <label for="deleteToggleAll" wicket:id="deleteToggleAllLabel">Toggle All</label></th>
+						<th class="col-md-1"><wicket:message key="bulkedit.column.header.release" />
+							<div>
+								<input type="checkbox" id="releaseToggleAll" onchange="releaseToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.release.toggle.all" />
+								<label for="releaseToggleAll" wicket:id="releaseToggleAllLabel" class="fs-6 text-secondary">Toggle All</label>
+							</div>
+						</th>
+						<th class="col-md-1"><wicket:message key="bulkedit.column.header.include" />
+							<div>
+								<input type="checkbox" id="includeToggleAll" onchange="includeToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.include.toggle.all" />
+								<label for="includeToggleAll" wicket:id="includeToggleAllLabel" class="fs-6 text-secondary">Toggle All</label>
+							</div>
+						</th>
+						<th class="col-md-1"><wicket:message key="bulkedit.column.header.delete" />
+							<div>
+								<input type="checkbox" id="deleteToggleAll" onchange="deleteToggleCheckboxes();" wicket:message="aria-label:label.addgradeitem.delete.toggle.all" />
+								<label for="deleteToggleAll" wicket:id="deleteToggleAllLabel" class="fs-6 text-secondary">Toggle All</label>
+							</div>
+						</th>
 					</tr>
 				</thead>
 				<tbody>
@@ -39,7 +55,7 @@
 				<div class="modal-dialog">
 					<div class="modal-content">
 						<div class="modal-header">
-							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&#215;</span></button>
 							<h3 class="modal-title"><wicket:message key="bulkedit.confirmation.title" /></h3>
 						</div>
 						<div class="modal-body">
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.java
index 68bd9bd0ed4d..1e62e74f8d41 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/BulkEditItemsPanel.java
@@ -19,6 +19,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
@@ -52,13 +53,10 @@ public class BulkEditItemsPanel extends BasePanel {
 
 	private final ModalWindow window;
 
-	private List<Long> deletableItemsList = new ArrayList<Long>();
+	@Getter
+    private List<Long> deletableItemsList = new ArrayList<Long>();
 
-	public List<Long> getDeletableItemsList () {
-		return this.deletableItemsList;
-	}
-
-	public void clearDeletableItemsList () {
+    public void clearDeletableItemsList () {
 		this.deletableItemsList.clear();
 	}
 
@@ -120,7 +118,7 @@ protected void onUpdate(AjaxRequestTarget target) {
 			// Are there categories in this Gradebook? If so, and this item is not in a category, disabled grade
 			// calculation inclusion.
 			List<CategoryDefinition> categories = businessService.getGradebookCategories();
-			if (categories != null && categories.size() > 0 && StringUtils.isBlank(assignment.getCategoryName())) {
+			if (categories != null && !categories.isEmpty() && StringUtils.isBlank(assignment.getCategoryName())) {
 				include.setEnabled(false);
 			}
 			if (assignment.getExternallyMaintained()){	//don't allow External items to be deleted.
@@ -143,7 +141,7 @@ public CancelButton(final String id) {
 		}
 
 		@Override
-		public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+		public void onSubmit(final AjaxRequestTarget target) {
 			BulkEditItemsPanel.this.clearDeletableItemsList();
 			BulkEditItemsPanel.this.window.close(target);
 		}
@@ -160,9 +158,9 @@ public SubmitButton(final String id) {
 		}
 
 		@Override
-		public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+		public void onSubmit(final AjaxRequestTarget target) {
 
-			final List<Assignment> assignments = (List<Assignment>) form.getModelObject();
+			final List<Assignment> assignments = (List<Assignment>) getForm().getModelObject();
 
 			try {
 				for (final Assignment a : assignments) {
@@ -179,7 +177,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 				if (deleteCount > 0) {
 					String deletedList = assignments.stream().filter(a -> deletableItems.contains(a.getId())).map(Assignment::getName)
 						.collect(Collectors.joining(", "));
-					getSession().success(new StringResourceModel("bulkedit.delete.success", null, new Object[] { deletedList }).getString());
+					getSession().success(new StringResourceModel("bulkedit.delete.success").setParameters(deletedList).getString());
 				}
 				BulkEditItemsPanel.this.clearDeletableItemsList();
 			}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeBreakdownPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeBreakdownPanel.java
index 3218d3f79ae7..6c254fb9cfa5 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeBreakdownPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeBreakdownPanel.java
@@ -107,7 +107,7 @@ protected void populateItem(ListItem<GbBreakdownItem> item) {
                 if (assignment == null || StringUtils.isBlank(assignment.getExternalAppName())) {
                     externalAppFlag.setVisible(false);
                 } else {
-                    externalAppFlag.add(new AttributeModifier("data-content", gradebookPage.generatePopoverContent(new StringResourceModel("label.gradeitem.externalapplabel", null, new Object[] { assignment.getExternalAppName() }).getString())));
+                    externalAppFlag.add(new AttributeModifier("data-content", gradebookPage.generatePopoverContent(new StringResourceModel("label.gradeitem.externalapplabel").setParameters(assignment.getExternalAppName()).getString())));
                     String iconClass = businessService.getIconClass(assignment);
                     externalAppFlag.add(new AttributeModifier("class", "gb-external-app-flag " + iconClass));
                 }
@@ -195,7 +195,7 @@ public boolean isVisible() {
         };
         itemListContainer.add(totalPtsContainer);
         totalPtsContainer.add(new Label("total-points", CourseGradeBreakdownPanel.this.overAllPoints));
-        add(new GbAjaxLink("done") {
+        add(new GbAjaxLink<>("done") {
             private static final long serialVersionUID = 1L;
 
             @Override
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverrideLogPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverrideLogPanel.java
index ba58d4b5a113..87a088b92e1a 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverrideLogPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverrideLogPanel.java
@@ -60,8 +60,8 @@ public void onInitialize() {
 		// TODO if user has been deleted since rendering the GradebookPage, handle a null here gracefully
 		final GbUser user = this.businessService.getUser(studentUuid);
 		CourseGradeOverrideLogPanel.this.window.setTitle(
-				(new StringResourceModel("heading.coursegradelog", null,
-						new Object[] { user.getDisplayName(), user.getDisplayId() })).getString())
+				(new StringResourceModel("heading.coursegradelog")
+						.setParameters(user.getDisplayName(), user.getDisplayId())).getString())
 				.setEscapeModelStrings(false);
 
 		// get the course grade
@@ -99,7 +99,7 @@ protected void populateItem(final ListItem<GbGradeLog> item) {
 		add(emptyLabel);
 
 		// done button
-		add(new GbAjaxLink("done") {
+		add(new GbAjaxLink<>("done") {
 
 			private static final long serialVersionUID = 1L;
 
@@ -114,7 +114,7 @@ public void onClick(final AjaxRequestTarget target) {
 	 * Helper to format a grade log entry
 	 *
 	 * @param gradeLog
-	 * @return
+	 * @return formatted string
 	 */
 	private String formatLogEntry(final GbGradeLog gradeLog) {
 
@@ -128,9 +128,9 @@ private String formatLogEntry(final GbGradeLog gradeLog) {
 
 		// if no grade, it is a reset
 		if (StringUtils.isNotBlank(grade)) {
-			rval = new StringResourceModel("coursegrade.log.entry.set", null, new Object[] { logDate, grade, graderDisplayId }).getString();
+			rval = new StringResourceModel("coursegrade.log.entry.set").setParameters(logDate, grade, graderDisplayId).getString();
 		} else {
-			rval = new StringResourceModel("coursegrade.log.entry.unset", null, new Object[] { logDate, graderDisplayId }).getString();
+			rval = new StringResourceModel("coursegrade.log.entry.unset").setParameters(logDate, graderDisplayId).getString();
 		}
 
 		return rval;
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverridePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverridePanel.java
index 9b70a504bd92..f76adb38141f 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverridePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/CourseGradeOverridePanel.java
@@ -87,8 +87,8 @@ public void onInitialize() {
 
 		// heading
 		CourseGradeOverridePanel.this.window.setTitle(
-				(new StringResourceModel("heading.coursegrade", null,
-						new Object[] { studentUser.getDisplayName(), studentUser.getDisplayId() })).getString())
+				(new StringResourceModel("heading.coursegrade")
+						.setParameters(studentUser.getDisplayName(), studentUser.getDisplayId())).getString())
 				.setEscapeModelStrings(false);
 
 		// form model
@@ -111,7 +111,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				String newGrade = (String) form.getModelObject();
 				String gradeScale = null;
 
@@ -162,7 +162,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> f) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				CourseGradeOverridePanel.this.window.close(target);
 			}
 		};
@@ -174,7 +174,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> f) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> f) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				final boolean success = CourseGradeOverridePanel.this.businessService.updateCourseGrade(studentUuid, null, null);
 				if (success) {
 					getSession().success(getString("message.addcoursegradeoverride.success"));
@@ -215,8 +215,7 @@ private String formatPoints(final CourseGradeTransferBean courseGrade, final Gra
 			final Double totalPointsPossible = courseGrade.getTotalPointsPossible();
 
 			if (pointsEarned != null && totalPointsPossible != null) {
-				rval = new StringResourceModel("coursegrade.display.points-first", null,
-						new Object[] { pointsEarned, totalPointsPossible }).getString();
+				rval = new StringResourceModel("coursegrade.display.points-first").setParameters(pointsEarned, totalPointsPossible).getString();
 			} else {
 				rval = getString("coursegrade.display.points-none");
 			}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/DeleteItemPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/DeleteItemPanel.java
index c655da992cdf..7854d38d77df 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/DeleteItemPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/DeleteItemPanel.java
@@ -48,19 +48,19 @@ public void onInitialize() {
 
 		final Long assignmentId = (Long) getDefaultModelObject();
 
-		final Form<Long> form = new Form("form", Model.of(assignmentId));
+		final Form<Long> form = new Form<>("form", Model.of(assignmentId));
 
 		final Assignment assignment = DeleteItemPanel.this.businessService.getAssignment(assignmentId);
 		final String assignmentTitle = assignment.getName();
-		form.add(new Label("confirmationMessage", new StringResourceModel( "delete.warning", null, new Object[] { assignmentTitle })).setEscapeModelStrings(false));
+		form.add(new Label("confirmationMessage", new StringResourceModel( "delete.warning").setParameters(assignmentTitle)).setEscapeModelStrings(false));
 
 		final GbAjaxButton submit = new GbAjaxButton("submit") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 
-				final Long assignmentIdToDelete = (Long) form.getModelObject();
+				final Long assignmentIdToDelete = form.getModelObject();
 				final Assignment assignment = DeleteItemPanel.this.businessService.getAssignment(assignmentIdToDelete);
 				final String assignmentTitle = assignment.getName();
 
@@ -78,7 +78,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				DeleteItemPanel.this.window.close(target);
 			}
 		};
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditCourseGradeCommentPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditCourseGradeCommentPanel.java
index eeaf4581b4bb..2e9c31d7ef4e 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditCourseGradeCommentPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditCourseGradeCommentPanel.java
@@ -28,6 +28,13 @@ public class EditCourseGradeCommentPanel extends BasePanel {
     private static final long serialVersionUID = 1L;
 
     private final ModalWindow window;
+    /**
+     * -- GETTER --
+     *  Getter for the comment string so we can update components on the parent page when the comment is saved here
+     *
+     * @return
+     */
+    @Getter
     private String comment;
 
     public EditCourseGradeCommentPanel(final String id, final IModel<Map<String, Object>> model, final ModalWindow window) {
@@ -55,7 +62,7 @@ public void onInitialize() {
             private static final long serialVersionUID = 1L;
 
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 final GradeComment updatedComment = (GradeComment) form.getModelObject();
                 final boolean success = EditCourseGradeCommentPanel.this.businessService.updateAssignmentGradeComment(businessService.getCourseGradeId(gradebookId), studentUuid, updatedComment.getGradeComment());
                 if (success) {
@@ -73,7 +80,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
             private static final long serialVersionUID = 1L;
 
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 EditCourseGradeCommentPanel.this.window.close(target);
             }
         };
@@ -81,21 +88,14 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
         form.add(cancel);
         // heading
         final GbUser user = this.businessService.getUser(studentUuid);
-        EditCourseGradeCommentPanel.this.window.setTitle((new StringResourceModel("heading.editcomment", null, new Object[] { user.getDisplayName(), user.getDisplayId(), "Course Grade" })).getString())
+        EditCourseGradeCommentPanel.this.window.setTitle((new StringResourceModel("heading.editcomment")
+                .setParameters(user.getDisplayName(), user.getDisplayId(), "Course Grade")).getString())
                 .setEscapeModelStrings(false);
         // textarea
         form.add(new TextArea<>("comment", new PropertyModel<>(formModel, "gradeComment")).add(StringValidator.maximumLength(CommentValidator.getMaxCommentLength(serverConfigService))));
         add(form);
     }
 
-    /**
-     * Getter for the comment string so we can update components on the parent page when the comment is saved here
-     * @return
-     */
-    public String getComment() {
-        return this.comment;
-    }
-
     /**
      * Model for this form
      */
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditGradeCommentPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditGradeCommentPanel.java
index 89a0537009f7..281e049d26d9 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditGradeCommentPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/EditGradeCommentPanel.java
@@ -51,7 +51,14 @@ public class EditGradeCommentPanel extends BasePanel {
 	private static final long serialVersionUID = 1L;
 
 	private final ModalWindow window;
-	private String comment;
+    /**
+     * -- GETTER --
+     *  Getter for the comment string so we can update components on the parent page when the comment is saved here
+     *
+     * @return
+     */
+    @Getter
+    private String comment;
 
 	public EditGradeCommentPanel(final String id, final IModel<Map<String, Object>> model, final ModalWindow window) {
 		super(id, model);
@@ -83,7 +90,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 
 				final GradeComment updatedComment = (GradeComment) form.getModelObject();
 
@@ -106,7 +113,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			}
 
 			@Override
-			protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onError(final AjaxRequestTarget target) {
 				target.addChildren(form, FeedbackPanel.class);
 			}
 
@@ -117,7 +124,7 @@ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				EditGradeCommentPanel.this.window.close(target);
 			}
 		};
@@ -129,8 +136,8 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 		final GbUser user = this.businessService.getUser(studentUuid);
 		final Assignment assignment = this.businessService.getAssignment(assignmentId);
 		EditGradeCommentPanel.this.window.setTitle(
-				(new StringResourceModel("heading.editcomment", null,
-						new Object[] { user.getDisplayName(), user.getDisplayId(), assignment.getName() })).getString())
+				(new StringResourceModel("heading.editcomment")
+						.setParameters(user.getDisplayName(), user.getDisplayId(), assignment.getName())).getString())
 				.setEscapeModelStrings(false);
 
 		// textarea
@@ -138,7 +145,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 				.add(StringValidator.maximumLength(CommentValidator.getMaxCommentLength(serverConfigService))));
 
 		// instant validation
-		// AjaxFormValidatingBehavior.addToAllFormComponents(form, "onkeyup", Duration.ONE_SECOND);
+		// AjaxFormValidatingBehavior.addToAllFormComponents(form, "keyup", Duration.ONE_SECOND);
 
 		// feedback panel
 		form.add(new GbFeedbackPanel("editCommentFeedback"));
@@ -146,16 +153,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 		add(form);
 	}
 
-	/**
-	 * Getter for the comment string so we can update components on the parent page when the comment is saved here
-	 *
-	 * @return
-	 */
-	public String getComment() {
-		return this.comment;
-	}
-
-	/**
+    /**
 	 * Model for this form
 	 */
 	class GradeComment implements Serializable {
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeLogPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeLogPanel.java
index a526ce069d47..d82890b75a6a 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeLogPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeLogPanel.java
@@ -79,15 +79,15 @@ protected void populateItem(final ListItem<GbGradeLog> item) {
 				// add the entry
 				if(gradeLog.getStatus() == GradingEventStatus.GRADE_NONE) {
 					item.add(new Label("entry",
-							new StringResourceModel("grade.log.entry", null, new Object[] { logDate, grade, graderDisplayId }))
+							new StringResourceModel("grade.log.entry").setParameters(logDate, grade, graderDisplayId))
 							.setEscapeModelStrings(false));
 				}else if(gradeLog.getStatus() == GradingEventStatus.GRADE_EXCLUDED) {
 					item.add(new Label("entry",
-							new StringResourceModel("grade.log.excluded", null, new Object[] { logDate, grade, graderDisplayId }))
+							new StringResourceModel("grade.log.excluded").setParameters(logDate, grade, graderDisplayId))
 							.setEscapeModelStrings(false));					
 				}else {
 					item.add(new Label("entry",
-							new StringResourceModel("grade.log.included", null, new Object[] { logDate, grade, graderDisplayId }))
+							new StringResourceModel("grade.log.included").setParameters(logDate, grade, graderDisplayId))
 							.setEscapeModelStrings(false));
 				}
 			}
@@ -100,7 +100,7 @@ protected void populateItem(final ListItem<GbGradeLog> item) {
 		add(emptyLabel);
 
 		// done button
-		add(new GbAjaxLink("done") {
+		add(new GbAjaxLink<>("done") {
 
 			private static final long serialVersionUID = 1L;
 
@@ -114,8 +114,7 @@ public void onClick(final AjaxRequestTarget target) {
 		// TODO if user has been deleted since rendering the GradebookPage, handle a null here gracefully
 		final GbUser user = this.businessService.getUser(studentUuid);
 		GradeLogPanel.this.window.setTitle(
-				(new StringResourceModel("heading.gradelog", null,
-						new Object[] { user.getDisplayName(), user.getDisplayId() })).getString())
+				(new StringResourceModel("heading.gradelog").setParameters(user.getDisplayName(), user.getDisplayId())).getString())
 				.setEscapeModelStrings(false);
 
 	}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
index dda4d12d8652..2b93afe89d79 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -36,7 +37,7 @@
 									</span>
 								</div>
 								<p wicket:id="categoryDropInfo" class="gb-summary-grade-category-dropInfo">
-									<span wicket:id="categoryDropInfo1">Drop Highest: 1 & </span><wbr><span wicket:id="categoryDropInfo2">Drop Lowest: 1</span>
+									<span wicket:id="categoryDropInfo1">Drop Highest: 1</span><wbr/><span wicket:id="categoryDropInfo2">Drop Lowest: 1</span>
 								</p>
 							</th>
 							<td class="gb-summary-category-grade" wicket:id="categoryGrade" wicket:message="aria-label:studentsummary.categoryaverage"></td>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
index fc3d0ccdfc1d..8595fd46547b 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/GradeSummaryTablePanel.java
@@ -87,8 +87,6 @@ public void onInitialize() {
 
 	@Override
 	public void onBeforeRender() {
-		super.onBeforeRender();
-
 		final Map<String, Object> data = (Map<String, Object>) getDefaultModelObject();
 
 		final Map<Long, GbGradeInfo> grades = (Map<Long, GbGradeInfo>) data.get("grades");
@@ -117,7 +115,7 @@ public void onBeforeRender() {
 		final WebMarkupContainer toggleActions = new WebMarkupContainer("toggleActions");
 		toggleActions.setVisible(categoriesEnabled);
 
-		final GbAjaxLink toggleCategoriesLink = new GbAjaxLink("toggleCategoriesLink") {
+		final GbAjaxLink<Void> toggleCategoriesLink = new GbAjaxLink<>("toggleCategoriesLink") {
 			@Override
 			protected void onInitialize() {
 				super.onInitialize();
@@ -259,7 +257,7 @@ protected void populateItem(final ListItem<Assignment> assignmentItem) {
 
 						final BasePage page = (BasePage) getPage();
 
-						final GbAjaxLink assignmentStatsLink = new GbAjaxLink(
+						final GbAjaxLink<Void> assignmentStatsLink = new GbAjaxLink<>(
 								"assignmentStatsLink") {
 
 							private static final long serialVersionUID = 1L;
@@ -287,7 +285,7 @@ public boolean isVisible() {
 
 						assignmentItem.add(assignmentStatsLink);
 
-						final GbAjaxLink compareLink = new GbAjaxLink("compareLink") {
+						final GbAjaxLink<Void> compareLink = new GbAjaxLink<>("compareLink") {
 							@Override
 							public void onClick(AjaxRequestTarget target) {
 								assignment.getId();
@@ -324,7 +322,7 @@ public boolean isVisible() {
 						flags.add(newPopoverFlag("isNotCounted", getString("label.gradeitem.notcounted"), !assignment.getCounted()));
 						flags.add(newPopoverFlag("isNotReleased", getString("label.gradeitem.notreleased"), !assignment.getReleased()));
 						flags.add(newPopoverFlag("isExcused", getString("grade.notifications.excused"), excused));
-						String extAppName = new StringResourceModel("label.gradeitem.externalapplabel", null, new Object[] { GradeSummaryTablePanel.this.businessService.getExternalAppName(assignment.getExternalAppName()) }).getString();
+						String extAppName = new StringResourceModel("label.gradeitem.externalapplabel").setParameters(GradeSummaryTablePanel.this.businessService.getExternalAppName(assignment.getExternalAppName())).getString();
 						flags.add(newPopoverFlag("isExternal", extAppName, assignment.getExternallyMaintained())
 								.add(new AttributeModifier("class", externalAppIconClass)));
 						flags.setVisible(
@@ -348,8 +346,8 @@ public boolean isVisible() {
 						final WebMarkupContainer gradeScore = new WebMarkupContainer("gradeScore");
 						if (Objects.equals(GradingConstants.GRADE_TYPE_PERCENTAGE, gradeType)) {
 							gradeScore.add(new Label("grade",
-									new StringResourceModel("label.percentage.valued", null,
-											new Object[] { FormatHelper.formatGrade(rawGrade) })) {
+									new StringResourceModel("label.percentage.valued")
+											.setParameters(FormatHelper.formatGrade(rawGrade))) {
 								@Override
 								public boolean isVisible() {
 									return StringUtils.isNotBlank(rawGrade);
@@ -384,7 +382,7 @@ public boolean isVisible() {
 							gradeScore.add(
 									new Label("grade", FormatHelper.convertEmptyGradeToDash(FormatHelper.formatGradeForDisplay(rawGrade))));
 							gradeScore.add(new Label("outOf",
-									new StringResourceModel("label.studentsummary.outof", null, assignment.getPoints())));
+									new StringResourceModel("label.studentsummary.outof").setParameters(assignment.getPoints())));
 
 							final WebMarkupContainer sakaiRubricButton = new WebMarkupContainer("sakai-rubric-student-button");
 							sakaiRubricButton.add(AttributeModifier.append("display", "icon"));
@@ -445,7 +443,7 @@ public boolean isVisible() {
 										}
 									}
 								} else {
-									log.warn(assignment.getExternalId() + " is not a valid assignment reference");
+                                    log.warn("{} is not a valid assignment reference", assignment.getExternalId());
 								}
 							} else {
 								sakaiRubricButton.add(AttributeModifier.append("tool-id", RubricsConstants.RBCS_TOOL_GRADEBOOKNG));
@@ -488,6 +486,8 @@ public boolean isVisible() {
 				});
 			}
 		});
+        // Call this at the end as some of the components need to be added before checkChildComponent runs on the enclosure
+		super.onBeforeRender();
 	}
 
 	private void addInstructorAttributeOrHide(WebMarkupContainer sakaiRubricButton, Assignment assignment, String studentId, boolean showingStudentView) {
@@ -528,8 +528,8 @@ public String getAjaxIndicatorMarkupId() {
 		return "loading-grade-summary";
 	}
 
+	@Override
 	public void renderHead(final IHeaderResponse response) {
-
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
 			"<script type=\"module\" src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
index a7ca72eef0d1..f6d6f9c895f9 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricGradePanel.java
@@ -103,7 +103,7 @@ public void onInitialize() {
 
         final GbAjaxButton submit = new GbAjaxButton("submit") {
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 target.appendJavaScript(String.format("GbGradeTable.instance.setDataAtCell(rubricGradingRow, rubricGradingCol, rubricGradingPoints.toString());", studentUuid, assignmentId));
                 RubricGradePanel.this.window.close(target);
             }
@@ -114,14 +114,14 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 
         final GbAjaxButton cancel = new GbAjaxButton("cancel") {
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 RubricGradePanel.this.window.close(target);
             }
         };
         cancel.setVisible(!assignment.getExternallyMaintained());
         final GbAjaxButton closeViewer = new GbAjaxButton("closeViewer") {
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 RubricGradePanel.this.window.close(target);
             }
         };
@@ -136,11 +136,11 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
         add(form);
 
         this.window.setInitialWidth(1100);
-        RubricGradePanel.this.window.setTitle(new StringResourceModel("rubrics.option.graderubric.for", null, new Object[] { student.getDisplayName(), student.getDisplayId() }));
+        RubricGradePanel.this.window.setTitle(new StringResourceModel("rubrics.option.graderubric.for").setParameters(student.getDisplayName(), student.getDisplayId()));
     }
 
+    @Override
 	public void renderHead(final IHeaderResponse response) {
-
 		final String version = PortalUtils.getCDNQuery();
 		response.render(StringHeaderItem.forString(
 			"<script type=\"module\" src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java
index e9722da0dd6b..36ffc0fcfd54 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/RubricPreviewPanel.java
@@ -73,7 +73,7 @@ public void onInitialize() {
         add(sakaiRubricPreview);
         final GbAjaxButton done = new GbAjaxButton("done") {
             @Override
-            public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+            public void onSubmit(final AjaxRequestTarget target) {
                 RubricPreviewPanel.this.window.close(target);
             }
         };
@@ -83,8 +83,8 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
         RubricPreviewPanel.this.window.setTitle(this.getString("label.rubric.preview") + assignmentNow.getName());
     }
 
+    @Override
     public void renderHead(IHeaderResponse response) {
-
         String version = PortalUtils.getCDNQuery();
         response.render(StringHeaderItem.forString(
                 "<script type=\"module\" src=\"/webcomponents/bundles/rubric-association-requirements.js" + version + "\"></script>"));
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.html
index d23a8baade57..2d09bbcedb82 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -12,7 +13,7 @@ <h2 class="accordion-header">
 				data-bs-target="#settingsCategories"
 				aria-expanded="false"
 				aria-controls="settingsCategories">
-				<wicket:message key="settingspage.categories.heading">Categories & Weighting</wicket:message>
+				<wicket:message key="settingspage.categories.heading">Categories &amp; Weighting</wicket:message>
 			</button>
 		</h2>
 		<div wicket:id="settingsCategoriesPanel" id="settingsCategories" class="accordion-collapse collapse" aria-labelledby="settingsCategoriesHeader">
@@ -77,12 +78,12 @@ <h2 class="accordion-header">
 									<input wicket:id="name" type="text" class="form-control" />
 								</td>
 								<td class="gb-category-weight"><input wicket:id="weight" type="text" size="5" class="form-control" /></td>
-								<td class="gb-category-extracredit"><input wicket:id="extraCredit" type="checkbox" class="form-control" /></td>
+								<td class="gb-category-extracredit"><input wicket:id="extraCredit" type="checkbox" /></td>
 								<td><span wicket:id="numItems">0 items(s)</span></td>
 								<td class="gb-category-drophighest"><input wicket:id="categoryDropHighest" type="text" size="5" class="form-control" /></td>
 								<td class="gb-category-droplowest"><input wicket:id="categoryDropLowest" type="text" size="5" class="form-control" /></td>
 								<td class="gb-category-keephighest"><input wicket:id="categoryKeepHighest" type="text" size="5" class="form-control" /></td>
-								<td class="gb-category-equalweight"><input wicket:id="equalWeight" type="checkbox" class="form-control" /></td>
+								<td class="gb-category-equalweight"><input wicket:id="equalWeight" type="checkbox" /></td>
 								<td><button wicket:id="remove" type="button" class="btn btn-default btn-table"><wicket:message key="button.remove" /></button></td>
 							</tr>
 						</tbody>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.java
index 478bddf3af83..1a48843060e0 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsCategoryPanel.java
@@ -29,6 +29,7 @@
 import java.util.Objects;
 import java.util.Set;
 
+import lombok.Getter;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.Component;
@@ -87,7 +88,8 @@ public SettingsCategoryPanel(final String id, final IModel<GbSettings> model, fi
 		this.expanded = expanded;
 	}
 
-	private enum DropKeepUsage {
+	@Getter
+    private enum DropKeepUsage {
 		CATEGORY("settingspage.categories.instructions.applydropkeep"),
 		EXCLUSIVE("settingspage.categories.hover.dropkeepusage");
 
@@ -97,10 +99,7 @@ private enum DropKeepUsage {
 			this.message = message;
 		}
 
-		public String getMessage() {
-			return this.message;
-		}
-	}
+    }
 
 	@Override
 	public void onInitialize() {
@@ -409,8 +408,8 @@ protected void onUpdate(final AjaxRequestTarget target) {
 				item.add(weight);
 
 				// num assignments
-				final Label numItems = new Label("numItems", new StringResourceModel("settingspage.categories.items", null,
-						new Object[] { category.getAssignmentList().size() }));
+				final Label numItems = new Label("numItems", new StringResourceModel("settingspage.categories.items")
+						.setParameters(category.getAssignmentList().size()));
 				item.add(numItems);
 
 				// extra credit
@@ -585,7 +584,7 @@ protected void onUpdate(final AjaxRequestTarget target) {
 				equalWeight.setOutputMarkupId(true);
 
 				// onchange: remove ability to set drop/keep lowest/highest if different points
-				equalWeight.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+				equalWeight.add(new AjaxFormComponentUpdatingBehavior("change") {
 					private static final long serialVersionUID = 1L;
 
 					@Override
@@ -631,7 +630,7 @@ protected void onUpdate(final AjaxRequestTarget target) {
 					private static final long serialVersionUID = 1L;
 
 					@Override
-					public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+					public void onSubmit(final AjaxRequestTarget target) {
 
 						// remove this category from the model
 						final CategoryDefinition current = item.getModelObject();
@@ -709,7 +708,7 @@ public void renderHead(final IHeaderResponse response) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onSubmit(final AjaxRequestTarget target, final Form<?> f) {
+			protected void onSubmit(final AjaxRequestTarget target) {
 
 				// add a new empty category to the model
 				SettingsCategoryPanel.this.model.getObject().getGradebookInformation().getCategories().add(stubCategoryDefinition());
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeEntryPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeEntryPanel.java
index e3d7196d8768..5d18f52241d3 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeEntryPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeEntryPanel.java
@@ -15,6 +15,7 @@
  */
 package org.sakaiproject.gradebookng.tool.panels;
 
+import lombok.Getter;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.form.Radio;
 import org.apache.wicket.markup.html.form.RadioGroup;
@@ -29,7 +30,8 @@ public class SettingsGradeEntryPanel extends BasePanel {
 	private static final long serialVersionUID = 1L;
 
 	IModel<GbSettings> model;
-	private boolean expanded;
+	@Getter
+    private boolean expanded;
 
 	public SettingsGradeEntryPanel(final String id, final IModel<GbSettings> model, final boolean expanded) {
 		super(id, model);
@@ -53,7 +55,4 @@ public void onInitialize() {
 		settingsGradeEntryPanel.add(gradeEntry);
 	}
 
-	public boolean isExpanded() {
-		return this.expanded;
-	}
 }
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html
index cb6bc74f0ded..341d2e9e5046 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -84,7 +85,7 @@ <h2 class="accordion-header">
 								<wicket:message key="settingspage.allowcomparegrades.display.label" />
 							</span>
 							<label>
-								<input disabled checked="checked" type="checkbox" />
+								<input disabled="disabled" checked="checked" type="checkbox" />
 								<span><wicket:message key="settingspage.allowcomparegrades.display.grades.label" /></span>
 							</label>
 							<label>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java
index b712f0a301d4..724d277136c4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradeReleasePanel.java
@@ -381,7 +381,7 @@ public String getObject() {
 		courseGradePreview.add(this.preview);
 
 		// behaviour for when the 'display course grade' checkbox is changed
-		displayCourseGrade.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		displayCourseGrade.add(new AjaxFormComponentUpdatingBehavior("change") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java
index 207718d97452..1f26a26ad693 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsGradingSchemaPanel.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -63,7 +64,8 @@ public class SettingsGradingSchemaPanel extends BasePanel implements IFormModelU
 	CourseGradeStatistics stats;
 	ListView<GbGradingSchemaEntry> schemaView;
 	private List<GradeMappingDefinition> gradeMappings;
-	boolean expanded;
+	@Getter
+    boolean expanded;
 	String gradingSchemaName;
 	DescriptiveStatistics statistics;
 	Label modifiedSchema;
@@ -210,7 +212,7 @@ protected void populateItem(final ListItem<GbGradingSchemaEntry> item) {
 					private static final long serialVersionUID = 1L;
 
 					@Override
-					public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+					public void onSubmit(final AjaxRequestTarget target) {
 
 						// remove this entry from the model data
 						final GbGradingSchemaEntry current = item.getModelObject();
@@ -234,7 +236,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 		settingsGradingSchemaPanel.add(this.schemaWrap);
 
 		// handle updates on the schema type chooser
-		typeChooser.add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		typeChooser.add(new AjaxFormComponentUpdatingBehavior("change") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -267,7 +269,7 @@ protected void onUpdate(final AjaxRequestTarget target) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onSubmit(final AjaxRequestTarget target, final Form<?> f) {
+			protected void onSubmit(final AjaxRequestTarget target) {
 
 				// add a new empty mapping to the model data
 				final List<GbGradingSchemaEntry> entries = getGradingSchemaList();
@@ -377,11 +379,7 @@ private Map<String, Double> getBottomPercents() {
 		return bottomPercents;
 	}
 
-	public boolean isExpanded() {
-		return this.expanded;
-	}
-
-	/**
+    /**
 	 * Get a List of {@link GbUser}'s with course grade overrides.
 	 *
 	 * @return
@@ -418,8 +416,7 @@ private Map<String, CourseGradeTransferBean> getCourseGrades() {
 	 * @return
 	 */
 	private int getTotalCourseGrades(final Map<String, CourseGradeTransferBean> map) {
-		return map.values().stream().filter(c -> StringUtils.isNotBlank(c.getMappedGrade()))
-				.collect(Collectors.toList()).size();
+		return (int) map.values().stream().filter(c -> StringUtils.isNotBlank(c.getMappedGrade())).count();
 	}
 
 	/**
@@ -455,7 +452,7 @@ class GradingSchemaChangeBehaviour extends AjaxFormComponentUpdatingBehavior {
 
 		private transient AjaxRequestTarget target;
 
-		public static final String ONCHANGE = "onchange";
+		public static final String ONCHANGE = "change";
 
 		public GradingSchemaChangeBehaviour(final String event) {
 			super(event);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsStatisticsPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsStatisticsPanel.html
index 8763de848b05..b9badc4107c5 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsStatisticsPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SettingsStatisticsPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.java
index 1104e9d11f8d..0e55b7faf0f0 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/SortGradeItemsPanel.java
@@ -19,6 +19,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import javax.servlet.http.HttpServletRequest;
 
@@ -27,6 +28,7 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
 import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
+import org.apache.wicket.extensions.markup.html.tabs.ITab;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -59,7 +61,7 @@ public SortGradeItemsPanel(final String id, final IModel<Map<String, Object>> mo
 	public void onInitialize() {
 		super.onInitialize();
 
-		final List tabs = new ArrayList();
+		final List<ITab> tabs = new ArrayList<>();
 
 		final Map<String, Object> model = (Map<String, Object>) getDefaultModelObject();
 		final boolean categoriesEnabled = (boolean) model.get("categoriesEnabled");
@@ -70,7 +72,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				final HttpServletRequest request = (HttpServletRequest) getRequest().getContainerRequest();
 				String[] ids = new String[0];
 				if (request.getParameterValues("id") != null) {
@@ -107,21 +109,18 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 							businessService.updateAssignmentOrder(assignmentId, order);
 						}
 					}
-				} catch (IdUnusedException e) {
-					log.error(e.getMessage(), e);
-					error = true;
-				} catch (PermissionException e) {
+				} catch (IdUnusedException | PermissionException e) {
 					log.error(e.getMessage(), e);
 					error = true;
 				}
 
-				Map<Long, Integer> catUpdates = new HashMap<>();
+                Map<Long, Integer> catUpdates = new HashMap<>();
 
 				for (String id : categoryIds) {
 					String order = request.getParameter(String.format("category_%s[order]", id));
 					String current = request.getParameter(String.format("category_%s[current_order]", id));
 
-					if (current != order) {
+					if (!Objects.equals(current, order)) {
 						catUpdates.put(Long.valueOf(id), Integer.valueOf(order));
 					}
 				}
@@ -169,30 +168,28 @@ public Panel getPanel(final String panelId) {
 			}
 		});
 
-		form.add(new AjaxBootstrapTabbedPanel("tabs", tabs) {
-			@Override
-			protected String getTabContainerCssClass() {
-				return "nav nav-tabs";
-			}
+		form.add(new AjaxBootstrapTabbedPanel<>("tabs", tabs) {
 
 			@Override
-			protected void onAjaxUpdate(final AjaxRequestTarget target) {
+			protected void onAjaxUpdate(Optional<AjaxRequestTarget> targetOptional) {
 				// ensure the submit button reflects the currently selected tab
 				// as form will only submit the status on that tab (not both!)
-				if (getSelectedTab() == 1) {
-					submit.replace(new Label("label", getString("sortgradeitems.submit")));
-					target.add(submit);
-				} else if (getTabs().size() > 1) {
-					submit.replace(new Label("label", getString("sortgradeitems.submitbycategory")));
-					target.add(submit);
-				}
-				super.onAjaxUpdate(target);
+				targetOptional.ifPresent(target -> {
+					if (getSelectedTab() == 1) {
+						submit.replace(new Label("label", getString("sortgradeitems.submit")));
+						target.add(submit);
+					} else if (getTabs().size() > 1) {
+						submit.replace(new Label("label", getString("sortgradeitems.submitbycategory")));
+						target.add(submit);
+					}
+				});
+				super.onAjaxUpdate(targetOptional);
 			}
 		});
 
 		SakaiAjaxButton cancel = new SakaiAjaxButton("cancel") {
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				SortGradeItemsPanel.this.window.close(target);
 			}
 		};
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentAssignmentStatisticsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentAssignmentStatisticsPanel.java
index d1ea3633e27d..7739c8ff281e 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentAssignmentStatisticsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentAssignmentStatisticsPanel.java
@@ -46,8 +46,8 @@ public void onInitialize() {
 		final Assignment assignment = ((Model<Assignment>) getDefaultModel()).getObject();
 
 		StudentAssignmentStatisticsPanel.this.window.setTitle(
-				new StringResourceModel("label.statistics.title.assignment",
-						getDefaultModel(), null, assignment.getName()).getString());
+				new StringResourceModel("label.statistics.title.assignment")
+						.setParameters(assignment.getName()).getString());
 
 		final AssignmentGradeChart chart = new AssignmentGradeChart("chart",
 				assignment.getId(), studentGrade);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentCompareGradesPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentCompareGradesPanel.java
index fac5f162261f..1b7442ab82d0 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentCompareGradesPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentCompareGradesPanel.java
@@ -56,7 +56,7 @@ public void onInitialize() {
             User currentUser = this.businessService.getCurrentUser();
 
             StudentCompareGradesPanel.this.window.setTitle(
-                    new StringResourceModel("comparegrades.modal.title.student.name", null, new Object[] { currentUser.getDisplayName() })
+                    new StringResourceModel("comparegrades.modal.title.student.name").setParameters(currentUser.getDisplayName())
             );
 
             Label gradeItemLabel = new Label("gradeItemLabel", assignment.getName());
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.html
index 546bec19694d..73c50c3cb636 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -29,7 +30,7 @@
 				<div class="modal-dialog">
 					<div class="modal-content">
 						<div class="modal-header">
-							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+							<button type="button" class="close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&#215;</span></button>
 							<h3 class="modal-title"><wicket:message key="label.studentsummary.closeconfirmation.title" /></h3>
 						</div>
 						<div class="modal-body">
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.java
index 965c09e9ded4..cf13fbeb7569 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/StudentGradeSummaryPanel.java
@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
@@ -58,7 +59,7 @@ public void onInitialize() {
 		super.onInitialize();
 
 		// done button
-		add(new GbAjaxLink("done") {
+		add(new GbAjaxLink<>("done") {
 			private static final long serialVersionUID = 1L;
 
 			@Override
@@ -95,26 +96,24 @@ public Panel getPanel(final String panelId) {
 			});
 		}
 
-		add(new AjaxBootstrapTabbedPanel("tabs", tabs) {
-			@Override
-			protected String getTabContainerCssClass() {
-				return "nav nav-tabs";
-			}
+		add(new AjaxBootstrapTabbedPanel<>("tabs", tabs) {
 
-			@Override
-			protected void onAjaxUpdate(final AjaxRequestTarget target) {
-				super.onAjaxUpdate(target);
+            @Override
+			protected void onAjaxUpdate(Optional<AjaxRequestTarget> targetOptional) {
+				super.onAjaxUpdate(targetOptional);
 
-				final boolean showingInstructorView = (getSelectedTab() == 0);
-				final boolean showingStudentView = (getSelectedTab() == 1);
+				targetOptional.ifPresent(target -> {
+					final boolean showingInstructorView = (getSelectedTab() == 0);
+					final boolean showingStudentView = (getSelectedTab() == 1);
 
-				studentNavigation.setVisible(showingInstructorView);
-				target.add(studentNavigation);
+					studentNavigation.setVisible(showingInstructorView);
+					target.add(studentNavigation);
 
-				target.appendJavaScript(
-						String.format("new GradebookGradeSummary($(\"#%s\"), %s);",
-								getParent().getMarkupId(),
-								showingStudentView));
+					target.appendJavaScript(
+							String.format("new GradebookGradeSummary($(\"#%s\"), %s);",
+									getParent().getMarkupId(),
+									showingStudentView));
+				});
 			}
 		});
 	}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.html
index 67d80a472649..3a4b92e2d797 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -16,8 +17,8 @@
       <label tabindex="0" role="menuitem">
         <span wicket:id="category"></span>
         <span class="gb-item-category-filter-signal"></span>
-        <span wicket:id="categorySignal"class="gb-item-filter-signal"></span>
-        <input wicket:id="categoryCheckbox" type="checkbox">
+        <span wicket:id="categorySignal" class="gb-item-filter-signal"></span>
+        <input wicket:id="categoryCheckbox" type="checkbox" />
       </label>
       <div class="btn-group dropend">
         <a class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" wicket:message="title:label.toolbar.categorygroup.menulabel">
@@ -46,7 +47,7 @@
       <label tabindex="0" role="menuitem">
         <span wicket:id="assignmentTitle"></span>
         <span wicket:id="assignmentSignal" class="gb-item-filter-signal"></span>
-        <input wicket:id="assignmentCheckbox" type="checkbox">
+        <input wicket:id="assignmentCheckbox" type="checkbox" />
       </label>
       <div class="btn-group dropend">
         <a class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" wicket:message="title:label.toolbar.gradeitem.menulabel">
@@ -75,7 +76,7 @@
       <label tabindex="0" role="menuitem">
           <span wicket:id="categoryScoreLabel"></span>
           <span  wicket:id="categoryScoreSignal" class="gb-item-filter-signal"></span>
-          <input wicket:id="categoryScoreCheckbox" type="checkbox">
+          <input wicket:id="categoryScoreCheckbox" type="checkbox" />
       </label>
       <div class="btn-group dropend">
           <a class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" href="#" role="button" aria-haspopup="true" wicket:message="title:label.toolbar.categoryaverage.menulabel">
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.java
index 05fbc93e1e64..e4b11fdf01ac 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ToggleGradeItemsToolbarPanel.java
@@ -145,19 +145,19 @@ protected void onUpdate(final AjaxRequestTarget target) {
 				final WebMarkupContainer categoryScoreFilter = new WebMarkupContainer("categoryScore");
 				categoryScoreFilter.setVisible(!StringUtils.equals(categoryName, getString(GradebookPage.UNCATEGORISED)));
 				categoryScoreFilter.add(new Label("categoryScoreLabel",
-						new StringResourceModel("label.toolbar.categoryscorelabel", null, new Object[] { categoryName })));
+						new StringResourceModel("label.toolbar.categoryscorelabel").setParameters(categoryName)));
 
 				categoryScoreFilter.add(new WebMarkupContainer("categoryScoreSignal").add(new AttributeModifier("style",
 						String.format("background-color: %s; border-color: %s", categoryColor, categoryColor))));
 
 				final CheckBox categoryScoreCheckbox = new AjaxCheckBox("categoryScoreCheckbox",
-						new Model<Boolean>(settings.isCategoryScoreVisible(categoryName))) {// Model.of(Boolean.valueOf(settings.isCategoryScoreVisible(category))))
+                        new Model<>(settings.isCategoryScoreVisible(categoryName))) {// Model.of(Boolean.valueOf(settings.isCategoryScoreVisible(category))))
 					// {
 					@Override
 					protected void onUpdate(final AjaxRequestTarget target) {
 						GradebookUiSettings settings = gradebookPage.getUiSettings();
 
-						final Boolean value = settings.isCategoryScoreVisible(categoryName);
+						final boolean value = settings.isCategoryScoreVisible(categoryName);
 						settings.setCategoryScoreVisibility(categoryName, !value);
 
 						gradebookPage.setUiSettings(settings);
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.html b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.html
index eb51af1e4f97..e097154eef2d 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.html
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 
@@ -55,7 +56,7 @@
 					<div class="modal-content">
 						<div class="modal-header">
 							<h5 class="modal-title"><wicket:message key="label.updateungradeditems.confirmation.title" /></h5>
-							<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+							<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"><span aria-hidden="true">&#215;</span></button>
 						</div>
 						<div class="modal-body">
 							<p><wicket:container wicket:id="confirmationMessage"/></p>
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.java
index 3f71534b96ad..de326c0bf68c 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/UpdateUngradedItemsPanel.java
@@ -95,7 +95,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 
 				final GradeOverride override = (GradeOverride) form.getModelObject();
 
@@ -138,7 +138,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				UpdateUngradedItemsPanel.this.window.close(target);
 			}
 		};
@@ -151,8 +151,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			form.add(new Label("points", getString("label.percentage.plain")));
 		} else {
 			form.add(new Label("points",
-					new StringResourceModel("label.studentsummary.outof", null,
-							new Object[] { assignment.getPoints() })));
+					new StringResourceModel("label.studentsummary.outof").setParameters(assignment.getPoints())));
 		}
 
 		final WebMarkupContainer hiddenGradePoints = new WebMarkupContainer("gradePoints");
@@ -195,13 +194,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			}
 			if (!canGradeAllGroups) {
 				// remove the ones that the user can't view
-				final Iterator<GbGroup> iter = groups.iterator();
-				while (iter.hasNext()) {
-					final GbGroup group = iter.next();
-					if (!gradableGroupIds.contains(group.getReference())) {
-						iter.remove();
-					}
-				}
+                groups.removeIf(group -> !gradableGroupIds.contains(group.getReference()));
 			}
 		}
 
@@ -240,8 +233,8 @@ public String getIdValue(final GbGroup g, final int index) {
 		// confirmation dialog
 		add(new Label("confirmationMessage",
 				new StringResourceModel(
-						"label.updateungradeditems.confirmation.general", null,
-						new Object[] { "${score}", "${group}" })).setEscapeModelStrings(false));
+						"label.updateungradeditems.confirmation.general")
+						.setParameters("${score}", "${group}")).setEscapeModelStrings(false));
 	}
 
 	private boolean getExtraCredit(Double grade, Assignment assignment, Integer gradeType) {
@@ -253,16 +246,14 @@ private boolean getExtraCredit(Double grade, Assignment assignment, Integer grad
 	/**
 	 * Model for this form
 	 */
-	class GradeOverride implements Serializable {
+    @Getter
+	@Setter
+    class GradeOverride implements Serializable {
 
 		private static final long serialVersionUID = 1L;
 
-		@Getter
-		@Setter
 		private String grade;
 
-		@Getter
-		@Setter
 		private GbGroup group;
 	}
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ZeroUngradedItemsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ZeroUngradedItemsPanel.java
index e78a8d15efda..f4cb3eb57ec4 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ZeroUngradedItemsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/ZeroUngradedItemsPanel.java
@@ -51,7 +51,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 
 				// fetch all assignments
 				final List<Assignment> assignments = ZeroUngradedItemsPanel.this.businessService.getGradebookAssignments();
@@ -71,7 +71,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				ZeroUngradedItemsPanel.this.window.close(target);
 			}
 		};
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java
index b1adf61c4f2e..7e0d15a1d805 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java
@@ -96,12 +96,12 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onSubmit(final AjaxRequestTarget target) {
 				saveItemAndProceed(true, target, form);
 			}
 
 			@Override
-			protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onError(final AjaxRequestTarget target) {
 				final ImportExportPage page = (ImportExportPage) getPage();
 				page.updateFeedback(target);
 			}
@@ -112,12 +112,12 @@ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				saveItemAndProceed(false, target, form); // OWL
 			}
 
 			@Override
-			protected void onError(final AjaxRequestTarget target, final Form<?> form) {
+			protected void onError(final AjaxRequestTarget target) {
 				final ImportExportPage page = (ImportExportPage) getPage();
 				page.updateFeedback(target);
 			}
@@ -128,7 +128,7 @@ protected void onError(final AjaxRequestTarget target, final Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
+			public void onSubmit(final AjaxRequestTarget target) {
 				// clear any previous errors
 				final ImportExportPage page = (ImportExportPage) getPage();
 				page.clearFeedback();
@@ -141,7 +141,7 @@ public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
 
 		// wrap the form create panel
 		form.add(new Label("createItemHeader",
-				new StringResourceModel("importExport.createItem.heading", this, null, step, importWizardModel.getTotalSteps())));
+				new StringResourceModel("importExport.createItem.heading").setParameters(step, importWizardModel.getTotalSteps())));
 		form.add(new AddOrEditGradeItemPanelContent("subComponents", assignmentModel, UiMode.ADD));
 		this.previewGradesPanel = new PreviewImportedGradesPanel("previewGradesPanel", this.model);
 		form.add(this.previewGradesPanel);
@@ -221,7 +221,7 @@ private void saveItemAndProceed(boolean forward, final AjaxRequestTarget target,
 	 *
 	 * @param assignments
 	 * @param name
-	 * @return
+	 * @return boolean
 	 */
 	private boolean assignmentNameIsUnique(final List<Assignment> assignments, final String name) {
 		return !(assignments
@@ -235,8 +235,7 @@ private boolean assignmentNameIsUnique(final List<Assignment> assignments, final
 	 * Checks if a new assignment's name is unique amongst the list of assignments to be created.
 	 * 
 	 * @param newAssignment
-	 * @param assignmentsToCreate
-	 * @return
+	 * @return boolean
 	 */
 	private boolean assignmentNameIsUnique(final Assignment newAssignment) {
 
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
index e49d73fa6c60..444608fddb14 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/ExportPanel.java
@@ -22,11 +22,11 @@
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.Component;
@@ -38,7 +38,6 @@
 import org.apache.wicket.markup.html.link.DownloadLink;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.util.time.Duration;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.gradebookng.business.model.GbGradeInfo;
 import org.sakaiproject.gradebookng.business.model.GbGroup;
@@ -253,7 +252,7 @@ public Object getDisplayValue(final GbGroup g) {
 			public String getIdValue(final GbGroup g, final int index) {
 				return g.getId();
 			}
-		}).add(new AjaxFormComponentUpdatingBehavior("onchange") {
+		}).add(new AjaxFormComponentUpdatingBehavior("change") {
 			@Override
 			protected void onUpdate(AjaxRequestTarget target) {
 				GbGroup value = (GbGroup) ((DropDownChoice) getComponent()).getDefaultModelObject();
@@ -278,7 +277,7 @@ protected File load() {
 				return buildFile(false);
 			}
 
-		}, buildFileName(false)).setCacheDuration(Duration.NONE).setDeleteAfterDownload(true));
+		}, buildFileName(false)).setCacheDuration(Duration.ZERO).setDeleteAfterDownload(true));
 
 
 		this.customDownloadLink = buildCustomDownloadLink();
@@ -294,7 +293,7 @@ protected File load() {
 				return buildFile(true);
 			}
 
-		}, buildFileName(true)).setCacheDuration(Duration.NONE).setDeleteAfterDownload(true).setOutputMarkupId(true);
+		}, buildFileName(true)).setCacheDuration(Duration.ZERO).setDeleteAfterDownload(true).setOutputMarkupId(true);
 	}
 
 	private File buildFile(final boolean isCustomExport) {
@@ -304,7 +303,7 @@ private File buildFile(final boolean isCustomExport) {
 			tempFile = File.createTempFile("gradebookTemplate", ".csv");
 
 			//CSV separator is comma unless the comma is the decimal separator, then is ;
-			try (OutputStreamWriter fstream = new OutputStreamWriter(new FileOutputStream(tempFile), StandardCharsets.ISO_8859_1.name())){
+			try (OutputStreamWriter fstream = new OutputStreamWriter(new FileOutputStream(tempFile), StandardCharsets.ISO_8859_1)){
 				FormattedText formattedText = ComponentManager.get(FormattedText.class);
 				CSVWriter csvWriter = new CSVWriter(fstream, ".".equals(formattedText.getDecimalSeparator()) ? CSVWriter.DEFAULT_SEPARATOR : CSV_SEMICOLON_SEPARATOR, CSVWriter.DEFAULT_QUOTE_CHARACTER, CSVWriter.DEFAULT_ESCAPE_CHARACTER, CSVWriter.RFC4180_LINE_END);
 				
@@ -532,7 +531,7 @@ private String buildFileName(final boolean customDownload) {
 			fileNameComponents.add(this.group.getTitle());
 		}
 
-		final String cleanFilename = Validator.cleanFilename(fileNameComponents.stream().collect(Collectors.joining("-")));
+		final String cleanFilename = Validator.cleanFilename(String.join("-", fileNameComponents));
 
 		return String.format("%s.%s", cleanFilename, extension);
 	}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java
index 8088255c5ace..43b0422c4e88 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java
@@ -110,7 +110,7 @@ public void onInitialize() {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 
 				// clear any previous errors
 				final ImportExportPage page = (ImportExportPage) getPage();
@@ -140,7 +140,7 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 
 				EventHelper.postImportBeginEvent(getGradebook());
 
@@ -291,7 +291,7 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 				// clear any previous errors
 				final ImportExportPage page = (ImportExportPage) getPage();
 				page.clearFeedback();
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java
index dbabb5236c80..a5b0f580ab51 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java
@@ -20,6 +20,8 @@
 
 import lombok.extern.slf4j.Slf4j;
 
+import org.apache.commons.fileupload.FileUploadBase;
+import org.apache.commons.fileupload.FileUploadException;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -33,8 +35,6 @@
 import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.lang.Bytes;
-import org.apache.wicket.util.upload.FileUploadBase.SizeLimitExceededException;
-import org.apache.wicket.util.upload.FileUploadException;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.gradebookng.business.exception.GbImportExportInvalidFileTypeException;
 import org.sakaiproject.gradebookng.business.model.ImportedSpreadsheetWrapper;
@@ -89,7 +89,7 @@ public UploadForm(final String id) {
 			setMaxSize(Bytes.megabytes(maxUploadFileSize));
 
 			this.fileUploadField = new FileUploadField("upload");
-			this.fileUploadField.add(new AjaxFormSubmitBehavior("onchange") {
+			this.fileUploadField.add(new AjaxFormSubmitBehavior("change") {
 				@Override
 				protected void onSubmit(final AjaxRequestTarget target) {
 					FileUpload file = fileUploadField.getFileUpload();
@@ -125,7 +125,7 @@ protected void onError(AjaxRequestTarget target) {
 
 			this.continueButton = new AjaxButton("continuebutton") {
 				@Override
-				public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+				public void onSubmit(AjaxRequestTarget target) {
 					processUploadedFile(target);
 				}
 			};
@@ -135,7 +135,7 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 
 			final AjaxButton cancel = new AjaxButton("cancelbutton") {
 				@Override
-				public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+				public void onSubmit(AjaxRequestTarget target) {
 					setResponsePage(GradebookPage.class);
 				}
 			};
@@ -145,7 +145,7 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 
 		@Override
 		protected void onFileUploadException(FileUploadException e, Map<String, Object> model) {
-			if (e instanceof SizeLimitExceededException) {
+			if (e instanceof FileUploadBase.SizeLimitExceededException) {
 				error(MessageHelper.getString("importExport.error.fileTooBig", maxUploadFileSize));
 				continueButton.setEnabled(false);
 			}
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportOmissionsPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportOmissionsPanel.java
index db221457ed4a..9608b4204969 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportOmissionsPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportOmissionsPanel.java
@@ -78,9 +78,9 @@ public void onInitialize()
             unknownUsersHeaderMsgKey = "importExport.selection.omissions.unknownUsers.header.plural";
             unknownUsersInfoMsgKey = "importExport.selection.omissions.unknownUsers.info.plural";
         }
-        missingUsersHeader = new Label( "missingUsersHeader", new StringResourceModel( missingUsersHeaderMsgKey, null, numMissingUsers ) );
-        unknownUsersHeader = new Label( "unknownUsersHeader", new StringResourceModel( unknownUsersHeaderMsgKey, null, numUnknownUsers ) );
-        unknownUsersInfo = new Label( "unknownUsersInfo", new StringResourceModel( unknownUsersInfoMsgKey, null, new Object[] {} ) );
+        missingUsersHeader = new Label( "missingUsersHeader", new StringResourceModel( missingUsersHeaderMsgKey ).setParameters( numMissingUsers ) );
+        unknownUsersHeader = new Label( "unknownUsersHeader", new StringResourceModel( unknownUsersHeaderMsgKey ).setParameters( numUnknownUsers ) );
+        unknownUsersInfo = new Label( "unknownUsersInfo", new StringResourceModel( unknownUsersInfoMsgKey ) );
 
         // Missing users accordion and collapse/expand behaviour
         final WebMarkupContainer missingUsersContainer = new WebMarkupContainer( "missingUsersContainer" );
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java
index 339deec5dfce..32e618f06f01 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java
@@ -179,7 +179,7 @@ public void onClick(final AjaxRequestTarget target) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 
 				// clear any previous errors
 				final ImportExportPage page = (ImportExportPage) getPage();
@@ -203,7 +203,7 @@ public void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			protected void onSubmit(AjaxRequestTarget target) {
 
 				// get the items that were selected
 				final List<ProcessedGradeItem> selectedGradeItems = filterListByType(
@@ -275,7 +275,7 @@ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
 			private static final long serialVersionUID = 1L;
 
 			@Override
-			public void onSubmit(AjaxRequestTarget target, Form<?> form) {
+			public void onSubmit(AjaxRequestTarget target) {
 				// clear any previous errors
 				final ImportExportPage page = (ImportExportPage) getPage();
 				page.clearFeedback();
diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/PreviewImportedGradesPanel.java b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/PreviewImportedGradesPanel.java
index a946c0e6a18f..0cf678b8c745 100644
--- a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/PreviewImportedGradesPanel.java
+++ b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/PreviewImportedGradesPanel.java
@@ -55,8 +55,8 @@ public void onInitialize()
         final ProcessedGradeItem processedGradeItem = importWizardModel.getItemsToCreate().get( importWizardModel.getStep() - 1 );
 
         // Create the accordion header
-        final Label previewGradesHeader = new Label( "previewGradesHeader", new StringResourceModel( "importExport.selection.previewGrades.header",
-                null, new Object[] {processedGradeItem.getItemTitle()} ) );
+        final Label previewGradesHeader = new Label( "previewGradesHeader", new StringResourceModel( "importExport.selection.previewGrades.header")
+                .setParameters(processedGradeItem.getItemTitle()) );
 
         // Add the accordion collapse/expand behaviour
         final WebMarkupContainer previewGradesPanel = new WebMarkupContainer( "previewGradesPanel" );
diff --git a/gradebookng/tool/src/webapp/scripts/gradebook-quick-entry.js b/gradebookng/tool/src/webapp/scripts/gradebook-quick-entry.js
index 3f7df9359cdb..8bbf5bb71bac 100644
--- a/gradebookng/tool/src/webapp/scripts/gradebook-quick-entry.js
+++ b/gradebookng/tool/src/webapp/scripts/gradebook-quick-entry.js
@@ -52,4 +52,14 @@ function fillComments(){
 
 function enableUpdate(){
     document.getElementById('quickentrySubmit').removeAttribute('disabled');
-}
\ No newline at end of file
+}
+
+// Any changes and then we allow the instructor to submit
+document.addEventListener('DOMContentLoaded', function() {
+    const form = document.getElementById('gbQuickEntryForm');
+    if (form) {
+        form.addEventListener('change', function(event) {
+            enableUpdate();
+        });
+    }
+});
diff --git a/master/pom.xml b/master/pom.xml
index 0e990d327d95..5bb2ae1cd6bf 100644
--- a/master/pom.xml
+++ b/master/pom.xml
@@ -2229,6 +2229,11 @@
         <artifactId>wicket-tool-8</artifactId>
         <version>${sakai.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.sakaiproject.wicket</groupId>
+        <artifactId>wicket-tool-9</artifactId>
+        <version>${sakai.version}</version>
+      </dependency>
       <!-- JUNIT -->
       <dependency>
         <groupId>junit</groupId>
diff --git a/wicket/pom.xml b/wicket/pom.xml
index 1c742c6bbc9b..b1f538562626 100644
--- a/wicket/pom.xml
+++ b/wicket/pom.xml
@@ -17,6 +17,7 @@
 	<modules>
 		<module>wicket6</module>
 		<module>wicket8</module>
+		<module>wicket9</module>
 	</modules>
 
 </project>
diff --git a/wicket/wicket6/pom.xml b/wicket/wicket6/pom.xml
index 6197e80797e3..4c81504895fc 100644
--- a/wicket/wicket6/pom.xml
+++ b/wicket/wicket6/pom.xml
@@ -36,6 +36,6 @@
 			<groupId>org.sakaiproject.portal</groupId>
 			<artifactId>sakai-portal-util</artifactId>
 		</dependency>
-	</dependencies>
+    </dependencies>
 
 </project>
diff --git a/wicket/wicket9/pom.xml b/wicket/wicket9/pom.xml
new file mode 100644
index 000000000000..4b116a7fef76
--- /dev/null
+++ b/wicket/wicket9/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.sakaiproject.wicket</groupId>
+		<artifactId>wicket-tool-base</artifactId>
+		<version>25-SNAPSHOT</version>
+	</parent>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<wicket9.version>9.17.0</wicket9.version>
+	</properties>
+
+	<name>Sakai Wicket 9 Tool</name>
+	<groupId>org.sakaiproject.wicket</groupId>
+	<artifactId>wicket-tool-9</artifactId>
+	<packaging>jar</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.wicket</groupId>
+			<artifactId>wicket-core</artifactId>
+			<version>9.17.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.kernel</groupId>
+			<artifactId>sakai-kernel-api</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.kernel</groupId>
+			<artifactId>sakai-kernel-util</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.sakaiproject.portal</groupId>
+			<artifactId>sakai-portal-util</artifactId>
+		</dependency>
+	</dependencies>
+
+</project>
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/AbstractSakaiSpinnerAjaxCallListener.java b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/AbstractSakaiSpinnerAjaxCallListener.java
new file mode 100644
index 000000000000..c76abec6b5ca
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/AbstractSakaiSpinnerAjaxCallListener.java
@@ -0,0 +1,44 @@
+/**
+ * Copyright (c) 2006-2021 The Apereo Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://opensource.org/licenses/ecl2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sakaiproject.wicket.component;
+
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+
+/**
+ * Abstract base class for AjaxCallListeners used to apply a spinner overlay to the component while Ajax call in progress
+ * @author plukasew
+ */
+public abstract class AbstractSakaiSpinnerAjaxCallListener extends AjaxCallListener
+{
+	private static final long serialVersionUID = 1L;
+	protected static final String SPINNER_CLASS = "spinButton";
+	protected static final String DISABLED = "$('#%s').prop('disabled', true);";
+	protected static final String ENABLED = "$('#%s').prop('disabled', false);";
+
+	protected boolean willRender = false;
+	protected String id = "";
+
+	/**
+	 * Call listener to overlay a spinner and disable the a clicked component
+	 * @param componentMarkupId the markup id for the component
+	 * @param componentWillRender whether or not the component will be re-rendered as a result of the ajax update
+	 */
+	public AbstractSakaiSpinnerAjaxCallListener(String componentMarkupId, boolean componentWillRender)
+	{
+		id = componentMarkupId;
+		willRender = componentWillRender;
+	}
+}
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiAjaxButton.java b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiAjaxButton.java
new file mode 100644
index 000000000000..0a69e53c34a9
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiAjaxButton.java
@@ -0,0 +1,62 @@
+/**
+ * Copyright (c) 2006-2021 The Apereo Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://opensource.org/licenses/ecl2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sakaiproject.wicket.component;
+
+import org.apache.wicket.ajax.AjaxChannel;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+
+/**
+ * Disables the button on click, sets the standard Sakai spinner on it, and removes it/re-enables the button after the Ajax call completes.
+ *
+ * @author plukasew
+ */
+public class SakaiAjaxButton extends AjaxButton
+{
+	private static final long serialVersionUID = 1L;
+	protected boolean willRenderOnClick = false;
+
+	public SakaiAjaxButton(String id) {
+		super(id);
+	}
+
+	public SakaiAjaxButton(String id, Form<?> form) {
+		super(id, form);
+	}
+
+	/**
+	 * Whether or not the button itself will be re-rendered as part of the ajax update
+	 * @param value true if button will be re-rendered
+	 * @return the button, for method chaining
+	 */
+	public SakaiAjaxButton setWillRenderOnClick(boolean value)
+	{
+		willRenderOnClick = value;
+		return this;
+	}
+
+	@Override
+	protected void updateAjaxAttributes(AjaxRequestAttributes attributes)
+	{
+		super.updateAjaxAttributes(attributes);
+		attributes.setChannel(new AjaxChannel("blocking", AjaxChannel.Type.ACTIVE));
+
+		AjaxCallListener listener = new SakaiSpinnerAjaxCallListener(getMarkupId(), willRenderOnClick);
+		attributes.getAjaxCallListeners().add(listener);
+	}
+}
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.java b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.java
new file mode 100644
index 000000000000..dc06d18d49ef
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.java
@@ -0,0 +1,176 @@
+/**
+ * Copyright (c) 2006-2020 The Apereo Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://opensource.org/licenses/ecl2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sakaiproject.wicket.component;
+
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.Locale;
+import java.util.Objects;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.util.convert.ConversionException;
+import org.apache.wicket.util.convert.IConverter;
+import org.sakaiproject.portal.util.PortalUtils;
+import org.sakaiproject.util.DateFormatterUtil;
+
+/**
+ * A TextField equipped with a standard Sakai datepicker.
+ * 
+ * This component adds the jquery-ui and lang-datepicker scripts to the page by default,
+ * so they do not need to be added separately. If you know JQuery UI is already loaded on the page,
+ * call setLoadJQueryUI(false).
+ *
+ * JQuery is also required but is assumed to already be loaded on the page.
+ *
+ * @author plukasew
+ */
+public class SakaiDateTimeField extends TextField<ZonedDateTime>
+{
+	private static final String DATEPICKERSCRIPT = "/library/js/lang-datepicker/lang-datepicker.js%s";
+	private static final String JQUERYUISCRIPT = "/library/webjars/jquery-ui/1.12.1/jquery-ui.min.js%s";
+
+	private SakaiIsoDateConverter dateConverter;
+	private static final String DATEPICKER_FORMAT = "yyyy-MM-dd HH:mm:ss";
+	private static final String DATEPICKER_FORMAT_DATE_ONLY = "yyyy-MM-dd";
+
+	private boolean useTime = true, allowEmptyDate = true, loadJQueryUI = true;
+	private final ZoneId zoneId;
+
+	/**
+	 * @param id wicket id
+	 * @param model a ZonedDateTime. Can be null if no time is set.
+	 * @param timeZoneId timezone for this time, cannot be null. Should match the model's timezone, if model is non-null.
+	 */
+	public SakaiDateTimeField(String id, IModel<ZonedDateTime> model, ZoneId timeZoneId)
+	{
+		super(id, model);
+		Objects.requireNonNull(timeZoneId);
+		zoneId = timeZoneId;
+	}
+
+	@Override
+	protected void onInitialize()
+	{
+		super.onInitialize();
+
+		setOutputMarkupId(true);
+		dateConverter = new SakaiIsoDateConverter(getMarkupId());
+
+		add(AttributeModifier.append("class", "sakai-datetimefield"));
+	}
+
+	@Override
+	public <C> IConverter<C> getConverter(Class<C> type)
+	{
+		return ZonedDateTime.class.isAssignableFrom(type) ? (IConverter<C>) dateConverter : super.getConverter(type);
+	}
+
+	@Override
+	public void renderHead(IHeaderResponse response)
+	{
+		super.renderHead(response);
+
+		final String version = PortalUtils.getCDNQuery();
+		if (loadJQueryUI)
+		{
+			response.render(JavaScriptHeaderItem.forUrl(String.format(JQUERYUISCRIPT, version)));
+		}
+		response.render(JavaScriptHeaderItem.forUrl(String.format(DATEPICKERSCRIPT, version)));
+		String pattern = useTime ? DATEPICKER_FORMAT : DATEPICKER_FORMAT_DATE_ONLY;
+		String formattedDate = getModelObject() == null ? "" : getModelObject().format(DateTimeFormatter.ofPattern(pattern, getSession().getLocale()));
+		String script = String.format("SDP.initSakaiDatePicker('%s','%s', %b, %b);", getMarkupId(), formattedDate, useTime, allowEmptyDate);
+		response.render(OnDomReadyHeaderItem.forScript(script));
+	}
+
+	/**
+	 * Sets whether to include a time component in the display of the text field and date picker. Defaults to true.
+	 * @param value true if using time
+	 * @return this, for method chaining
+	 */
+	public SakaiDateTimeField setUseTime(boolean value)
+	{
+		useTime = value;
+		return this;
+	}
+
+	/**
+	 * Sets whether to allow fields to have no date set. Defaults to true.
+	 * @param value true if empty dates are allowed
+	 * @return this, for method chaining
+	 */
+	public SakaiDateTimeField setAllowEmptyDate(boolean value)
+	{
+		allowEmptyDate = value;
+		return this;
+	}
+
+	/**
+	 * Sets whether to have the component load the JQueryUI dependency on the page. Defaults to true.
+	 * @param value true if JQueryUI should be loaded by this component
+	 * @return this, for method chaining
+	 */
+	public SakaiDateTimeField setLoadJQueryUI(boolean value)
+	{
+		loadJQueryUI = value;
+		return this;
+	}
+
+	/**
+	 * Custom converter to parse the hidden ISO date string from lang-datepicker.js and return a ZonedDateTime
+	 */
+	private class SakaiIsoDateConverter implements IConverter<ZonedDateTime>
+	{
+		private final String componentMarkupId;
+
+		public SakaiIsoDateConverter(String componentMarkupId)
+		{
+			this.componentMarkupId = componentMarkupId;
+		}
+
+		@Override
+		public ZonedDateTime convertToObject(String string, Locale locale) throws ConversionException
+		{
+			// ignore actual input string and read in iso date from hidden input instead
+			String isoParam = componentMarkupId + "ISO8601";
+			String isoDateStr = getRequest().getRequestParameters().getParameterValue(isoParam).toString("");
+			// format is like '2017-12-03T10:15:30-04:00'
+			if (!DateFormatterUtil.isValidISODate(isoDateStr))
+			{
+				throw new ConversionException("Invalid ISO date: " + isoDateStr).setResourceKey("sakaidatetimefield.error.dateformat");
+			}
+
+			// The string we get back from the datepicker has an offset which may or may not match the desired timezone.
+			// Since the user cannot change the timezone using the datepicker, we just ignore the datepicker-provided offset
+			// and set the timezone from the stored zone.
+			LocalDateTime local = LocalDateTime.parse(isoDateStr, DateTimeFormatter.ISO_OFFSET_DATE_TIME);
+			return ZonedDateTime.of(local, zoneId);
+		}
+
+		@Override
+		public String convertToString(ZonedDateTime c, Locale locale)
+		{
+			// ignore model date, it will be set via javascript on page load
+			return "";
+		}
+
+	}
+}
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.properties
new file mode 100644
index 000000000000..d7ac8ac2fc2a
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField.properties
@@ -0,0 +1,2 @@
+sakaidatetimefield.error.dateformat = The date is not in the correct format, please use the date picker.
+
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ar.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ar.properties
new file mode 100644
index 000000000000..1db3f09d8b16
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ar.properties
@@ -0,0 +1 @@
+sakaidatetimefield.error.dateformat=\u0627\u0644\u062a\u0627\u0631\u064a\u062e \u0644\u064a\u0633 \u0628\u0627\u0644\u062a\u0646\u0633\u064a\u0642 \u0627\u0644\u0635\u062d\u064a\u062d \u060c \u064a\u0631\u062c\u0649 \u0627\u0633\u062a\u062e\u062f\u0627\u0645 \u0645\u0646\u062a\u0642\u064a \u0627\u0644\u062a\u0627\u0631\u064a\u062e.
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_bg.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_bg.properties
new file mode 100644
index 000000000000..d343c62e83a3
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_bg.properties
@@ -0,0 +1 @@
+sakaidatetimefield.error.dateformat=\u0414\u0430\u0442\u0430\u0442\u0430 \u043d\u0435 \u0435 \u0432 \u043f\u0440\u0430\u0432\u0438\u043b\u043d\u0438\u044f \u0444\u043e\u0440\u043c\u0430\u0442, \u043c\u043e\u043b\u044f, \u0438\u0437\u043f\u043e\u043b\u0437\u0432\u0430\u0439\u0442\u0435 \u0438\u043d\u0441\u0442\u0440\u0443\u043c\u0435\u043d\u0442\u0430 \u0437\u0430 \u0438\u0437\u0431\u043e\u0440 \u043d\u0430 \u0434\u0430\u0442\u0430.
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ca.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ca.properties
new file mode 100644
index 000000000000..330f516bb88b
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ca.properties
@@ -0,0 +1,2 @@
+sakaidatetimefield.error.dateformat=La data no t\u00e9 el format correcte, per corregir-lo useu el selector de dates.
+
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_es.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_es.properties
new file mode 100644
index 000000000000..bd88e7b6472e
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_es.properties
@@ -0,0 +1,2 @@
+sakaidatetimefield.error.dateformat=La fecha no tiene el formato correcto, pruebe otra vez con el selector.
+
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_eu.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_eu.properties
new file mode 100644
index 000000000000..cb42de247b42
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_eu.properties
@@ -0,0 +1,2 @@
+sakaidatetimefield.error.dateformat=Datak ez du ongi formatua, hobeto hautagailua erabili.
+
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ro_RO.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ro_RO.properties
new file mode 100644
index 000000000000..532f71e442de
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_ro_RO.properties
@@ -0,0 +1 @@
+sakaidatetimefield.error.dateformat=Data nu este in formatul corect, te rog utilizeaza "selectorul de data"
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_sr.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_sr.properties
new file mode 100644
index 000000000000..b5fc342dbaef
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_sr.properties
@@ -0,0 +1 @@
+sakaidatetimefield.error.dateformat=Datum nije u ispravnom formatu, stoga koristi biranje formata datuma.
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_tr_TR.properties b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_tr_TR.properties
new file mode 100644
index 000000000000..4faaeb4336af
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiDateTimeField_tr_TR.properties
@@ -0,0 +1 @@
+sakaidatetimefield.error.dateformat=Tarih do\u011fru bi\u00e7imde de\u011fil, l\u00fctfen tarih se\u00e7iciyi kullan\u0131n.
diff --git a/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiSpinnerAjaxCallListener.java b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiSpinnerAjaxCallListener.java
new file mode 100644
index 000000000000..ef52f5c686cf
--- /dev/null
+++ b/wicket/wicket9/src/java/org/sakaiproject/wicket/component/SakaiSpinnerAjaxCallListener.java
@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2006-2021 The Apereo Foundation
+ *
+ * Licensed under the Educational Community License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             http://opensource.org/licenses/ecl2
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.sakaiproject.wicket.component;
+
+/**
+ * Adds the Sakai overlay spinner to the component making the Ajax call
+ * @author plukasew
+ */
+public class SakaiSpinnerAjaxCallListener extends AbstractSakaiSpinnerAjaxCallListener
+{
+	private static final long serialVersionUID = 1L;
+	private static final String SPIN = "$('#%s').addClass('" + SPINNER_CLASS + "');";
+	private static final String STOP = "$('#%s').removeClass('" + SPINNER_CLASS + "');";
+	private static final String DISABLE_AND_SPIN = DISABLED + SPIN;
+	private static final String ENABLE_AND_STOP = ENABLED + STOP;
+
+	/**
+	 * Constructor
+	 * @param componentMarkupId the markup id of the component making the ajax call
+	 */
+	public SakaiSpinnerAjaxCallListener(String componentMarkupId)
+	{
+		this(componentMarkupId, false);
+	}
+
+	/**
+	 * Constructor
+	 * @param componentMarkupId the markup id of the component making the ajax call
+	 * @param componentWillRender whether the ajax call will result in the component being re-rendered
+	 */
+	public SakaiSpinnerAjaxCallListener(String componentMarkupId, boolean componentWillRender)
+	{
+		super(componentMarkupId, componentWillRender);
+
+		// on the client side, disable the control and show the spinner after click
+		onBefore(String.format(DISABLE_AND_SPIN, id, id));
+
+		// if the control is re-rendered the disabled property will be set by wicket and the spinner
+		// class will not be on the component as wicket doesn't know about it
+		if (!willRender)
+		{
+			onComplete(String.format(ENABLE_AND_STOP, id, id));
+		}
+	}
+}