diff --git a/code/RelatedPageLink.php b/code/RelatedPageLink.php
index b7f15c9..7bf800d 100644
--- a/code/RelatedPageLink.php
+++ b/code/RelatedPageLink.php
@@ -59,11 +59,24 @@ class RelatedPageLink extends DataObject {
 		return $fields;
 	}
 	
-	function RelatedPageAdminLink() {
-		return '<a href="admin/show/' . $this->RelatedPage()->ID . '" class="cmsEditlink">' . Convert::raw2xml($this->RelatedPage()->Title) . '</a>';
+	function RelatedPageAdminLink($master = false) {
+		$page = $master ? Dataobject::get_by_id("SiteTree", $this->MasterPageID)
+			: Dataobject::get_by_id("SiteTree", $this->RelatedPageID);
+		$otherPage = $master ? Dataobject::get_by_id("SiteTree", $this->RelatedPageID)
+			: Dataobject::get_by_id("SiteTree", $this->MasterPageID);
+		if(!$page) return;
+		
+		// Use cmsEditlink only when moving between different pages in the same subsite.
+		$classClause = ($page->SubsiteID == $otherPage->SubsiteID) ? ' class="cmsEditlink"' : '';
+		return '<a href="admin/show/' . $page->ID . "\"$classClause>" . Convert::raw2xml($page->Title) . '</a>';
 	}
-	function AbsoluteLink() {
-		$url = $this->RelatedPage()->AbsoluteLink();
+	function AbsoluteLink($master = false) {
+		$page = $master ? Dataobject::get_by_id("SiteTree", $this->MasterPageID)
+			: Dataobject::get_by_id("SiteTree", $this->RelatedPageID);
+		if(!$page) return;
+		
+
+		$url = $page->AbsoluteLink();
 		return '<a href="' . Convert::raw2att($url) .'" class="externallink">' . Convert::raw2xml($url) . '</a>';
 	}
 
diff --git a/code/SiteTreeSubsites.php b/code/SiteTreeSubsites.php
index 0413ce8..5df9b72 100644
--- a/code/SiteTreeSubsites.php
+++ b/code/SiteTreeSubsites.php
@@ -188,27 +188,24 @@ class SiteTreeSubsites extends SiteTreeDecorator {
 		$related->setPermissions(array('add', 'edit', 'delete'));
 		
 		if($reverse) {
-			$text = '<p>In addition, this page is marked as related by the following pages: </p><ul>';
+			$text = '<p>In addition, this page is marked as related by the following pages: </p><p>';
 			foreach($reverse as $rpage) {
-				$text .= '<ul><a href="admin/show/' . $rpage->ID . '" class="cmsEditlink">' . $rpage->Title . '</a> '.$rpage->AbsoluteLink().'</ul>';
+				$text .= $rpage->RelatedPageAdminLink(true) . " - " . $rpage->AbsoluteLink(true) . "<br />\n";
 			}
-			$text .= '</ul>';
+			$text .= '</p>';
 			
 			$tab->push(new LiteralField('ReverseRelated', $text));
 		}
 	
 	}
 	
+	/**
+	 * Returns the RelatedPageLink objects that are reverse-associated with this page.
+	 */
 	function ReverseRelated() {
-		$return = new DataObjectSet();
-		$links = DataObject::get('RelatedPageLink', 'RelatedPageID = ' . $this->owner->ID);
-		if($links) foreach($links as $link) {
-			if($link->MasterPage()->exists()) {
-				$return->push($link->MasterPage());
-			}
-		}
-		
-		return $return->Count() > 0 ? $return : false;
+		return DataObject::get('RelatedPageLink', 'RelatedPageID = ' . $this->owner->ID,'',
+			"INNER JOIN \"SiteTree\" ON \"SiteTree\".\"ID\" = \"RelatedPageLink\".\"MasterPageID\""
+		);
 	}
 	
 	function NormalRelated() {