diff --git a/docs/upgrades/packages-7.6.4/root_import_account.wgpkg b/docs/upgrades/packages-7.6.4/root_import_account.wgpkg
index 250e2e626..afb5c559f 100644
Binary files a/docs/upgrades/packages-7.6.4/root_import_account.wgpkg and b/docs/upgrades/packages-7.6.4/root_import_account.wgpkg differ
diff --git a/docs/upgrades/upgrade_7.6.3-7.6.4.pl b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
index ad51e6c68..ac002de03 100644
--- a/docs/upgrades/upgrade_7.6.3-7.6.4.pl
+++ b/docs/upgrades/upgrade_7.6.3-7.6.4.pl
@@ -421,7 +421,7 @@ sub upgradeAccount {
     
     #Add the settings for the friends module
     $setting->add("friendsStyleTemplateId",""); #Use the userStyle by default
-    $setting->add("friendsLayoutTempalteId","N716tpSna0iIQTKxS4gTWA");
+    $setting->add("friendsLayoutTempalteId","zrNpGbT3odfIkg6nFSUy8Q");
     $setting->add("friendsViewTemplateId","1Yn_zE_dSiNuaBGNLPbxtw");
     $setting->add("friendsEditTemplateId","AZFU33p0jpPJ-E6qLSWZng");
     $setting->add("friendsSendRequestTemplateId","AGJBGviWGAwjnwziiPjvDg");
diff --git a/lib/WebGUI/Account.pm b/lib/WebGUI/Account.pm
index 8da4c087a..db04aadba 100644
--- a/lib/WebGUI/Account.pm
+++ b/lib/WebGUI/Account.pm
@@ -57,7 +57,7 @@ sub appendCommonVars {
     $var->{'user_member_since'} = $user->dateCreated;
     $var->{'view_profile_url' } = $user->getProfileUrl;
     $var->{'root_url'         } = $session->url->page("op=account");
-    #$var->{'back_url'          } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'}
+    $var->{'back_url'         } = $session->url->getBackToSiteURL;
 }
 
 
diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm
index d767e0453..ef72551e0 100644
--- a/lib/WebGUI/Account/Friends.pm
+++ b/lib/WebGUI/Account/Friends.pm
@@ -45,11 +45,12 @@ sub appendCommonVars {
     my $user    = $session->user;
     my $pageUrl = $session->url->page;
 
-    $var->{'user_full_name'    } = $user->getWholeName;
-    $var->{'user_member_since' } = $user->dateCreated;
-    $var->{'view_profile_url'  } = $user->getProfileUrl($pageUrl);
-    $var->{'edit_profile_url'  } = $session->url->page("op=account");
-    $var->{'back_url'          } = $session->env->get("HTTP_REFERER") || $var->{'view_profile_url'}
+    $self->SUPER::appendCommonVars($var);
+
+    $var->{'is_edit'         } = $self->uid eq "";
+    $var->{'can_edit_friends'} = ($self->uid eq "" || $self->uid eq $session->user->userId);
+    $var->{'edit_friends_url'} = $self->getUrl("module=friends;do=view");
+    $var->{'view_friends_url'} = $self->getUrl("module=friends;do=view;uid=".$session->user->userId);
 }
 
 #-------------------------------------------------------------------
@@ -225,7 +226,7 @@ This method returns the template ID for the account layout.
 
 sub getLayoutTemplateId {
     my $self = shift;
-    return $self->session->setting->get("friendsLayoutTempalteId") || $self->SUPER::getLayoutTemplateId;
+    return $self->session->setting->get("friendsLayoutTempalteId") || "zrNpGbT3odfIkg6nFSUy8Q";
 }
 
 
@@ -488,7 +489,6 @@ sub www_view {
     $self->appendCommonVars($var);
     
     my $displayView           = $uid ne "";
-    $var->{'can_edit'       } = $session->user->userId eq $user->userId;
     $var->{'display_message'} = $msg;
 
     #Override these
diff --git a/lib/WebGUI/i18n/English/Account_Friends.pm b/lib/WebGUI/i18n/English/Account_Friends.pm
index 3e757b109..0d4ac8bc3 100644
--- a/lib/WebGUI/i18n/English/Account_Friends.pm
+++ b/lib/WebGUI/i18n/English/Account_Friends.pm
@@ -94,13 +94,13 @@ our $I18N = {
         lastUpdated => 1119068809
     },
 
-    'edit my profile' => {
-        message => q|edit my profile|,
+    'edit my friends' => {
+        message => q|edit my friends|,
 		lastUpdated => 1068703399    
     },
 
-    'profile as others label' => {
-        message     => q{view my profile as others see it},
+    'friends as others label' => {
+        message     => q{view my friends as others see them},
         lastUpdated => 1119068809
     },
 
@@ -167,11 +167,6 @@ Thanks,
         message     => q{This user prefers not to be added as a friend.},
         lastUpdated => 1186264488,
     },
-    
-    '' => {
-        message     => q{},
-        lastUpdated => 1225724810,
-    },
 
     'back to user profile' => {
         message     => q{back to users profile},