diff --git a/wagtailmenus/menuadmin.py b/wagtailmenus/menuadmin.py
index 8a19541c0..e52bf08df 100644
--- a/wagtailmenus/menuadmin.py
+++ b/wagtailmenus/menuadmin.py
@@ -87,10 +87,9 @@ class MainMenuAdmin(SnippetViewSet):
     index_view_class = MainMenuIndexView
 
     edit_view_class = MainMenuEditView
+    edit_template_name = "wagtailmenus/mainmenu_edit.html"
     if WAGTAIL_VERSION < (6, 3):
-        edit_template_name = "wagtailmenus/mainmenu_edit.html"
-    else:
-        edit_template_name = "wagtailmenus/wagtail_63/mainmenu_edit.html"
+        edit_template_name = "wagtailmenus/wagtail_before_63/mainmenu_edit.html"
     error_message = _("The menu could not be saved due to errors.")
 
     copy_view_enabled = False
diff --git a/wagtailmenus/templates/wagtailmenus/includes/header_with_site_switcher.html b/wagtailmenus/templates/wagtailmenus/includes/header_with_site_switcher.html
index 1f30973a0..d8481abf1 100644
--- a/wagtailmenus/templates/wagtailmenus/includes/header_with_site_switcher.html
+++ b/wagtailmenus/templates/wagtailmenus/includes/header_with_site_switcher.html
@@ -1,12 +1,12 @@
-{% extends 'wagtailmenus/includes/header.html' %}
-
-{% block right_content %}
-    {% if site_switcher %}
-        <form method="get" id="settings-site-switch">
-            <label for="{{ site_switcher.site.id_for_label }}">
-                Site:
-            </label>
-            {{ site_switcher.site }}
-        </form>
-    {% endif %}  
-{% endblock %}
+{% if site_switcher %}
+<div class="w-field__wrapper " data-field-wrapper="">
+    <form method="get" id="settings-site-switch">
+        <label class="w-field__label" for="{{ site_switcher.site.id_for_label }}" id="{{ site_switcher.site.id_for_label }}-label">
+            Site: <span class="w-required-mark">*</span>
+        </label>
+        <div class="w-field__input" data-field-input="">
+        {{ site_switcher.site }}
+        </div>
+    </form>
+</div>
+{% endif %}
diff --git a/wagtailmenus/templates/wagtailmenus/mainmenu_edit.html b/wagtailmenus/templates/wagtailmenus/mainmenu_edit.html
index cccaa7a16..3b1fb328a 100644
--- a/wagtailmenus/templates/wagtailmenus/mainmenu_edit.html
+++ b/wagtailmenus/templates/wagtailmenus/mainmenu_edit.html
@@ -1,34 +1,11 @@
-{% extends "wagtailadmin/base.html" %}
+{% extends "wagtailadmin/generic/edit.html" %}
 {% load wagtailadmin_tags i18n %}
 {% block titletag %}{% blocktrans trimmed with snippet_type_name=model_opts.verbose_name %}Editing {{ snippet_type_name }} - {{ object }}{% endblocktrans %}{% endblock %}
 {% block bodyclass %}{% if locked_for_user %}content-locked{% endif %}{% endblock %}
-{% block content %}
-    {% include 'wagtailadmin/shared/headers/slim_header.html' %}
 
+{% block main_content %}
     {% include "wagtailmenus/includes/header_with_site_switcher.html" with title=object icon=header_icon merged=1 %}
-
-    <div class="row row-flush">
-
-        <div class="{% if uc_enabled %}col10 divider-after{% else %}col12{% endif %}">
-            <form action="{{ action_url }}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %} data-edit-form>
-                {% csrf_token %}
-                <div class="nice-padding">
-                    {{ panel.render_form_content }}
-                </div>
-                <footer class="footer">
-                    <nav aria-label="{% trans 'Actions' %}">
-                        <ul>
-                            <li class="actions actions--primary footer__container">
-                                <div class="dropdown dropup dropdown-button match-width {% if view.view_name == 'revisions_revert' %}warning{% endif %}">
-                                    {{ action_menu.render_html }}
-                                </div>
-                            </li>
-                        </ul>
-                    </nav>
-                </footer>
-            </form>
-        </div>
-    </div>
+    {{ block.super }}
 {% endblock %}
 
 {% block extra_css %}
