diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
index 89ad58df9..a751a22d3 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_checkout.tmpl
@@ -57,6 +57,8 @@ function swapBadgeInfo(badgeId) {
 		var field = document.getElementById(i+'_formId');
 		if (field && badges[badgeId][i]) {
 			field.value=badges[badgeId][i];
+		} else {
+			if (field) field.value='';
 		}
 	}
 }	
@@ -98,6 +100,7 @@ if (selector1) {
 
 </tmpl_if>
 ~~~
+<style type="text/css">
 tr.oddRow td {
 	background-color:#DADADA;
 	border-right:solid gray 1px;
@@ -106,3 +109,4 @@ tr.evenRow td {
 	background-color:#E8E8E8;
 	border-right:solid gray 1px;
 }
+</style>
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
index ee0ace3ab..bb736aaad 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_search.tmpl
@@ -74,20 +74,31 @@
 		}
 		return output;
 	}
-
+	function advSearch() {
+		var mee = document.getElementById('basicSearch')
+		if (mee) mee.style.display='none';
+		var pee = document.getElementById('advSearchDiv');
+		if (pee) pee.style.display='block';
+	}
+	function basicSearch() {
+		var vee = document.getElementById('basicSearch');
+		if (vee) vee.style.display='block';
+		var dee = document.getElementById('advSearchDiv');
+		if (dee) dee.style.display='none';
+	}
 </script>
 
-<div id="basicSearch"<tmpl_if isAdvSearch> style="display:none"</tmpl_if>>
+<div id="basicSearch">
 <tmpl_var basicSearch.formHeader>
-<div style="cursor:pointer;text-align:right;" onclick="document.getElementById('basicSearch').style.display='none';document.getElementById('advSearch').style.display='block';" ><a href="#">Switch To Advanced Search</a></div>
+<div style="cursor:pointer;text-align:right;"><a href="javascript:void(advSearch())">Switch To Advanced Search</a></div>
 <table width="100%" border="0" padding="1" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;"><tr><td style="font-weight:bold;width:40%;">Search Keywords:</td><td style="width:60%;"><input name="searchKeywords" style="width:100%;" /></td></tr></table>
 <tmpl_var search.formSubmit>
 <tmpl_var search.formFooter>
 </div>
 
-<div id="advSearch"<tmpl_unless isAdvSearch> style="display:none"</tmpl_unless>>
+<div id="advSearchDiv">
 <tmpl_var advSearch.formHeader>
-<div style="cursor:pointer;text-align:right;" onclick="document.getElementById('basicSearch').style.display='block';document.getElementById('advSearch').style.display='none';" ><a href="#">Switch To Basic Search</a></div>
+<div style="cursor:pointer;text-align:right;"><a href="javascript:void(basicSearch())">Switch To Basic Search</a></div>
 <table width="100%" border="0" cellpadding="8" style="border-bottom:double gray 5px;border-top:solid gray 1px;margin-bottom:5px;margin-top:5px;">
 <tbody id="filterbody">
 <tr><td></td></tr>
@@ -96,7 +107,7 @@
 <table border="0" cellpadding="0" cellspacing="0" width="100%">
 <tr>
 	<td align="left"><tmpl_var search.formSubmit></td>
-	<td align="right" valign="top"><a href="#" onclick="addField();">Add another Filter Field</a></td>
+	<td align="right" valign="top"><a href="javascript:void(addField())">Add another Filter Field</a></td>
 </tr>
 </table>
 <tmpl_var search.formFooter>
@@ -109,6 +120,7 @@
        changeToType(word,filterCount);
      }
    }
+   <tmpl_if isAdvSearch>advSearch();<tmpl_else>basicSearch();</tmpl_if>
 </script>
 
 </div>
@@ -152,6 +164,7 @@
 </table>
 <tmpl_var paginateBar>
 
