diff --git a/templates/list-admin.tpl b/templates/list-admin.tpl
index 83584d8..3080a20 100644
--- a/templates/list-admin.tpl
+++ b/templates/list-admin.tpl
@@ -1,25 +1,22 @@
 <?php 
 if (count($list_admins) > 0) {
-
 	echo "<table id=\"admin_table\">\n";
-	echo "	<tr class=\"header\">\n";
-	echo "		<td>" . $LANG['AdminList_admin_username'] . "</td>\n";
-	echo "		<td>" . $LANG['AdminList_admin_count'] . "</td>\n";
-	echo "		<td>" . $LANG['List_created'] . "</td>\n";
-	echo "		<td>" . $LANG['List_modified'] . "</td>\n";
-	echo "		<td colspan=\"2\">&nbsp;</td>\n";
-	echo "	</tr>\n";
-
+	echo "<tr class=\"header\">\n";
+	echo "<td>" . $LANG['AdminList_admin_username'] . "</td>\n";
+	echo "<td>" . $LANG['AdminList_admin_count'] . "</td>\n";
+	echo "<td>" . $LANG['List_created'] . "</td>\n";
+	echo "<td>" . $LANG['List_modified'] . "</td>\n";
+	echo "<td colspan=\"2\">&nbsp;</td>\n";
+	echo "</tr>\n";
         foreach ($list_admins as $row) {
-
-		echo "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
-		echo "		<td><a href=\"list-domain.php?username=" . $row['username'] . "\">" . $row['username'] . "</a></td>";
-		echo "		<td>" . $row['domain_count'] . "</td>";
-		echo "		<td>" . $row['created'] . "</td>";
-		echo "		<td>" . $row['modified'] . "</td>";
-		echo "		<td><a href=\"admin.php?action=edit&username=" . $row['username'] . "\">" . $LANG['edit'] . "</a></td>";
-		echo "		<td><a href=\"delete.php?table=admin&where=username&delete=" . $row['username'] . "\" onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['AdminList_admin_username'] . ": " . $row['username'] . "')\">" . $LANG['del'] . "</a></td>";
-		echo "	</tr>\n";
+		echo "<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">\n";
+		echo "<td><a href=\"list-domain.php?username=" . $row['username'] . "\">" . $row['username'] . "</a></td>";
+		echo "<td>" . $row['domain_count'] . "</td>";
+		echo "<td>" . $row['created'] . "</td>";
+		echo "<td>" . $row['modified'] . "</td>";
+		echo "<td><a href=\"admin.php?action=edit&username=" . $row['username'] . "\">" . $LANG['edit'] . "</a></td>";
+		echo "<td><a href=\"delete.php?table=admin&where=username&delete=" . $row['username'] . "\" onclick=\"return confirm ('" . $LANG['confirm'] . $LANG['AdminList_admin_username'] . ": " . $row['username'] . "')\">" . $LANG['del'] . "</a></td>";
+		echo "</tr>\n";
 	}
 	echo "</table>\n";
 }
diff --git a/templates/list-domain.tpl b/templates/list-domain.tpl
index 57a1f59..74027ee 100644
--- a/templates/list-domain.tpl
+++ b/templates/list-domain.tpl
@@ -40,8 +40,7 @@ if (count($list_domains) > 0) {
 		echo "<td>" . $row['modified'] . "</td>";
 		if ($ROLE == ADMIN_ROLE) echo "<td><a href=\"domain.php?action=edit&domain=" . $row['domain'] . "\">" . $LANG['edit'] . "</a></td>";
 		if ($ROLE == ADMIN_ROLE) echo "<td><a href=\"delete.php?table=domain&domain=" . $row['domain'] . "\" onclick=\"return confirm ('" . $LANG['confirm_domain'] . $LANG['List_domain_domain'] . ": " . $row['domain'] . "')\">" . $LANG['del'] . "</a></td>";
-		echo "	</tr>";
+		echo "</tr>";
 	}
 echo "</table>";
 }
