Index: trunk/wb/languages/EN.php
===================================================================
--- trunk/wb/languages/EN.php	(revision 333)
+++ trunk/wb/languages/EN.php	(revision 334)
@@ -224,6 +224,7 @@
 $TEXT['TARGET'] = 'Target';
 $TEXT['NEW_WINDOW'] = 'New Window';
 $TEXT['SAME_WINDOW'] = 'Same Window';
+$TEXT['TOP_FRAME'] = 'Top Frame';
 $TEXT['PAGE_LEVEL_LIMIT'] = 'Page Level Limit';
 $TEXT['SUCCESS'] = 'Success';
 $TEXT['ERROR'] = 'Error';
Index: trunk/wb/admin/pages/settings.php
===================================================================
--- trunk/wb/admin/pages/settings.php	(revision 333)
+++ trunk/wb/admin/pages/settings.php	(revision 334)
@@ -364,11 +364,18 @@
 	$template->set_var('SEARCHING_DISABLED', ' selected');
 }
 // Select what the page target is
-if($results_array['target'] == '_top') {
-	$template->set_var('TOP_SELECTED', ' selected');
-} elseif($results_array['target'] == '_blank') {
-	$template->set_var('BLANK_SELECTED', ' selected');
+switch ($results_array['target']) {
+	case '_top':
+		$template->set_var('TOP_SELECTED', ' selected');
+		break;
+	case '_self':
+		$template->set_var('SELF_SELECTED', ' selected');
+		break;
+	case '_blank':
+		$template->set_var('BLANK_SELECTED', ' selected');
+		break;
 }
+	
 
 // Insert language text
 $template->set_var(array(
@@ -394,6 +401,7 @@
 								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT'],
 								'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'],
 								'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'],
+								'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'],
 								'TEXT_ADMINISTRATORS' => $TEXT['ADMINISTRATORS'],
 								'TEXT_PRIVATE_VIEWERS' => $TEXT['PRIVATE_VIEWERS'],
 								'TEXT_REGISTERED_VIEWERS' => $TEXT['REGISTERED_VIEWERS'],
Index: trunk/wb/admin/pages/settings.html
===================================================================
--- trunk/wb/admin/pages/settings.html	(revision 333)
+++ trunk/wb/admin/pages/settings.html	(revision 334)
@@ -129,9 +129,9 @@
 	</td>
 	<td>
 		<select name="target" style="WIDTH: 100%;" value="{TARGET}" />
-			<option value="_top">{TEXT_PLEASE_SELECT}...</option>
 			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
-			<option value="_top"{TOP_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
 		</select>
 	</td>
 </tr>
Index: trunk/wb/modules/menu_link/modify.html
===================================================================
--- trunk/wb/modules/menu_link/modify.html	(revision 333)
+++ trunk/wb/modules/menu_link/modify.html	(revision 334)
@@ -19,10 +19,10 @@
 		{TEXT_TARGET}:
 	</td>
 	<td>
-		<select name="target" style="width: 100%;" value="{TARGET}" />
-			<option value="_top">{TEXT_PLEASE_SELECT}...</option>
+		<select name="target" style="WIDTH: 100%;" value="{TARGET}" />
 			<option value="_blank"{BLANK_SELECTED}>{TEXT_NEW_WINDOW}</option>
-			<option value="_top"{TOP_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_self"{SELF_SELECTED}>{TEXT_SAME_WINDOW}</option>
+			<option value="_top"{TOP_SELECTED}>{TEXT_TOP_FRAME}</option>
 		</select>
 	</td>
 </tr>
Index: trunk/wb/modules/menu_link/modify.php
===================================================================
--- trunk/wb/modules/menu_link/modify.php	(revision 333)
+++ trunk/wb/modules/menu_link/modify.php	(revision 334)
@@ -44,6 +44,7 @@
 								'TEXT_TARGET' => $TEXT['TARGET'],
 								'TEXT_NEW_WINDOW' => $TEXT['NEW_WINDOW'],
 								'TEXT_SAME_WINDOW' => $TEXT['SAME_WINDOW'],
+								'TEXT_TOP_FRAME' => $TEXT['TOP_FRAME'],
 								'TEXT_SAVE' => $TEXT['SAVE'],
 								'TEXT_CANCEL' => $TEXT['CANCEL'],
 								'TEXT_PLEASE_SELECT' => $TEXT['PLEASE_SELECT']
@@ -50,11 +51,17 @@
 								)
 						);
 
-// Select target
-if($target == '_blank') {
-	$template->set_var('BLANK_SELECTED', ' selected');
-} elseif($target == '_top') {
-	$template->set_var('TOP_SELECTED', ' selected');
+// Select what the page target is
+switch ($target) {
+	case '_top':
+		$template->set_var('TOP_SELECTED', ' selected');
+		break;
+	case '_self':
+		$template->set_var('SELF_SELECTED', ' selected');
+		break;
+	case '_blank':
+		$template->set_var('BLANK_SELECTED', ' selected');
+		break;
 }
 
 // Parse template object