+
 ~~~
 <style type="text/css">
 tr.oddRow td {
@@ -230,3 +243,5 @@ tr.evenRow td {
 #extendedSearchLayer {display: inline;}
 
 </style>
+
+<link href="^Extras;/calendar/calendar-win2k-1.css" rel="stylesheet" type="text/css" />
\ No newline at end of file
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl
index cdf47521c..80184d78c 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view.tmpl
@@ -18,17 +18,10 @@
 </ul>
 
 <table width="100%" border="1" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
-<tr><th><tmpl_var name.label></th>
-<th><tmpl_var starts.label></th>
-<th><tmpl_var ends.label></th>
-<th><tmpl_var seats.label></th>
-<th><tmpl_var price.label></th>
-<th><tmpl_var requirement.label></th>
-<th><tmpl_var addToCart.label></th></tr>
-<tmpl_loop events_loop>
-<tr>
-	<td valign="top" colspan="7"><tmpl_var event></td>
-</tr>
+<tmpl_loop events_loop>
+<tr>
+	<td valign="top" colspan="7"><tmpl_var event></td>
+</tr>
 </tmpl_loop>
 </table>
 <tmpl_var paginateBar>
@@ -43,9 +36,9 @@ tr.evenRow td {
 	background-color:#E8E8E8;
 	border-right:solid gray 1px;
 }
-.manageEvents {
-	margin-top:5px;
-	margin-bottom:5px;
+.manageEvents {
+	margin-top:5px;
+	margin-bottom:5px;
 }
 .datacardtitle {
 	background: #3D5690;
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl
index 403035f51..9befe1dc8 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_event.tmpl
@@ -26,13 +26,7 @@
 <tr class="softGray">
 	<td  colspan="2" class="purchase">
 	<tmpl_unless eventIsFull>
-		<a onclick="
-if( confirm('<tmpl_var purchase.message>')) {
-   window.location = '<tmpl_var purchase.wantToSearch.url>';
-}
-else {
-   window.location = '<tmpl_var purchase.wantToContinue.url>';
-}"><tmpl_var purchase.label></a>
+		<a style="cursor:pointer;" href="javascript:void(window.location=(confirm('<tmpl_var purchase.message>'))?'<tmpl_var purchase.wantToSearch.url>':'<tmpl_var purchase.wantToContinue.url>')"><tmpl_var purchase.label></a>
 	<tmpl_else>
 		<tmpl_var purchase.label><br />
 	</tmpl_unless>	
diff --git a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
index ed8e54f06..2a744752e 100644
--- a/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
+++ b/docs/upgrades/templates-6.99.0/wgtemplate_default_ems_view_purchase.tmpl
@@ -9,24 +9,24 @@
 </tmpl_if>
 <h2><tmpl_var viewPurchaseTitle></h2>
 
-<tmpl_if canReturn>
+<tmpl_if canReturn><tmpl_if canReturnTransaction>
 	<div style="text-align:right;">
 		(<a href="<tmpl_var appUrl>?func=returnItem;tid=<tmpl_var transactionId>">Return Entire Purchase</a>)
 	</div>
-</tmpl_if>
+</tmpl_if></tmpl_if>
 
 <tmpl_loop purchasesLoop>
 <table width="100%" border="0" class="viewPurchase">
 <tr>
 	<td class="badgeTitle">Badge Name</td>
 	<td class="itinerary">
-		Itinerary&nbsp;&nbsp;<tmpl_if canReturn>(<a href="<tmpl_var appUrl>?func=returnItem;pid=<tmpl_var purchaseId>">Return Entire Itinerary</a>)</tmpl_if>
+	Itinerary&nbsp;&nbsp;<tmpl_if canReturn><tmpl_if canReturnItinerary>(<a href="<tmpl_var appUrl>?func=returnItem;pid=<tmpl_var purchaseId>">Return Entire Itinerary</a>)</tmpl_if></tmpl_if>
 	</td>
 </tr>
 <tr>
 	<td class="badgeName" valign="top">
 		<tmpl_var firstName> <tmpl_var lastName><br /><br />
-		<tmpl_if canAddEvents><a href="<tmpl_var appUrl>?func=addEventsToBadge;bid=<tmpl_var badgeId>">Add Events To Badge</a></tmpl_if>
+		<tmpl_if canAddEvents><tmpl_if canReturnItinerary><a href="<tmpl_var appUrl>?func=addEventsToBadge;bid=<tmpl_var badgeId>">Add Events To Badge</a></tmpl_if></tmpl_if>
 	</td>
 	<td valign="top">
 		<table width="100%">
@@ -42,7 +42,7 @@
 			<td><tmpl_var title></td>
 			<td><tmpl_var startDateHuman> - <tmpl_var endDateHuman></td>
 		<tmpl_if canReturn>
-			<td><a href="<tmpl_var appUrl>?func=returnItem;rid=<tmpl_var registrationId>">Return This Registration</a></td>
+			<td><tmpl_if returned>RETURNED<tmpl_else><a href="<tmpl_var appUrl>?func=returnItem;rid=<tmpl_var registrationId>">Return This Registration</a></tmpl_if></td>
 		</tmpl_if>
 		</tr>
 	</tmpl_loop>
@@ -58,25 +58,25 @@
 }
 .viewPurchase td {
 	font-size:10pt;
-}
-tr.oddRow td {
-	background-color:#DADADA;
-	border-right:solid gray 1px;
-}
-tr.evenRow td {
-	background-color:#E8E8E8;
-	border-right:solid gray 1px;
-}
-td.badgeTitle, td.itinerary   {
-	font-size:9pt;
+}
+tr.oddRow td {
+	background-color:#DADADA;
+	border-right:solid gray 1px;
+}
+tr.evenRow td {
+	background-color:#E8E8E8;
+	border-right:solid gray 1px;
+}
+td.badgeTitle, td.itinerary   {
+	font-size:9pt;
 	font-weight:bold;	
-	border-bottom:solid gray 1px;
-}
-td.badgeName {
-	font-size:9pt;
-	font-style:italic;
+	border-bottom:solid gray 1px;
+}
+td.badgeName {
+	font-size:9pt;
+	font-style:italic;
 }
 h2 {
 	margin-bottom:3px;
-}
+}
 </style>
\ No newline at end of file