diff --git a/bower.json b/bower.json
index aa367ce..6f1ea89 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "adapt-close",
   "version": "2.2.0",
-  "framework": ">=5.30.2",
+  "framework": ">=5.30.3",
   "extension": "close",
   "displayName": "Close",
   "description": "An extension to add a close button and/or prompts",
diff --git a/js/CloseNavigationButtonView.js b/js/CloseNavigationButtonView.js
index c34ea45..7334300 100644
--- a/js/CloseNavigationButtonView.js
+++ b/js/CloseNavigationButtonView.js
@@ -48,7 +48,7 @@ export default class CloseNavigationButtonView extends NavigationButtonView {
       this.model.get('_notifyPromptIfIncomplete') :
       this.model.get('_notifyPromptIfComplete');
 
-    if (!prompt || !prompt._isEnabled) return Adapt.trigger('close:confirm');
+    if (!prompt?._isEnabled) return Adapt.trigger('close:confirm');
 
     notify.prompt({
       title: prompt.title,
diff --git a/package.json b/package.json
index aa367ce..6f1ea89 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "adapt-close",
   "version": "2.2.0",
-  "framework": ">=5.30.2",
+  "framework": ">=5.30.3",
   "extension": "close",
   "displayName": "Close",
   "description": "An extension to add a close button and/or prompts",
diff --git a/templates/CloseNavigationButton.jsx b/templates/CloseNavigationButton.jsx
new file mode 100644
index 0000000..41d04b5
--- /dev/null
+++ b/templates/CloseNavigationButton.jsx
@@ -0,0 +1,25 @@
+import React from 'react';
+import { classes, compile } from 'core/js/reactHelpers';
+
+export default function CloseNavigationButton(props) {
+  const {
+    text,
+    _iconClasses
+  } = props;
+  return (
+    <>
+      <span
+        className={classes([
+          'icon',
+          _iconClasses
+        ])}
+        aria-hidden="true"
+      />
+      <span
+        className="nav__btn-label"
+        aria-hidden="true"
+        dangerouslySetInnerHTML={{ __html: compile(text, props) }}
+      />
+    </>
+  );
+}