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 736d35acb..cdf47521c 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
@@ -17,10 +17,7 @@
 <li><a href="<tmpl_var checkout.url>"><tmpl_var checkout.label></a></li>
 </ul>
 
-
-<br /><br />
-
-<table width="100%" border="0" cellpadding="8" cellspacing="0" style="border-top:solid gray 2px;border-bottom:solid gray 2px;">
+<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>
@@ -28,8 +25,10 @@
 <th><tmpl_var price.label></th>
 <th><tmpl_var requirement.label></th>
 <th><tmpl_var addToCart.label></th></tr>
-<tmpl_loop events_loop>
- <tmpl_var event>
+<tmpl_loop events_loop>
+<tr>
+	<td valign="top" colspan="7"><tmpl_var event></td>
+</tr>
 </tmpl_loop>
 </table>
 <tmpl_var paginateBar>
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 dc3f1ab52..cdf552775 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
@@ -1,18 +1,61 @@
-#EventManagerTmpl000002
-#title:Default Event Management System Product
-#menuTitle:Default Event Management System Product
-#url:default-ems-template-product
-#namespace:EventManagementSystem_product
-#create
-<h2><tmpl_var title></h2><br />
-<tmpl_var description>&nbsp;<tmpl_var price><br />
+<h2 class="productTitle"><tmpl_var title></h2>
 
-<tmpl_unless eventIsFull>
-<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
-<tmpl_else>
-<tmpl_var purchase.label><br />
-</tmpl_unless>
-max attendees:<tmpl_var maximumAttendees><br />
-seats remaining:<tmpl_var seatsRemaining><br />
-number registered:<tmpl_var numberRegistered><br />
-event full?:<tmpl_var eventIsFull<br />
\ No newline at end of file
+<table class="productDetails" cellpadding="3" cellspacing="0">
+<tr>
+	<td class="description" valign="top"><tmpl_var description></td>
+	<td class="price" valign="top"><tmpl_var price></td>
+</tr>
+<tr class="softGray">
+	<td colspan="2"><strong>Max Attendees:</strong> <tmpl_var maximumAttendees></td>
+</tr>
+<tr class="softGray">	
+	<td colspan="2"><strong>Seats Remaining:</strong> <tmpl_var seatsRemaining></td>
+</tr>	
+<tr class="softGray">	
+	<td colspan="2"><strong>Number Registered:</strong> <tmpl_var numberRegistered></td>
+</tr>
+<tr class="softGray">	
+	<td colspan="2"><strong>Event Full?:</strong> <tmpl_var eventIsFull></td>
+</tr>
+<tr class="softGray">
+	<td  colspan="2" class="purchase">
+	<tmpl_unless eventIsFull>
+		<a href="<tmpl_var purchase.url>"><tmpl_var purchase.label></a>
+	<tmpl_else>
+		<tmpl_var purchase.label><br />
+	</tmpl_unless>	
+	</td>
+</tr>
+</table>
+
+~~~
+<style type="text/css">
+	td.description {
+		width:80%;
+		text-align:left;
+		border-bottom:solid silver 1px;
+		font-style:italic;		
+	}
+	td.price {
+		width:20%;
+		text-align:right;
+		font-weight:bold;
+		border-bottom:solid silver 1px;
+	}
+	h2.productTitle {
+		margin-bottom:3px;
+		border-bottom:solid gray 1px;
+	}
+	table.productDetails {
+		padding-left:10px;
+		-moz-box-sizing:border-box;
+		width:100%;
+	}
+	tr.softGray td {
+		background-color:#F0F0F0;
+	}
+	td.purchase {
+		border:solid silver 1px;
+		text-align:center;
+	}
+</style>