diff --git a/app/vars/vars.php b/app/vars/vars.php
index 0190c729c1..adb7395cc8 100644
--- a/app/vars/vars.php
+++ b/app/vars/vars.php
@@ -116,7 +116,7 @@ else {
 				$c=0;
 				if (strlen($prev_var_cat) > 0) {
 					echo "<tr>\n";
-					echo "<td colspan='5'>\n";
+					echo "<td colspan='6'>\n";
 					echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 					echo "	<tr>\n";
 					echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
@@ -149,7 +149,7 @@ else {
 			}
 			echo "	</td>\n";
 			echo "	<td valign='top' align='left' class='".$row_style[$c]."'>".substr($var_value,0,30)."</td>\n";
-			echo "	<td valign='top' align='left' class='row_stylebg'>".$var_hostname."&nbsp;</td>\n";
+			echo "	<td valign='top' align='left' class='row_stylebg'>".$row['var_hostname']."&nbsp;</td>\n";
 			echo "	<td valign='top' align='left' class='".$row_style[$c]."'>";
 			echo "		<a href='?id=".$row['var_uuid']."&enabled=".(($row['var_enabled'] == 'true') ? 'false' : 'true')."'>".(($row['var_enabled'] == 'true') ? $text['option-true'] : $text['option-false'])."</a>";
 			echo "	</td>\n";
@@ -177,7 +177,7 @@ else {
 	echo "	<table width='100%' cellpadding='0' cellspacing='0'>\n";
 	echo "	<tr>\n";
 	echo "		<td width='33.3%' nowrap='nowrap'>&nbsp;</td>\n";
-	echo "		<td colspan='3' align='center' nowrap='nowrap'>$paging_controls</td>\n";
+	echo "		<td align='center' nowrap='nowrap'>$paging_controls</td>\n";
 	echo "		<td width='33.3%' class='list_control_icons'>";
 	if (permission_exists('var_add')) {
 		echo "<a href='var_edit.php' alt='".$text['button-add']."'>$v_link_label_add</a>";