diff --git a/app/ring_groups/ring_group_forward.php b/app/ring_groups/ring_group_forward.php
index 31a64c8d10..e4c9da4028 100644
--- a/app/ring_groups/ring_group_forward.php
+++ b/app/ring_groups/ring_group_forward.php
@@ -136,9 +136,14 @@ require_once "resources/paging.php";
 	$result_count = count($result);
 	unset ($prep_statement, $sql);
 
+	echo "<div style='float: right;'>\n";
 	if ($num_rows > 10) {
-		echo "	<div style='float: right;'><input id='btn_viewall_ringgroups' type='button' class='btn' value='".$text['button-view_all']."' onclick=\"document.location.href='".PROJECT_PATH."/app/ring_groups/ring_group_forward.php';\"></div>\n";
+		echo "	<input id='btn_viewall_ringgroups' type='button' class='btn' value='".$text['button-view_all']."' onclick=\"document.location.href='".PROJECT_PATH."/app/ring_groups/ring_group_forward.php';\">\n";
 	}
+	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>";
+	echo "</div>\n";
+	
+	
 	echo "	<div style='float: left;'>";
 	echo "		<b>".$text['header-ring-group-forward']."</b><br />";
 	if (!$is_included) {
@@ -172,7 +177,7 @@ require_once "resources/paging.php";
 			echo "			<option value='false'>".$text['option-disabled']."</option>";
 			echo "			<option value='true' ".(($row["ring_group_forward_enabled"] == 'true') ? "selected='selected'" : null).">".$text['option-enabled']."</option>";
 			echo "		</select>";
-			echo 		"<input class='formfld' style='min-width: 95px;' type='text' name='ring_group_forward_destination[".$row['ring_group_uuid']."]' id='destination' placeholder=\"".$text['label-forward_destination']."\" maxlength='255' value=\"".$row["ring_group_forward_destination"]."\">";
+			echo "		<input class='formfld' style='width: 95px;' type='text' name='ring_group_forward_destination[".$row['ring_group_uuid']."]' id='destination' placeholder=\"".$text['label-forward_destination']."\" maxlength='255' value=\"".$row["ring_group_forward_destination"]."\">";
 			echo "	</td>\n";
 			if (!$is_included) {
 				echo "	<td valign='top' class='row_stylebg tr_link_void' ".$onclick.">".$row['ring_group_description']."&nbsp;</td>\n";
@@ -186,11 +191,6 @@ require_once "resources/paging.php";
 	echo "</table>";
 	echo "<br>";
 
-	if ($result_count > 0) {
-		echo "<div style='float: right;'><input type='submit' class='btn' value='".$text['button-save']."'></div>\n";
-		echo "<br><br>";
-	}
-
 	echo "</form>";
 
 	if (!$is_included) {
@@ -202,4 +202,4 @@ require_once "resources/paging.php";
 	if (!$is_included) {
 		require_once "resources/footer.php";
 	}
-?>
\ No newline at end of file
+?>