diff --git a/wagtailmenus/templates/wagtailmenus/wagtail_63/includes/header_with_site_switcher.html b/wagtailmenus/templates/wagtailmenus/wagtail_63/includes/header_with_site_switcher.html
deleted file mode 100644
index d8481abf1..000000000
--- a/wagtailmenus/templates/wagtailmenus/wagtail_63/includes/header_with_site_switcher.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% if site_switcher %}
-<div class="w-field__wrapper " data-field-wrapper="">
-    <form method="get" id="settings-site-switch">
-        <label class="w-field__label" for="{{ site_switcher.site.id_for_label }}" id="{{ site_switcher.site.id_for_label }}-label">
-            Site: <span class="w-required-mark">*</span>
-        </label>
-        <div class="w-field__input" data-field-input="">
-        {{ site_switcher.site }}
-        </div>
-    </form>
-</div>
-{% endif %}
diff --git a/wagtailmenus/templates/wagtailmenus/wagtail_63/mainmenu_edit.html b/wagtailmenus/templates/wagtailmenus/wagtail_63/mainmenu_edit.html
deleted file mode 100644
index be7fb5144..000000000
--- a/wagtailmenus/templates/wagtailmenus/wagtail_63/mainmenu_edit.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "wagtailadmin/generic/edit.html" %}
-{% load wagtailadmin_tags i18n %}
-{% block titletag %}{% blocktrans trimmed with snippet_type_name=model_opts.verbose_name %}Editing {{ snippet_type_name }} - {{ object }}{% endblocktrans %}{% endblock %}
-{% block bodyclass %}{% if locked_for_user %}content-locked{% endif %}{% endblock %}
-
-{% block main_content %}
-    {% include "wagtailmenus/wagtail_63/includes/header_with_site_switcher.html" with title=object icon=header_icon merged=1 %}
-    {{ block.super }}
-{% endblock %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {{ media.css }}
-    {{ view.media.css }}
-{% endblock %}
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ media.js }}
-    {{ view.media.js }}
-
-    <script>
-        // Set wagtailConfig.ACTIVE_CONTENT_LOCALE if this is a translated page
-        // This value may be used by JS widgets on the form
-        {% if locale %}
-            window.wagtailConfig = window.wagtailConfig || {};
-            window.wagtailConfig.ACTIVE_CONTENT_LOCALE = '{{ locale.language_code|escapejs }}';
-        {% endif %}
-    </script>
-
-    {% if workflow_enabled %}
-        {% include "wagtailadmin/shared/_workflow_init.html" %}
-    {% endif %}
-{% endblock %}
diff --git a/wagtailmenus/templates/wagtailmenus/wagtail_before_63/includes/header_with_site_switcher.html b/wagtailmenus/templates/wagtailmenus/wagtail_before_63/includes/header_with_site_switcher.html
new file mode 100644
index 000000000..1f30973a0
--- /dev/null
+++ b/wagtailmenus/templates/wagtailmenus/wagtail_before_63/includes/header_with_site_switcher.html
@@ -0,0 +1,12 @@
+{% extends 'wagtailmenus/includes/header.html' %}
+
+{% block right_content %}
+    {% if site_switcher %}
+        <form method="get" id="settings-site-switch">
+            <label for="{{ site_switcher.site.id_for_label }}">
+                Site:
+            </label>
+            {{ site_switcher.site }}
+        </form>
+    {% endif %}  
+{% endblock %}
diff --git a/wagtailmenus/templates/wagtailmenus/wagtail_before_63/mainmenu_edit.html b/wagtailmenus/templates/wagtailmenus/wagtail_before_63/mainmenu_edit.html
new file mode 100644
index 000000000..acc6e7eb4
--- /dev/null
+++ b/wagtailmenus/templates/wagtailmenus/wagtail_before_63/mainmenu_edit.html
@@ -0,0 +1,57 @@
+{% extends "wagtailadmin/base.html" %}
+{% load wagtailadmin_tags i18n %}
+{% block titletag %}{% blocktrans trimmed with snippet_type_name=model_opts.verbose_name %}Editing {{ snippet_type_name }} - {{ object }}{% endblocktrans %}{% endblock %}
+{% block bodyclass %}{% if locked_for_user %}content-locked{% endif %}{% endblock %}
+{% block content %}
+    {% include 'wagtailadmin/shared/headers/slim_header.html' %}
+
+    {% include "wagtailmenus/wagtail_before_63/includes/header_with_site_switcher.html" with title=object icon=header_icon merged=1 %}
+
+    <div class="row row-flush">
+
+        <div class="{% if uc_enabled %}col10 divider-after{% else %}col12{% endif %}">
+            <form action="{{ action_url }}" method="POST" novalidate{% if form.is_multipart %} enctype="multipart/form-data"{% endif %} data-edit-form>
+                {% csrf_token %}
+                <div class="nice-padding">
+                    {{ panel.render_form_content }}
+                </div>
+                <footer class="footer">
+                    <nav aria-label="{% trans 'Actions' %}">
+                        <ul>
+                            <li class="actions actions--primary footer__container">
+                                <div class="dropdown dropup dropdown-button match-width {% if view.view_name == 'revisions_revert' %}warning{% endif %}">
+                                    {{ action_menu.render_html }}
+                                </div>
+                            </li>
+                        </ul>
+                    </nav>
+                </footer>
+            </form>
+        </div>
+    </div>
+{% endblock %}
+
+{% block extra_css %}
+    {{ block.super }}
+    {{ media.css }}
+    {{ view.media.css }}
+{% endblock %}
+{% block extra_js %}
+    {{ block.super }}
+    {% include "wagtailadmin/pages/_editor_js.html" %}
+    {{ media.js }}
+    {{ view.media.js }}
+
+    <script>
+        // Set wagtailConfig.ACTIVE_CONTENT_LOCALE if this is a translated page
+        // This value may be used by JS widgets on the form
+        {% if locale %}
+            window.wagtailConfig = window.wagtailConfig || {};
+            window.wagtailConfig.ACTIVE_CONTENT_LOCALE = '{{ locale.language_code|escapejs }}';
+        {% endif %}
+    </script>
+
+    {% if workflow_enabled %}
+        {% include "wagtailadmin/shared/_workflow_init.html" %}
+    {% endif %}
+{% endblock %}