diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index 724dcdde56..917d04fb37 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -640,16 +640,17 @@ fieldset.rows .inputnote {
 	list-style : none;
 }
 
-.tabs-nav a, .tabs-nav a span {
+.tabs-nav a, .tabs-nav a span, .tabs-nav span.a {
    background : none;
+	display : block;
 	padding: .2em .5em .25em .5em;
 }
 
-.tabs-nav a {
+.tabs-nav a, .tabs-nav span.a {
     z-index : auto;
 }
 
-.tabs-nav .tabs-selected a {
+.tabs-nav .tabs-selected a, .tabs-nav .tabs-selected span.a {
 	background-color : #FFFFCC;
 	border-top: 1px solid #FFFFCC;
 	border-right: 1px solid #FF9900;
@@ -661,11 +662,11 @@ fieldset.rows .inputnote {
 	top : -1px;
 }
 
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
+.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active, .tabs-nav span.a {
     background-position : inherit;
     outline: 0; /* prevent dotted border in Firefox */
 }
-.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active {
+.tabs-nav a, .tabs-nav .tabs-disabled a:hover, .tabs-nav .tabs-disabled a:focus, .tabs-nav .tabs-disabled a:active, .tabs-nav span.a {
     background-position: inherit;
 }
 
@@ -677,7 +678,7 @@ fieldset.rows .inputnote {
 	background-color : #FFFFCC;
 }
 
-.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active {
+.tabs-nav .tabs-selected a, .tabs-nav a:hover, .tabs-nav a:focus, .tabs-nav a:active, .tabs-nav span.a {
 	 background : none;
     outline: 0; /* prevent dotted border in Firefox */
 }
@@ -695,7 +696,7 @@ fieldset.rows .inputnote {
 	margin-top : 1em;
 }
 
-.toptabs .tabs-nav a {
+.toptabs .tabs-nav a, .toptabs .tabs-nav span.a {
     top: 0;
  }
 
@@ -703,7 +704,7 @@ fieldset.rows .inputnote {
 	margin-right : .5em;
 }
 
-.toptabs .tabs-nav li a {
+.toptabs .tabs-nav li a, .toptabs .tabs-nav li span.a {
 	background-color : #F3F3F3;
 	border-top : 1px solid #E8E8E8;
 	border-left : 1px solid #E8E8E8;
@@ -717,7 +718,7 @@ fieldset.rows .inputnote {
 	background-color : #FFF;
 }
 
-.toptabs .tabs-nav li.tabs-selected a {
+.toptabs .tabs-nav li.tabs-selected a, .toptabs .tabs-nav li.tabs-selected span.a {
 	background-color : #FFF;
 	border-top : 1px solid #E8E8E8;
 	border-left : 1px solid #E8E8E8;
@@ -941,26 +942,4 @@ div.first fieldset {
  
  div.results {
  	padding : .7em 0;
- }
- 
- #section-nav ul {
- 	margin : .5em 0 .5em 2px;
-	padding : 0;
- }
- 
- #section-nav ul li {
- 	display : inline;
-	list-style-type : none;
- }
- 
- #section-nav ul li a {
- 	background-color : #d2e9f5;
-	border : 1px solid #69C;
-	padding : 2px 3px;
-	text-decoration : none;
- } 
-<<<<<<< HEAD:koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
-
-=======
- 
->>>>>>> Correcting invalid markup in new YUI autocomplete search feature; Correcting and updating markup in guided reports.:koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+ }
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
new file mode 100644
index 0000000000..9abda17b3d
--- /dev/null
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/dictionary-toolbar.inc
@@ -0,0 +1,21 @@
+<div id="toolbar">
+	<script type="text/javascript">
+	//<![CDATA[
+
+	// prepare DOM for YUI Toolbar
+
+	 $(document).ready(function() {
+	    yuiToolbar();
+	 });
+
+	// YUI Toolbar Functions
+
+	function yuiToolbar() {
+	    new YAHOO.widget.Button("newdictionary");
+	}
+
+	//]]>
+	</script>
+	<ul class="toolbar">
+	<li><a id="newdictionary" href="/cgi-bin/koha/reports/dictionary.pl?phase=Add New Definition">New Definition</a></li>
+</ul></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index d39631b9bd..f7dc3670c2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -13,4 +13,5 @@
 	<li><a href="/cgi-bin/koha/tools/export.pl">Export bibs/holdings</a></li>
 	<li><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></li>
 	<li><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonomize, bulk-delete)</a></li>
+	<li><a href="/cgi-bin/koha/tools/scheduler.pl">Task Scheduler</a></li>
 </ul>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
index eac69fa619..20c5dde7a5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/dictionary.tmpl
@@ -14,12 +14,14 @@
 <div id="bd">
 <div id="yui-main">
 <div class="yui-b">
-
-<div class="details">
+<!-- TMPL_IF NAME="start_dictionary" -->
+<!-- TMPL_INCLUDE NAME="dictionary-toolbar.inc" -->
+<!-- /TMPL_IF -->
 <h1>Dictionary</h1>
 <!-- TMPL_IF NAME="start_dictionary" -->
 <p>Use the dictionary to define custom criteria for reporting.</p>
 
+<!-- TMPL_IF NAME="definitions" -->
 <h2>Current Terms</h2>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 Filter By Area <select name="areas">
@@ -28,9 +30,7 @@ Filter By Area <select name="areas">
 <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>                  
 <!-- /TMPL_LOOP -->                
 </select> 
-<!-- <input name="phase" value="Filter Dictionary" type="submit"> -->
-<input name="phase" value="Add New Definition" type="hidden" />
-<input name="submit" value="Add New Definition" type="submit" />
+<input name="phase" value="Go" type="submit">
 </form>
 <br />
 <table border="1" cellspacing="0" cellpadding="5">
@@ -54,66 +54,89 @@ Filter By Area <select name="areas">
 </form></td>
 </tr>
 <!-- /TMPL_LOOP -->
-</table>
+</table><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->
 
 
 <!-- TMPL_IF NAME="new_dictionary" -->
-<h1>Add New Definition</h1>
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 
-<p><b>1 Name</b> | 2 Area | 3 Columns | 4 Values</p>
-<table>
-<tr>
-<td>Definition Name:</td>
-<td><input type="text" name="definition_name"></td>
-</tr>
-<td>Definition Description:</td>
-<td><textarea name="definition_description"></textarea></td>
-
-</tr>
-</table>
+<div class="toptabs">
+<ul class="tabs-nav">
+	<li class="tabs-selected"><span class="a">Step 1: Name</span></li>
+	<li><span class="a">Step 2: Area</span></li>
+	<li><span class="a">Step 3: Columns</span></li>
+	<li><span class="a">Step 4: Values</span></li>
+</ul>
+<div class="tabs-container">
+<fieldset class="rows"><legend>Add New Definition</legend><ol>
+<li>
+<label for="definition_name">Definition Name:</label>
+<input type="text" id="definition_name" name="definition_name">
+</li>
+<li>
+<label for="definition_description">Definition Description:</label>
+<textarea name="definition_description" id="definition_description"></textarea>
+</li>
+</ol></fieldset>
 																													  
-<input type="hidden" name="phase" value="New Term step 2" />
-<input name="submit" value="Next" type="submit" />
+<fieldset class="action"><input type="hidden" name="phase" value="New Term step 2" />
+<input name="submit" value="Next" type="submit" /></fieldset>
 </form>
+</div>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="step_2" -->
-<h1>Add New Definition</h1>
-
-<p>1 Name | <b>2 Area</b> | 3 Columns | 4 Values</p>
+<div class="toptabs">
+<ul class="tabs-nav">
+	<li><span class="a">Step 1: Name</span></li>
+	<li class="tabs-selected"><span class="a">Step 2: Area</span></li>
+	<li><span class="a">Step 3: Columns</span></li>
+	<li><span class="a">Step 4: Values</span></li>
+</ul>
+<div class="tabs-container">
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
-<input type="hidden" name="phase" value="New Term step 3" />
+<fieldset class="rows">
+<legend>Add New Definition</legend>
+<ol><li><input type="hidden" name="phase" value="New Term step 3" />
 <input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
 <input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->" />
-Select table <select name="areas">
+<label for="areas">Select table </label><select name="areas" id="areas">
 <!-- TMPL_LOOP NAME="areas" -->     
 <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="name"--></option>                  
 <!-- /TMPL_LOOP -->                
-</select>
-                                                                            
-<input name="submit" value="Next" type="submit" />
+</select></li>
+</ol>
+</fieldset>                                                                            
+<fieldset class="action"><input name="submit" value="Next" type="submit" /></fieldset>
 </form>
+</div>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="step_3" -->
 <h1>Add New Definition</h1>
-
-<p>1 Name | 2 Area | <b>3 Columns</b> | 4 Values</p>
+<div class="toptabs">
+<ul class="tabs-nav">
+	<li><span class="a">Step 1: Name</span></li>
+	<li><span class="a">Step 2: Area</span></li>
+	<li class="tabs-selected"><span class="a">Step 3: Columns</span></li>
+	<li><span class="a">Step 4: Values</span></li>
+</ul>
+<div class="tabs-container">
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">      
 <input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
 <input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
-<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->"> / 
+<input type="hidden" name="definition_description" value="<!-- TMPL_VAR NAME="definition_description" -->" />
 
-<select id="availableColumns" name="oldcolumns2" size="25" style="width:200px;height:300px;">    
+<table style="border: 0;"><tr><td><select id="availableColumns" name="oldcolumns2" size="25" style="width:200px;height:300px;">    
 <!-- TMPL_LOOP NAME="columns" -->                              
 <!-- TMPL_IF NAME="table" -->                                                                                                      
 <!-- TMPL_IF NAME="__first__" -->                              
 <!-- TMPL_ELSE -->               
 </optgroup>        
-<!-- /TMPL_IF -->              
-                                                                            
+<!-- /TMPL_IF -->                                                         
 
 <optgroup label="<!-- TMPL_VAR NAME="table"-->">              
 <!-- TMPL_ELSE -->               
@@ -125,21 +148,30 @@ Select table <select name="areas">
 <!-- /TMPL_IF -->              
 </option>      
 <!-- /TMPL_LOOP -->                
-</select>      
-<input type="button" name="Add" value="Add" class="button" onClick="addColumn()" />
+</select></td>
 
-<select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select>             
-<input type="button" name="delete" value="delete" class="button" onClick="delColumn()" />           
+<td><input type="button" name="Add" value="Add &gt;&gt;" class="button"  style="width : 6em; margin-bottom : .5em;" onclick="addColumn()" /><br /><input type="button" name="delete" value="&lt;&lt; Delete" class="button" style="width : 6em;"  onclick="delColumn()" />  </td>
+
+<td><select id="selectedColumns" name="columns" size="25" style="width:200px;height:300px;"></select>     </td>   </tr></table>     
+         
                                                                             
 <input type="hidden" name="phase" value="New Term step 4" />
 <input type="submit" name="submit" value="Next" />  
 </form>    
+</div>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="step_4" -->
 <h1>Add New Definition</h1>
-
-<p>1 Name | 2 Area | 3 Columns | <b>4 Values</b></p>
+<div class="toptabs">
+<ul class="tabs-nav">
+	<li><span class="a">Step 1: Name</span></li>
+	<li><span class="a">Step 2: Area</span></li>
+	<li><span class="a">Step 3: Columns</span></li>
+	<li class="tabs-selected"><span class="a">Step 4: Values</span></li>
+</ul>
+<div class="tabs-container">
 <form action="/cgi-bin/koha/reports/dictionary.pl" method="post">
 <input type="hidden" name="area" value="<!-- TMPL_VAR NAME="area" -->" />
 <input type="hidden" name="definition_name" value="<!-- TMPL_VAR NAME="definition_name" -->" />
@@ -206,6 +238,8 @@ align          : "Tl"
 <input type="hidden" name="phase" value="New Term step 5" />
 <input type="submit" name="submit" value="Next" />            
 </form>
+</div>
+</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="step_5" -->
@@ -217,19 +251,20 @@ align          : "Tl"
 
 <h3>Confirm Definition</h3>
 
-<table>
-<tr>
-<td>Name:</td>
-<td><!-- TMPL_VAR NAME="definition_name" --></td>
-</tr>
-<tr>
-<td>Description:</td>
-<td><!-- TMPL_VAR NAME="definition_description" --></td>
-</tr>
-<tr>
-<td>Area:</td>
-<td><!-- TMPL_VAR NAME="area" --></td>
-</tr>
+<fieldset class="rows"><ol><li>
+<span class="label">Name:</span>
+<!-- TMPL_VAR NAME="definition_name" -->
+</li>
+<li>
+<span class="label">Description:</span>
+<!-- TMPL_VAR NAME="definition_description" -->
+</li>
+<li>
+<span class="label">Area:</span>
+<!-- TMPL_VAR NAME="area" -->
+</li></ol>
+
+<li><table>
 <tr>
 <th>Columns</th>
 <th>Values</th>
@@ -240,17 +275,14 @@ align          : "Tl"
 <td><!-- TMPL_VAR NAME="value" --></td>
 </tr>
 <!-- /TMPL_LOOP -->
-</table>
+</table></li> </fieldset>  
 
-<input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="query" -->" />
+<fieldset class="action"><input type="hidden" name="sql" value="<!-- TMPL_VAR NAME="query" -->" />
 <input type="hidden" name="phase" value="New Term step 6" />
-<input type="submit" name="submit" value="Save" />            
+<input type="submit" name="submit" value="Save" />         </fieldset>
 
 </form>
 <!-- /TMPL_IF -->
-
-
-</div>
 </div>
 </div>
 <div class="yui-b">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
index 3df4892677..4b1caa0b2b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tmpl
@@ -83,14 +83,16 @@ reports</p>
 <p>Choose the report to run from the list</p>
 <table>
 <form action="/cgi-bin/koha/reports/guided_reports.pl">
-<th>Report Name</th><th>Type</th><th>Notes</th><th>Saved Results</th><th>Saved SQL</th><th>Delete</th>
+<th>Report Name</th><th>Type</th><th>Notes</th><th>Saved Results</th><th>Saved SQL</th><th colspan="3">&nbsp;</th>
 <!-- TMPL_LOOP NAME="savedreports" -->
-<tr><td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Run%20this%20report"><!-- TMPL_VAR NAME="report_name" --></td>
+<tr><td><!-- TMPL_VAR NAME="report_name" --></td>
 <td><!-- TMPL_VAR NAME="type" --></td>
 <td><!-- TMPL_VAR NAME="notes" --></td>
 <td><!-- TMPL_IF NAME="date_run" --><a href="/cgi-bin/koha/reports/guided_reports.pl?phase=retrieve%20results&id=<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="date_run" --></a><!-- /TMPL_IF -->
 </td>
 <td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Show%20SQL">Show SQL</a></td>
+<td><a href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Run%20this%20report">Run this Report</a></td>
+<td><a href="/cgi-bin/koha/tools/scheduler.pl?id=<!-- TMPL_VAR NAME="id" -->">Schedule this Report</a></td>
 <td><a class="confirmdelete" title="delete this saved report" href="/cgi-bin/koha/reports/guided_reports.pl?reports=<!-- TMPL_VAR NAME="id" -->&phase=Delete%20Saved">Delete</a></td></tr>
 <!-- /TMPL_LOOP -->
 </form>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
index 8986afa191..8c56253da2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/scheduler.tmpl
@@ -1,9 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Tools &rsaquo; Task Scheduler</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+</head>
+<body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <strong>Scheduler</strong></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> &rsaquo; <strong>Task Scheduler</strong></div>
 
 <div id="doc3" class="yui-t2">
 
@@ -13,14 +16,16 @@
 
 <div id="main">
 <form name="form1" action="scheduler.pl" method="post">
-<input type="hidden" name="mode" value="job_add">
+<input type="hidden" name="mode" value="job_add" />
 
-<table border="0" cellspacing="0" cellpadding="0">
-<tr><td>Current server time is</td>
-<td><!-- TMPL_VAR NAME="time" --></td></tr>
-<tr><td class="cell">Time</td>
-<td class="cell"><input type="text" name="starttime" value="" maxlength="5" size="5" /></td>
-<td class="cell"><select name="startday">
+<fieldset class="rows">
+<legend>Task Scheduler</legend><ol>
+<li><span class="label">Current server time is:</span>
+<!-- TMPL_VAR NAME="time" --></li>
+<li><label for="starttime">Time:</label>
+<input type="text" name="starttime" id="starttime" value="" maxlength="5" size="5" /></li>
+<li><label for="startday">Date: </label>
+<select name="startday" id="startday">
 <option value="01">1</option>			
 <option value="02">2</option>
 <option value="03">3</option>
@@ -54,8 +59,8 @@
 <option value="31">31</option>
 
 </select>
-</td>
-<td class="cell"><select name="startmonth">
+
+<select name="startmonth">
 <option value="01">Jan</option>
 <option value="02">Feb</option>
 <option value="03">Mar</option>
@@ -69,62 +74,62 @@
 <option value="11">Nov</option>
 <option value="12">Dec</option>
 </select>
-</td>
-<td class="cell"><select name="startyear">
+
+<select name="startyear">
 <option value="2007">2007</option>
 <option value="2008">2008</option>
 
 </select>
-</td>
-</tr>
-<tr><td class="cell">Report</td><td>
-<select name="report">
+
+</li>
+<li><label for="report">Report:</label>
+<select name="report" id="report">
 <!-- TMPL_LOOP NAME="savedreports" -->                                   
 <option value="<!-- TMPL_VAR NAME="id" -->"><!-- TMPL_VAR NAME="report_name"--></option>                  
 <!-- /TMPL_LOOP -->
 </select>
-</tr>
-<tr><td class="cell">Output Format</td>
-<td><select name="format">
+</li>
+<li><label for="format">Output Format:</label>
+<select name="format" id="format">
 <option value="text">Text</option>
 <option value="url">URL</option>
-</select></td>
-</tr>
-<tr><td class="cell">Email</td>
-<td>
-<input type=text name=email>
-</td></tr>
-<tr><td><input class="submit-button" type="submit" value="Add">
-</td></tr>
-</table>
+</select>
+</li>
+<li><label for="email">Email:</label>
+
+<input type="text" name="email" id="email" size="50" />
+</li>
+</ol></fieldset>
+<fieldset class="action"><input class="submit-button" type="submit" value="Save" /></fieldset>
 </form>
   
-<h2>Jobs already entered</h2>
+<!-- TMPL_IF NAME="JOBS" --><h2>Jobs already entered</h2>
 <table>
 <tr>
 <th>Date/Time</th>
 <th>Action</th>
 <th>&nbsp;</th>
 </tr>
-<TMPL_LOOP NAME="JOBS">
+<!-- TMPL_LOOP NAME="JOBS" -->
 <form action="scheduler.pl" method="post">
-<input type=hidden name=mode value="job_change">
+<input type="hidden" name="mode" value="job_change" />
 
 <tr>
-<td><TMPL_VAR NAME="TIME"></td>
-<td><TMPL_VAR NAME="TAG"></td>
+<td><!-- TMPL_VAR NAME="TIME" --></td>
+<td><!-- TMPL_VAR NAME="TAG" --></td>
 <td><input type="submit" value="Edit"/>&nbsp;<input type="submit" name="delete" value="Delete" /></td>
 </tr>
-<input type=hidden name=jobid value="<TMPL_VAR NAME="JOBID">">
+<input type="hidden" name="jobid" value="<!-- TMPL_VAR NAME="JOBID" -->" />
 </form>
-</TMPL_LOOP>
-</table>
+<!-- /TMPL_LOOP -->
+</table><!-- /TMPL_IF -->
 
 
 </div>
 </div>
 </div>
 <div class="yui-b">
+<!-- TMPL_INCLUDE NAME="tools-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="guided-reports-view.inc" -->
 </div>
 </div>