diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php
index 8f1cd401fd..3b821bf6b1 100644
--- a/app/call_centers/call_center_agent_status.php
+++ b/app/call_centers/call_center_agent_status.php
@@ -173,7 +173,7 @@ else {
 	echo $text['description-call_center_agent_status']."<br /><br />\n";
 	echo "</td>\n";
 	echo "</tr>\n";
-	echo "</tr></table>\n";
+	echo "</table>\n";
 
 	$c = 0;
 	$row_style["0"] = "row_style0";
@@ -185,11 +185,11 @@ else {
 	echo "<th>".$text['label-agent']."</th>\n";
 	echo "<th>".$text['label-status']."</th>\n";
 	echo "<th>".$text['label-options']."</th>\n";
-	echo "<tr>\n";
+	echo "</tr>\n";
 	$x = 0;
 	foreach($agents as $row) {
 		$str = '';
-		$str .= "<tr >\n";
+		$str .= "<tr>\n";
 		$str .= "	<td valign='middle' class='".$row_style[$c]."'>".$row['agent_name']."&nbsp;</td>\n";
 		$str .= "	<td valign='middle' class='".$row_style[$c]."'>".$row['agent_status']."&nbsp;</td>\n";
 		$str .= "	<td valign='middle' class='".$row_style[$c]."'>";
diff --git a/app/calls/calls.php b/app/calls/calls.php
index 76b5bfdcd2..adf96a23df 100644
--- a/app/calls/calls.php
+++ b/app/calls/calls.php
@@ -121,7 +121,6 @@ else {
 	echo "</div>\n";
 
 	echo "<div style='float: right; margin-bottom: 10px;'>";
-	echo "	<form method='get' action=''>\n";
 	echo "	<table border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "  	<tr>\n";
 	echo "			<td style='vertical-align: top; white-space: nowrap;'>\n";
@@ -129,8 +128,10 @@ else {
 		echo "			<input id='btn_viewall_callrouting' type='button' class='btn' value='".$text['button-view_all']."' onclick=\"document.location.href='".PROJECT_PATH."/app/calls/calls.php';\">";
 	}
 	if (!$is_included) {
+		echo "				<form method='get' action=''>\n";
 		echo "				<input type='text' class='txt' style='width: 150px' name='search' value='".$search."'>";
 		echo "				<input type='submit' class='btn' name='submit' value='".$text['button-search']."'>";
+		echo "				</form>\n";
 		if ($paging_controls_mini != '') {
 			echo 			"<span style='margin-left: 15px;'>".$paging_controls_mini."</span>\n";
 		}
diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 4cebac797f..d48a141b2b 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -158,7 +158,7 @@ require_once "resources/paging.php";
 	if (!$is_included) {
 		echo th_order_by('ring_group_description', $text['label-description'], $order_by, $order);
 	}
-	echo "<tr>\n";
+	echo "</tr>\n";
 
 	$c = 0;
 	if ($result_count > 0) {
@@ -183,7 +183,6 @@ require_once "resources/paging.php";
 		unset($sql, $result, $row_count);
 	}
 
-	echo "<tr>\n";
 	echo "</table>";
 	echo "<br>";
 
diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php
index b0fa7b8b41..3d339b4f4b 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -382,7 +382,7 @@
 						if (is_uuid($voicemail_uuid)) {
 							$tr_link = "href='".PROJECT_PATH."/app/voicemails/voicemail_messages.php?id=".$voicemail_uuid."'";
 							$hud[$n]['html'] .= "<tr ".$tr_link." style='cursor: pointer;'>";
-							$hud[$n]['html'] .= "	<td class='".$row_style[$c]." hud_text'><a href='".PROJECT_PATH."/app/voicemails/voicemail_messages.php?id=".$voicemail_uuid."'>".$row['ext']."</td>";
+							$hud[$n]['html'] .= "	<td class='".$row_style[$c]." hud_text'><a href='".PROJECT_PATH."/app/voicemails/voicemail_messages.php?id=".$voicemail_uuid."'>".$row['ext']."</a></td>";
 							$hud[$n]['html'] .= "	<td class='".$row_style[$c]." hud_text' style='text-align: center;'>".$row['new']."</td>";
 							$hud[$n]['html'] .= "	<td class='".$row_style[$c]." hud_text' style='text-align: center;'>".$row['total']."</td>";
 							$hud[$n]['html'] .= "</tr>";
diff --git a/themes/default/template.php b/themes/default/template.php
index 653de36bfa..8cd9ffa8b6 100644
--- a/themes/default/template.php
+++ b/themes/default/template.php
@@ -1921,17 +1921,7 @@
 				</tr>
 			</table>
 			<div id='footer' style='width: 100%; margin-bottom: 60px;'>
-				<span class='footer'>
-				<?php
-				if (isset($_SESSION['theme']['footer']['text'])) {
-					echo $_SESSION['theme']['footer']['text'];
-				}
-				else {
-					echo "					";
-					echo "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")."<a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>".$text['theme-label-all_rights_reserved'];
-				}
-				?>
-			</span>
+				<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")."<a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>".$text['theme-label-all_rights_reserved']; ?></span>
 			</div>
 		</div>
 
@@ -1954,17 +1944,8 @@
 				</tr>
 				<tr>
 					<td style='width: 100%; height: 40px; vertical-align: bottom;'>
-						<div id='footer' style='width: 100%;'><span class='footer'>
-							<?php
-							if (isset($_SESSION['theme']['footer']['text'])) {
-								echo $_SESSION['theme']['footer']['text'];
-							}
-							else {
-								echo "							";
-								echo "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")."<a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>".$text['theme-label-all_rights_reserved'];
-							}
-							?>
-							</span>
+						<div id='footer' style='width: 100%;'>
+							<span class='footer'><?php echo (isset($_SESSION['theme']['footer']['text'])) ? $_SESSION['theme']['footer']['text'] : "&copy; ".$text['theme-label-copyright']." 2008 - ".date("Y")."<a href='http://www.fusionpbx.com' class='footer' target='_blank'>fusionpbx.com</a>".$text['theme-label-all_rights_reserved']; ?></span>
 						</div>
 					</td>
 				</tr>
@@ -1976,4 +1957,4 @@
 	?>
 
 </body>
-</html>
+</html>
\ No newline at end of file