diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php
index 10cd30b178..21f46582e3 100644
--- a/app/calls/call_edit.php
+++ b/app/calls/call_edit.php
@@ -383,7 +383,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	//redirect the user
 		$_SESSION["message"] = $text['confirm-update'];
-		header("Location: ".PROJECT_PATH."/core/user_settings/user_dashboard.php");
+		header("Location: ".$_REQUEST['return_url']);
 		return;
 
 } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0)
@@ -496,13 +496,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 //show the content
 	echo "<form method='post' name='frm' action=''>\n";
+	echo "<input type='hidden' name='return_url' value='".$_SERVER["HTTP_REFERER"]."'>\n";
+
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
-	echo "<td align='left' width='30%' nowrap='nowrap'>\n";
+	echo "<td align='left' width='30%' nowrap='nowrap' valign='top'>\n";
 	echo "	<b>".$text['title']."</b>\n";
 	echo "</td>\n";
-	echo "<td width='70%' align='right'>\n";
-	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='calls.php'\" value='".$text['button-back']."'>\n";
+	echo "<td width='70%' align='right' valign='top'>\n";
+	echo "	<input type='button' class='btn' name='' alt='".$text['button-back']."' onclick=\"window.location='".$_SERVER["HTTP_REFERER"]."'\" value='".$text['button-back']."'>\n";
 	echo "	<input type='submit' name='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
 	echo "</tr>\n";
diff --git a/app/destinations/destination_edit.php b/app/destinations/destination_edit.php
index d92d7daf3a..8618707485 100644
--- a/app/destinations/destination_edit.php
+++ b/app/destinations/destination_edit.php
@@ -510,12 +510,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 	echo "<tr>\n";
 	if ($action == "add") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-destination-add']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['header-destination-add']."</b></td>\n";
 	}
 	if ($action == "update") {
-		echo "<td align='left' width='30%' nowrap='nowrap'><b>".$text['header-destination-edit']."</b></td>\n";
+		echo "<td align='left' width='30%' nowrap='nowrap' valign='top'><b>".$text['header-destination-edit']."</b></td>\n";
 	}
-	echo "<td width='70%' align='right'>";
+	echo "<td width='70%' align='right' valign='top'>";
 	echo "	<input type='button' class='btn' name='' alt='back' onclick=\"window.location='destinations.php'\" value='".$text['button-back']."'>";
 	echo "	<input type='submit' class='btn' value='".$text['button-save']."'>\n";
 	echo "</td>\n";
diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php
index b79d444818..273c047b94 100644
--- a/app/destinations/destinations.php
+++ b/app/destinations/destinations.php
@@ -50,7 +50,7 @@ else {
 //show the content
 	echo "<table width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
 	echo "	<tr>\n";
-	echo "		<td width='50%' align='left' nowrap='nowrap'><b>".$text['header-destinations']."</b></td>\n";
+	echo "		<td width='50%' align='left' nowrap='nowrap' valign='top'><b>".$text['header-destinations']."</b></td>\n";
 	echo "			<form method='get' action=''>\n";
 	echo "			<td width='50%' align='right'>\n";
 	if (permission_exists('destination_show_all')) {
@@ -65,7 +65,7 @@ else {
 	echo "			</form>\n";
 	echo "	</tr>\n";
 	echo "	<tr>\n";
-	echo "		<td align='left' colspan='2'>\n";
+	echo "		<td align='left' colspan='2' valign='top'>\n";
 	echo "			".$text['description-destinations']."<br /><br />\n";
 	echo "		</td>\n";
 	echo "	</tr>\n";
diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php
index 50d7ca8ed6..79e97f4d8b 100644
--- a/core/user_settings/user_dashboard.php
+++ b/core/user_settings/user_dashboard.php
@@ -67,7 +67,7 @@
 	require_once "resources/header.php";
 	$document['title'] = $text['title-user_dashboard'];
 
-	echo "<br><b>".$text['header-user_dashboard']."</b><br>";
+	echo "<b>".$text['header-user_dashboard']."</b><br>";
 	echo $text['description-user_dashboard'];