-
diff --git a/templates/list-virtual.tpl b/templates/list-virtual.tpl
index 557aabb..7f2647f 100644
--- a/templates/list-virtual.tpl
+++ b/templates/list-virtual.tpl
@@ -53,7 +53,6 @@ if (count($list_alias) > 0) {
 	echo "<td>" . $LANG['List_modified'] . "</td>";
 	echo "<td colspan=\"2\">&nbsp;</td>";
 	echo "</tr>";
-
         foreach ($list_alias as $row) {
 			echo "<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">";
 			echo "<td>" . $row['address'] . "</td>";
@@ -77,7 +76,6 @@ if (count($list_mailbox) > 0) {
 	echo "<td>" . $LANG['List_modified'] . "</td>";
 	echo "<td colspan=\"2\">&nbsp;</td>";
 	echo "</tr>";
-
         foreach ($list_mailbox as $row) {
 			echo "<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">";
 			echo "<td>" . $row['username'] . "</td>";
diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl
index fb5f032..2b335ee 100644
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@@ -20,7 +20,7 @@
 		<td>&nbsp;</td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Sendmail_body'] . ":" ?></td>
+		<td><?php echo $LANG['Sendmail_body'] . ":"; ?></td>
 		<td>
 		<textarea class="flat" rows="10" cols="60" name="body"><?php echo $LANG['Sendmail_body_text']; ?></textarea>
 		</td>
diff --git a/templates/users_password.tpl b/templates/users_password.tpl
index 12742ac..156ad1f 100644
--- a/templates/users_password.tpl
+++ b/templates/users_password.tpl
@@ -17,7 +17,7 @@
 		<td><input class="flat" type="password" name="fPassword" ></td>
 	</tr>
 	<tr>
-		<td><?php echo $LANG['Password_password2'].":" ?></td>
+		<td><?php echo $LANG['Password_password2'] . ":"; ?></td>
 		<td><input class="flat" type="password" name="fPassword2" /></td>
 	</tr>
 	<tr>
diff --git a/templates/viewlog.tpl b/templates/viewlog.tpl
index d6b6755..de9c3ee 100644
--- a/templates/viewlog.tpl
+++ b/templates/viewlog.tpl
@@ -17,26 +17,25 @@ if (count($list_domains) > 0) {
 <?php 
 if (count($log ?? array()) > 0) {
 	echo "<table id=\"log_table\">";
-	echo "	<tr>";
-	echo "		<td colspan=\"5\"><h3>".$LANG['Viewlog_welcome']." ".$domain."</h3></td>";
-	echo "	</tr>";
-	echo "	<tr class=\"header\">";
-	echo "		<td>" . $LANG['Viewlog_timestamp'] . "</td>";
-	echo "		<td>" . $LANG['Viewlog_username'] . "</td>";
-	echo "		<td>" . $LANG['Viewlog_domain'] . "</td>";
-	echo "		<td>" . $LANG['Viewlog_action'] . "</td>";
-	echo "		<td>" . $LANG['Viewlog_data'] . "</td>";
-	echo "	</tr>";
-
+	echo "<tr>";
+	echo "<td colspan=\"5\"><h3>" . $LANG['Viewlog_welcome'] . " " . $domain . "</h3></td>";
+	echo "</tr>";
+	echo "<tr class=\"header\">";
+	echo "<td>" . $LANG['Viewlog_timestamp'] . "</td>";
+	echo "<td>" . $LANG['Viewlog_username'] . "</td>";
+	echo "<td>" . $LANG['Viewlog_domain'] . "</td>";
+	echo "<td>" . $LANG['Viewlog_action'] . "</td>";
+	echo "<td>" . $LANG['Viewlog_data'] . "</td>";
+	echo "</tr>";
 	foreach ($log as $row) {
 		if (strlen($row['data']) > 35) $row['data'] = substr($row['data'], 0, 35) . " ...";
-		echo "	<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">";
-		echo "		<td nowrap>" . $row['timestamp'] . "</td>";
-		echo "		<td nowrap>" . $row['username'] . "</td>";
-		echo "		<td nowrap>" . $row['domain'] . "</td>";
-		echo "		<td nowrap>" . $row['action'] . "</td>";
-		echo "		<td nowrap>" . $row['data'] . "</td>";
-		echo "	</tr>";
+		echo "<tr class=\"hilightoff\" onMouseOver=\"className='hilighton';\" onMouseOut=\"className='hilightoff';\">";
+		echo "<td nowrap>" . $row['timestamp'] . "</td>";
+		echo "<td nowrap>" . $row['username'] . "</td>";
+		echo "<td nowrap>" . $row['domain'] . "</td>";
+		echo "<td nowrap>" . $row['action'] . "</td>";
+		echo "<td nowrap>" . $row['data'] . "</td>";
+		echo "</tr>";
 	}
 	echo "</table>";
 	echo "<p />";