diff --git a/phpBB/templates/Euclid/confirm_body.tpl b/phpBB/templates/Euclid/confirm_body.tpl
index 8e384f1e15..da981e6aaa 100644
--- a/phpBB/templates/Euclid/confirm_body.tpl
+++ b/phpBB/templates/Euclid/confirm_body.tpl
@@ -1,5 +1,5 @@
 
-<form action="{S_CONFIRM_ACTION}" method="post"><table width="98%" cellpadding="1" cellspacing="0" border="0" align="center">
+<form action="{S_CONFIRM_ACTION}" method="post"><table width="80%" cellspacing="0" cellpadding="1" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
diff --git a/phpBB/templates/Euclid/memberlist_body.tpl b/phpBB/templates/Euclid/memberlist_body.tpl
index 84eeb04768..d0fe4bd21c 100644
--- a/phpBB/templates/Euclid/memberlist_body.tpl
+++ b/phpBB/templates/Euclid/memberlist_body.tpl
@@ -6,11 +6,11 @@
 	</tr>
 </table>
 
-<table border="0" cellpadding="1" cellspacing="0" width="98%" align="center">
+<table width="98%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
-				<td class="cat" colspan="7" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="cat" colspan="7" height="30"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td><span class="gensmall">{PAGINATION}</span></td>
 						<td align="right"><span class="gensmall">{PAGE_NUMBER}</span></td>
@@ -38,7 +38,7 @@
 			</tr>
 			<!-- END memberrow -->
 			<tr>
-				<td class="cat" colspan="7" height="28"><table width="100%" cellspacing="0" cellpadding="0" border="0">
+				<td class="cat" colspan="7" height="30"><table width="100%" cellspacing="0" cellpadding="0" border="0">
 					<tr>
 						<td><span class="gensmall">{PAGE_NUMBER}</span></td>
 						<td align="right"><span class="gensmall">{PAGINATION}</span></td>
@@ -51,7 +51,7 @@
 
 <table width="98%" cellspacing="2" border="0" align="center">
 	<tr>
-		<td width="40%" valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
+		<td valign="top"><span class="gensmall"><b>{S_TIMEZONE}</b></span></td>
 		<td align="right" valign="top" nowrap="nowrap">{JUMPBOX}</td>
 	</tr>
 </table>
diff --git a/phpBB/templates/Euclid/message_body.tpl b/phpBB/templates/Euclid/message_body.tpl
index 7356d03a1e..5a49bc6000 100644
--- a/phpBB/templates/Euclid/message_body.tpl
+++ b/phpBB/templates/Euclid/message_body.tpl
@@ -1,19 +1,21 @@
 
 <table width="80%" cellspacing="0" cellpadding="4" border="0" align="center">
 	<tr>
-		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{SITENAME} {L_INDEX}</a></span></td>
+		<td align="left"><span class="gensmall"><a href="{U_INDEX}">{L_INDEX}</a></span></td>
 	</tr>
 </table>
 
-<table width="80%" cellpadding="1" cellspacing="0" border="0" align="center">
+<table width="80%" cellspacing="0" cellpadding="0" border="0" align="center">
 	<tr>
 		<td class="tablebg"><table width="100%" cellpadding="4" cellspacing="1" border="0">
 			<tr>
 				<th class="secondary"><b>{MESSAGE_TITLE}</b></th>
 			</tr>
 			<tr>
-				<td class="row2" width="100%" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
+				<td class="row2" align="center"><span class="gen">{MESSAGE_TEXT}</span></td>
 			</tr>
 		</table></td>
 	</tr>
 </table>
+
+<br clear="all" />