diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php
index ae2751838..102731fea 100644
--- a/e107_admin/cpage.php
+++ b/e107_admin/cpage.php
@@ -280,6 +280,7 @@ class page_admin_ui extends e_admin_ui
 		protected $batchCopy 	= true;	
 		protected $sortField	= 'page_order';
 		protected $orderStep 	= 10;
+		protected $itemRoute 	= 'page/view?page_id=page_id&page_sef=page_sef';
 	//		protected $listSorting = true; 
 		
 		protected $fields = array(
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 9ca8cc81b..87156a8d0 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2224,12 +2224,12 @@ class e_admin_controller_ui extends e_admin_controller
 	protected $listOrder = null;
 	
 	/**
-	 * @var field containing the order number
+	 * @var string field containing the order number
 	 */
 	protected $sortField = null;
 	
 	/**
-	 * @var reorder step
+	 * @var int reorder step
 	 */
 	protected $orderStep = 1;
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 0436f1170..cda33517c 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2012,7 +2012,7 @@ class e_form
 	
 				$value = ($value ? vartrue($parms['pre']).defset($value, $value).vartrue($parms['post']) : '');
 				
-				// Inline Editing. //FIXME - doesn't save data
+				// Inline Editing.  
 				if(!vartrue($attributes['noedit']) && vartrue($parms['editable']) && !vartrue($parms['link'])) // avoid bad markup, better solution coming up
 				{
 					$mode = preg_replace('/[^\w]/', '', vartrue($_GET['mode'], ''));
@@ -2048,12 +2048,12 @@ class e_form
 				{
 					$value = $tp->htmlwrap($value, (int)$parms['wrap'], varset($parms['wrapChar'], ' '));
 				}
-				if(vartrue($parms['link']) && $id && is_numeric($id) ) 
+				if(vartrue($parms['link']) && $id && is_numeric($id)) 
 				{
 					$link = str_replace('[id]',$id,$parms['link']);
 					$link = $tp->replaceConstants($link); // SEF URL is not important since we're in admin.
-					$dialog = vartrue($parms['dialog']) ? "e-dialog" : "";
-					$value = "<a class='e-tip {$dialog}' href='".$link."' title='Quick View'>".$value."</a>";
+					$dialog = vartrue($parms['dialog']) ? " e-dialog" : "";
+					$value = "<a class='e-tip{$dialog}' href='".$link."' title='Quick View'>".$value."</a>";
 				}
 				
 				if(!vartrue($attributes['noedit']) && vartrue($parms['editable']) && !vartrue($parms['link'])) // avoid bad markup, better solution coming up
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 80657ade3..60a5f01aa 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -1535,7 +1535,11 @@ class navigation_shortcodes extends e_shortcode
 
 	function sc_link_url($parm='')
 	{
-		if($this->var['link_url'][0] != "{" && strpos($this->var['link_url'],"://")===false)
+		if(strpos($this->var['link_url'], e_HTTP) === 0)
+		{
+			$url = "{e_BASE}".substr($this->var['link_url'], strlen(e_HTTP));
+		}
+		elseif($this->var['link_url'][0] != "{" && strpos($this->var['link_url'],"://")===false)
 		{
 			$url = "{e_BASE}".$this->var['link_url']; // Add e_BASE to links like: 'news.php' or 'contact.php' 	
 		}
diff --git a/e107_plugins/page/e_sitelink.php b/e107_plugins/page/e_sitelink.php
index 1b4fecf9f..1533c3949 100644
--- a/e107_plugins/page/e_sitelink.php
+++ b/e107_plugins/page/e_sitelink.php
@@ -52,9 +52,7 @@ class page_sitelinks // include plugin-folder in the name.
 			$sublinks[$pid][] = array(
 				'link_id'			=> $row['page_id'],
 				'link_name'			=> $row['page_title'],
-			//	'link_url'			=> vartrue($row['page_sef'],'page.php?id='.$row['page_id']), 
-				'link_url'			=> 'page.php?id='.$row['page_id'], 
-			//	'link_url'			=> e107::getUrl()->create('page/view', $row, 'allow=page_id,page_sef'), //XXX FIXME - bad links created. 
+				'link_url'			=> e107::getUrl()->create('page/view', $row, array('allow' => 'page_sef,page_title,page_id')),
 				'link_description'	=> '',
 				'link_button'		=> '',
 				'link_category'		=> '',