diff --git a/templates/Includes/ReportAdmin_Content.ss b/templates/Includes/ReportAdmin_Content.ss
new file mode 100644
index 00000000..ff6c2419
--- /dev/null
+++ b/templates/Includes/ReportAdmin_Content.ss
@@ -0,0 +1,20 @@
+<div id="reportadmin-cms-content" class="cms-content center cms-tabset $BaseCSSClasses" data-layout-type="border" data-pjax-fragment="Content">
+
+	<div class="cms-content-header north">
+		<% with EditForm %>
+			<div class="cms-content-header-info">
+				<% include BackLink_Button %>				
+				<% with Controller %>
+					<% include CMSBreadcrumbs %>
+				<% end_with %>				
+			</div>
+		<% end_with %>
+	</div>
+
+	<div class="cms-content-fields center ui-widget-content" data-layout-type="border">
+		
+		$EditForm
+		
+	</div>
+	
+</div>
\ No newline at end of file
diff --git a/templates/Includes/ReportAdmin_Tools.ss b/templates/Includes/ReportAdmin_Tools.ss
new file mode 100644
index 00000000..e69de29b
diff --git a/templates/ReportAdminForm.ss b/templates/ReportAdminForm.ss
new file mode 100644
index 00000000..bc8e262b
--- /dev/null
+++ b/templates/ReportAdminForm.ss
@@ -0,0 +1,41 @@
+<form $FormAttributes>
+
+	
+	<p style="display: none;" class="message " id="Form_EditForm_error"/>
+	
+
+		<div id="ScrollPanel">
+		<fieldset>
+			$FieldMap.ReportTitle.FieldHolder
+			$FieldMap.ReportDescription.FieldHolder
+		
+			<% if FieldMap.Filters.Children %>
+				<h4><% _t('ReportAdminForm.FILTERBY', 'Filter by') %></h4>
+			
+				<div class="filters">
+					<% loop FieldMap.Filters %>
+						<% loop Children %>
+							$FieldHolder
+						<% end_loop %>
+					<% end_loop %>
+				</div>
+			
+				<div id="action_updatereport">
+					<% if FieldMap.action_updatereport %>
+						$FieldMap.action_updatereport.Field
+					<% end_if %>
+				</div>
+			
+				<div style="clear: both">&nbsp;</div>
+			<% end_if %>
+			
+			$FieldMap.ReportContent.FieldHolder
+			
+			<% loop HiddenFields %>$Field<% end_loop %>
+			
+			</fieldset>
+		</div>
+			
+		
+		<div class="clear"><!-- --></div>
+</form>
\ No newline at end of file