diff --git a/code/controller/SubsiteXHRController.php b/code/controller/SubsiteXHRController.php
index f4a3adb..c758d53 100644
--- a/code/controller/SubsiteXHRController.php
+++ b/code/controller/SubsiteXHRController.php
@@ -3,6 +3,7 @@
 namespace SilverStripe\Subsites\Controller;
 
 use SilverStripe\Admin\LeftAndMain;
+use SilverStripe\Security\Member;
 use SilverStripe\Security\Permission;
 use SilverStripe\Subsites\Model\Subsite;
 
@@ -17,7 +18,7 @@ class SubsiteXHRController extends LeftAndMain
 
     /**
      * Relax the access permissions, so anyone who has access to any CMS subsite can access this controller.
-     * @param null $member
+     * @param Member|null $member
      * @return bool
      */
     public function canView($member = null)
@@ -62,6 +63,6 @@ class SubsiteXHRController extends LeftAndMain
      */
     public function SubsiteList()
     {
-        return $this->renderWith('Includes/SubsiteList');
+        return $this->renderWith(['type' => 'Includes', self::class . '_subsitelist']);
     }
 }
diff --git a/templates/Includes/GridFieldAddFromTemplateButton.ss b/templates/Includes/GridFieldAddFromTemplateButton.ss
deleted file mode 100644
index c89dfb3..0000000
--- a/templates/Includes/GridFieldAddFromTemplateButton.ss
+++ /dev/null
@@ -1 +0,0 @@
-<a href="$NewFromTemplateLink" class="action ss-ui-action-constructive ss-ui-button ui-button ui-widget ui-state-default ui-corner-all new new-link" data-icon="add"><% _t('GridFieldAddFromTemplateButton.AddFromTemplate', 'Add New from Template') %></a>
\ No newline at end of file
diff --git a/templates/LeftAndMain_Menu.ss b/templates/LeftAndMain_Menu.ss
deleted file mode 100644
index 9eeec85..0000000
--- a/templates/LeftAndMain_Menu.ss
+++ /dev/null
@@ -1,45 +0,0 @@
-<div class="cms-menu cms-panel cms-panel-layout west" id="cms-menu" data-layout-type="border">
-	<div class="cms-logo-header north">
-		<div class="cms-logo">
-			<a href="$ApplicationLink" target="_blank" title="$ApplicationName (Version - $CMSVersion)">
-				$ApplicationName <% if $CMSVersion %><abbr class="version">$CMSVersion</abbr><% end_if %>
-			</a>
-			<span><% if $SiteConfig %>$SiteConfig.Title<% else %>$ApplicationName<% end_if %></span>
-		</div>
-
-		<div class="cms-login-status">
-			<a href="$LogoutURL" class="logout-link font-icon-logout" title="<%t LeftAndMain_Menu_ss.LOGOUT 'Log out' %>"></a>
-			<% with $CurrentMember %>
-				<span>
-					<%t LeftAndMain_Menu_ss.Hello 'Hi' %>
-					<a href="{$AbsoluteBaseURL}admin/myprofile" class="profile-link">
-						<% if $FirstName && $Surname %>$FirstName $Surname<% else_if $FirstName %>$FirstName<% else %>$Email<% end_if %>
-					</a>
-				</span>
-			<% end_with %>
-		</div>
-		<% if $ListSubsites %>
-			<% include SubsiteList %>
-		<% end_if %>
-	</div>
-
-	<div class="cms-panel-content center">
-		<ul class="cms-menu-list">
-		<% loop $MainMenu %>
-			<li class="$LinkingMode $FirstLast <% if $LinkingMode == 'link' %><% else %>opened<% end_if %>" id="Menu-$Code" title="$Title.ATT">
-				<a href="$Link" $AttributesHTML>
-					<span class="icon icon-16 icon-{$Code.LowerCase}">&nbsp;</span>
-					<span class="text">$Title</span>
-				</a>
-			</li>
-		<% end_loop %>
-		</ul>
-	</div>
-
-	<div class="cms-panel-toggle south">
-		<button class="sticky-toggle" type="button" title="Sticky nav">Sticky nav</button>
-		<span class="sticky-status-indicator">auto</span>
-		<a class="toggle-expand" href="#"><span>&raquo;</span></a>
-		<a class="toggle-collapse" href="#"><span>&laquo;</span></a>
-	</div>
-</div>
diff --git a/templates/SilverStripe/Admin/LeftAndMain_Menu.ss b/templates/SilverStripe/Admin/LeftAndMain_Menu.ss
index 86ad94e..f409d21 100644
--- a/templates/SilverStripe/Admin/LeftAndMain_Menu.ss
+++ b/templates/SilverStripe/Admin/LeftAndMain_Menu.ss
@@ -6,7 +6,7 @@
         <% include SilverStripe\\Admin\\LeftAndMain_MenuStatus %>
 
         <% if $ListSubsites %>
-            <% include SubsiteList %>
+            <% include SilverStripe\\Subsites\\Controller\\SubsiteXHRController_subsitelist %>
         <% end_if %>
     </div>
 
diff --git a/templates/Includes/SubsiteList.ss b/templates/SilverStripe/Subsites/Controller/Includes/SubsiteXHRController_subsitelist.ss
similarity index 100%
rename from templates/Includes/SubsiteList.ss
rename to templates/SilverStripe/Subsites/Controller/Includes/SubsiteXHRController_subsitelist.ss