diff --git a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
index 20dd472d764da95880c96994714ee71d77492d72..d0f0497227f321373deb5d40303e5e1b00e440e1 100644
--- a/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
+++ b/src/main/resources/META-INF/xnat/spawner/site-admin-elements.yaml
@@ -726,7 +726,7 @@ themeManagement:
                     label: None
                     value: None
             after:
-                - "<span style=\"position: relative; top: -49px;left: 270px;\"> <!-- &nbsp;<button id=\"submitThemeButton\" onclick=\"setTheme();\">Set Theme</button>&nbsp;&nbsp; --> <button id=\"removeThemeButton\" onclick=\"removeTheme();\">Remove Theme</button></span>"
+                - "<span style=\"position: relative; top: -78px;left: 270px;\"> <!-- &nbsp;<button id=\"submitThemeButton\" onclick=\"setTheme();\">Set Theme</button>&nbsp;&nbsp; --> <button id=\"removeThemeButton\" onclick=\"removeTheme();\">Remove Theme</button></span>"
             element:
                 style:
                     min-width: 250px
diff --git a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
index 568292b23da2691f1c60abc8bf89db6da8be44ad..a0be9f8c700c6efbd882a264cd5200207900f1bd 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_projectData/xnat_projectData_bundle_tabs.vm
@@ -1,4 +1,7 @@
-#parse($turbineUtils.getTemplateName("_bundle_header","xnat:projectData",$project.getId()))
+#set($path = "screens/xnat_projectData/xnat_projectData_bundle_header.vm")
+#if($turbineUtils.validateClasspathTemplate($path))
+    #parse($path)
+#end
 #set($bundles = $project.getBundles())
 #if($bundles.size()>0)
 ##         <script type="text/javascript" src="$content.getURI("scripts/tabWrangler/tabWrangler.js")"></script>
@@ -58,7 +61,12 @@
 
         window.tab_manager.init(stored_searches);
 
-        #parse($turbineUtils.getTemplateName("_bundle_default","xnat:projectData",$project.getId()))
+        #set($path = "screens/xnat_projectData/xnat_projectData_bundle_default.vm")
+        #if($turbineUtils.validateClasspathTemplate($path))
+            #parse($path)
+        #else
+            #parse($turbineUtils.getTemplateName("_bundle_default","xnat:projectData",$project.getId()))
+        #end
 
         var bundles = YAHOO.util.Cookie.get("${project.getId()}.open_bundle.tabs");
         if (bundles !== null && bundles.length > 0) {
diff --git a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
index f0de96d1295ee2d9eb0e6be8895c09d7782a1f0b..40deea2beafa7647ef53df8c3d16080db1200170 100644
--- a/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
+++ b/src/main/webapp/xnat-templates/screens/xnat_subjectData/xnat_subjectData_report.vm
@@ -96,12 +96,16 @@ function summaryTabManagerInit(){
 </tr>
 	<TR>
 		<TD>
-            #if($turbineUtils.getTemplates($om.getXSIType(),"report/assessor_tabs").size() == 0)
+			#if($turbineUtils.getTemplates($om.getXSIType(),"report/assessor_tabs").size() == 0)
 			    #parse($turbineUtils.getTemplateName("_assessors","xnat:subjectData",$project))
 			#else
                 #set($useTabs=true)
                 #parse($turbineUtils.getTemplateName("assessors_tabs","xnat:subjectData",$project))
             #end
+			#set($path = "screens/xnat_subjectData/report/assessor_tabs/Visits.vm")
+			#if($turbineUtils.validateClasspathTemplate($path))
+				#parse($path)
+			#end
 		</TD>
 	</TR>
 <tr>