diff --git a/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl b/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl
index 98a6f08d7..1dc93c4b3 100644
--- a/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl
+++ b/docs/upgrades/templates-6.99.3/default-ems-search-template.tmpl
@@ -99,7 +99,7 @@
 				</tmpl_loop>
 				<!-- OEOS -->
 				<div style="text-align:right;margin:0px;">
-					<a href="/oeos?func=emptyCart">Empty Cart</a> &bull; <a href="/oeos?func=checkout">Checkout</a>
+					<a href="<tmpl_var emptyCart.url>">Empty Cart</a> &bull; <a href="<tmpl_var checkout.url>">Checkout</a>
 				</div>
 			</div>
 			</tmpl_if>
@@ -287,14 +287,13 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,lo
 </table>
 
 <tmpl_else>
-<!-- BEGIN UGLY CODE -->
 <ul>
 <tmpl_if canManageEvents>
    <li><a href="<tmpl_var addEvent.url>"><tmpl_var addEvent.label></a></li>
-   <li><a href="^PageUrl;?func=manageRegistrants">Manage Registrants (Event Directors and Staff)</a></li>
-   <li><a href="^PageUrl;?func=search">Manage Events (Event Directors and Staff)</a></li></tmpl_if>
+   <li><a href="<tmpl_var manageRegistrants.url>"></a> Manage Registrants (Event Directors and Staff)</li>
+   <li><a href="<tmpl_var manageEvents.url>">Manage Events</a> (Event Directors and Staff)</li></tmpl_if>
 <tmpl_unless badgeSelected>
-   <li><a href="^PageUrl;?func=view">Return To Badge List to begin a badge purchase</a></li></tmpl_unless>
+   <li><a href="<tmpl_var view.url>">Return To Badge List to begin a badge purchase</a></li></tmpl_unless>
 </ul>
 
 <tmpl_if badgeSelected>
@@ -399,7 +398,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,lo
 <div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div><br />
 
 <!-- Sort Form -->
-<div style='align: right;'>
+<div style="align: right;">
 <tmpl_var sortForm.header>
 <tmpl_var sortForm.selectBox.label>&nbsp;
 <tmpl_var sortForm.selectBox>
@@ -422,9 +421,9 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,lo
   <tr<tmpl_unless __ODD__> class="oddRow"<tmpl_else> class="evenRow"</tmpl_unless>>
 
   <td style="white-space:nowrap;">
-    <tmpl_if canManageEvents><tmpl_var manageToolbar>&nbsp;
-        <tmpl_unless eventIsApproved>^AssetProxy(media/icons/icon-pending.png);<tmpl_else>^AssetProxy(media/icons/icon-approved.png);</tmpl_unless></tmpl_if>&nbsp;<tmpl_var sku>
-  </td><td><A HREF="javascript:popUp('https://events.originsgames.com/home/event-detail?pid=<tmpl_var productId>')"><tmpl_var title></a>
+    <tmpl_if canManageEvents><tmpl_var manageToolbar>
+        <tmpl_unless eventIsApproved><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Not Approved</span><tmpl_else><span style="color:red;font-size:9pt;font-weight:bold;">&bull; Approved</span></tmpl_unless></tmpl_if>
+  </td><td><tmpl_var title>
   </td><td>^D("%W %Z",<tmpl_var startDate>);
   </td><td>^D("%W %Z",<tmpl_var endDate>);
   </td><td style="text-align: center;"><tmpl_var seatsRemaining>/<tmpl_var maximumAttendees>
@@ -448,7 +447,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbar=0,scrollbars=1,lo
 
 <div style="text-align: center;"><tmpl_var pagination.firstPage>&nbsp;&nbsp;<tmpl_var pagination.previousPage>&nbsp;&nbsp;<tmpl_var pagination.pageList.upTo20>&nbsp;&nbsp;<tmpl_var pagination.nextPage>&nbsp;&nbsp;<tmpl_var pagination.lastPage> of <tmpl_var pagination.pageCount></div>
 
-<!-- END UGLY CODE -->
+
 
 </tmpl_if>
 ~~~
diff --git a/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl b/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl
index 7f3f233e6..4796bce23 100644
--- a/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl
+++ b/docs/upgrades/templates-6.99.3/default-ems-template-manage-purchases.tmpl
@@ -5,8 +5,8 @@
 <h2><tmpl_var managePurchasesTitle></h2>
 <table width="100%" cellspacing="2" cellpadding="2" class="EMS_purchase">
 <tr class="header">
-	<td>Transaction ID<!--<tmpl_var purchaseId.label>--></td>
-	<td>Transaction Date<!--<tmpl_var datePurchasedHuman.label>--></td>
+	<td><tmpl_var purchaseId.label></td>
+	<td><tmpl_var datePurchasedHuman.label></td>
 </tr>
 <tmpl_if purchasesLoop>
 	<tmpl_loop purchasesLoop>
diff --git a/docs/upgrades/templates-6.99.3/default_ems_template.tmpl b/docs/upgrades/templates-6.99.3/default_ems_template.tmpl
index 68e7089f3..87d699dad 100644
--- a/docs/upgrades/templates-6.99.3/default_ems_template.tmpl
+++ b/docs/upgrades/templates-6.99.3/default_ems_template.tmpl
@@ -17,17 +17,17 @@
 		<br />
 		<table cellpadding="5" cellspacing="0" style="width:100%">
 		<tr style="height:30px;">
-			<td valign="top" style="width:190px;"><a href='<tmpl_var manageEvents.url>'>Manage Events</a></td>
+			<td valign="top" style="width:190px;"><a href="<tmpl_var manageEvents.url>">Manage Events</a></td>
 			<td>(Event Directors and Staff)</td>
 		</tr>
 		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href='/oeos?func=manageRegistrants'>Manage Registrants</a></td>
+			<td valign="top" style="width:190px;"><a href="<tmpl_var manageRegistrants.url>">Manage Registrants</a></td>
 			<td>(Event Directors and Staff)</td>
 		</tr>
 		</tmpl_if>
 		
 		<tr style="height:30px">
-			<td valign="top" style="width:190px;"><a href='<tmpl_var managePurchases.url>'>Modify Existing Badge</a></td>
+			<td valign="top" style="width:190px;"><a href="<tmpl_var managePurchases.url>">Modify Existing Badge</a></td>
 			<td>Add Events to a Badge you've already purchased</td>
 		</tr>
 		</table>
@@ -63,7 +63,7 @@
 			</div>
 			</tmpl_loop>
 			
-			<a href="/oeos?func=emptyCart">Empty Cart</a><br /><a href="/oeos?func=checkout">Checkout</a>
+			<a href="<tmpl_var emptyCart.url>">Empty Cart</a><br /><a href="<tmpl_var checkout.url>">Checkout</a>
 		</div>
 		</tmpl_if>
 	</td>