diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index 9d0548cb94..db34e485cc 100644
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -49,11 +49,11 @@ class EditpeopletagAction extends OwnerDesignAction
         if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) {
             // TRANS: Title for edit people tag page after deleting a tag.
             // TRANS: %s is a tag.
-            return sprintf(_('Delete %s people tag'), $this->peopletag->tag);
+            return sprintf(_('Delete %s list'), $this->peopletag->tag);
         }
         // TRANS: Title for edit people tag page.
         // TRANS: %s is a tag.
-        return sprintf(_('Edit people tag %s'), $this->peopletag->tag);
+        return sprintf(_('Edit list %s'), $this->peopletag->tag);
     }
 
     /**
@@ -106,7 +106,7 @@ class EditpeopletagAction extends OwnerDesignAction
 
         if (!$this->peopletag) {
             // TRANS: Client error displayed when referring to a non-exsting people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -216,7 +216,7 @@ class EditpeopletagAction extends OwnerDesignAction
         } else {
             $this->element('p', 'instructions',
                            // TRANS: Form instruction for edit people tag form.
-                           _('Use this form to edit the people tag.'));
+                           _('Use this form to edit the list.'));
         }
     }
 
@@ -294,7 +294,7 @@ class EditpeopletagAction extends OwnerDesignAction
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
             // TRANS: TRANS: Server error displayed when updating a people tag fails.
-            $this->serverError(_('Could not update people tag.'));
+            $this->serverError(_('Could not update list.'));
         }
 
         $this->peopletag->query('COMMIT');
diff --git a/actions/peopletagged.php b/actions/peopletagged.php
index 84356116cc..7ab16b6f87 100644
--- a/actions/peopletagged.php
+++ b/actions/peopletagged.php
@@ -93,7 +93,7 @@ class PeopletaggedAction extends OwnerDesignAction
 
         if (!$this->peopletag) {
             // TRANS: Client error displayed when referring to non-existing people tag.
-            $this->clientError(_('No such people tag.'), 404);
+            $this->clientError(_('No such list.'), 404);
             return false;
         }
 
@@ -105,12 +105,12 @@ class PeopletaggedAction extends OwnerDesignAction
         if ($this->page == 1) {
             // TRANS: Title for list of people tagged by the user with a tag.
             // TRANS: %1$s is a tag, %2$s is a username.
-            return sprintf(_('People tagged %1$s by %2$s'),
+            return sprintf(_('People listed in %1$s by %2$s'),
                            $this->peopletag->tag, $this->tagger->nickname);
         } else {
             // TRANS: Title for list of people tagged by the user with a tag.
             // TRANS: %1$s is a tag, %2$s is a username, %2$s is a page number.
-            return sprintf(_('People tagged %1$s by %2$s, page %3$d'),
+            return sprintf(_('People listed in %1$s by %2$s, page %3$d'),
                            $this->peopletag->tag, $this->user->nickname,
                            $this->page);
         }
diff --git a/actions/peopletagsbyuser.php b/actions/peopletagsbyuser.php
index 42b728e1d8..7dc70058b2 100644
--- a/actions/peopletagsbyuser.php
+++ b/actions/peopletagsbyuser.php
@@ -2,7 +2,7 @@
 /**
  * StatusNet, the distributed open-source microblogging tool
  *
- * People tags by a user
+ * Lists by a user
  *
  * PHP version 5
  *
@@ -49,22 +49,22 @@ class PeopletagsbyuserAction extends OwnerDesignAction
         if ($this->page == 1) {
             if ($this->isOwner()) {
                 if ($this->arg('private')) {
-                    // TRANS: Title for people tags by a user page for a private tag.
-                    return _('Private people tags by you');
+                    // TRANS: Title for lists by a user page for a private tag.
+                    return _('Private lists by you');
                 } else if ($this->arg('public')) {
-                    // TRANS: Title for people tags by a user page for a public tag.
-                    return _('Public people tags by you');
+                    // TRANS: Title for lists by a user page for a public tag.
+                    return _('Public lists by you');
                 }
-                // TRANS: Title for people tags by a user page.
-                return _('People tags by you');
+                // TRANS: Title for lists by a user page.
+                return _('Lists by you');
             }
-            // TRANS: Title for people tags by a user page.
+            // TRANS: Title for lists by a user page.
             // TRANS: %s is a user nickname.
-            return sprintf(_('People tags by %s'), $this->tagger->nickname);
+            return sprintf(_('Lists by %s'), $this->tagger->nickname);
         } else {
-            // TRANS: Title for people tags by a user page.
+            // TRANS: Title for lists by a user page.
             // TRANS: %1$s is a user nickname, %2$d is a page number.
-            return sprintf(_('People tags by %1$s, page %2$d'), $this->tagger->nickname, $this->page);
+            return sprintf(_('Lists by %1$s, page %2$d'), $this->tagger->nickname, $this->page);
         }
     }
 
@@ -124,8 +124,8 @@ class PeopletagsbyuserAction extends OwnerDesignAction
             if ($this->isOwner()) {
                 $this->tags = $this->tagger->getPrivateTags($offset, $limit);
             } else {
-                // TRANS: Client error displayed when trying view another user's private people tags.
-                $this->clientError(_('You cannot view others\' private people tags'), 403);
+                // TRANS: Client error displayed when trying view another user's private lists.
+                $this->clientError(_('You cannot view others\' private lists'), 403);
             }
         } else {
             $this->tags = $this->tagger->getOwnedTags(common_current_user(), $offset, $limit);
@@ -160,8 +160,8 @@ class PeopletagsbyuserAction extends OwnerDesignAction
                        array('href' =>
                              common_local_url('peopletagsforuser',
                                               array('nickname' => $this->user->nickname))),
-                       // TRANS: Link text to show people tags for user %s.
-                       sprintf(_('People tags for %s'), $this->tagger->nickname));
+                       // TRANS: Link text to show lists for user %s.
+                       sprintf(_('Lists for %s'), $this->tagger->nickname));
         $this->elementEnd('li');
 
         if ($this->isOwner()) {
@@ -204,11 +204,11 @@ class PeopletagsbyuserAction extends OwnerDesignAction
     function showAnonymousMessage()
     {
         $notice =
-          // TRANS: Message displayed for anonymous users on page that displays people tags by a user.
+          // TRANS: Message displayed for anonymous users on page that displays lists by a user.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a tagger nickname.
-          sprintf(_('These are people tags created by **%s**. ' .
-                    'People tags are how you sort similar ' .
+          sprintf(_('These are lists created by **%s**. ' .
+                    'Lists are how you sort similar ' .
                     'people on %%%%site.name%%%%, a [micro-blogging]' .
                     '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
@@ -259,17 +259,29 @@ class PeopletagsbyuserAction extends OwnerDesignAction
         return !empty($user) && $user->id == $this->tagger->id;
     }
 
+    function showObjectNav()
+    {
+        $nav = new PeopletagNav($this, $this->tagger);
+        $nav->show();
+    }
+
     function showEmptyListMessage()
     {
-          // TRANS: Message displayed on page that displays people tags by a user when there are none.
+          // TRANS: Message displayed on page that displays lists by a user when there are none.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a tagger nickname.
-        $message = sprintf(_('%s has not created any [people tags](%%%%doc.tags%%%%) yet.'), $this->tagger->nickname);
+        $message = sprintf(_('%s has not created any [lists](%%%%doc.lists%%%%) yet.'), $this->tagger->nickname);
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
 
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->tagger);
+        $block->show();
+    }
+
     function showSections()
     {
         #TODO: tags with most subscribers
diff --git a/actions/peopletagsforuser.php b/actions/peopletagsforuser.php
index 789dcbe921..7f5c216070 100644
--- a/actions/peopletagsforuser.php
+++ b/actions/peopletagsforuser.php
@@ -47,10 +47,10 @@ class PeopletagsforuserAction extends OwnerDesignAction
     {
         if ($this->page == 1) {
             // Page title. %s is a tagged user's nickname.
-            return sprintf(_('People tags for %s'), $this->tagged->nickname);
+            return sprintf(_('Lists with %s in them'), $this->tagged->nickname);
         } else {
             // Page title. %1$s is a tagged user's nickname, %2$s is a page number.
-            return sprintf(_('People tags for %1$s, page %2$d'), $this->tagged->nickname, $this->page);
+            return sprintf(_('Lists with %1$s, page %2$d'), $this->tagged->nickname, $this->page);
         }
     }
 
@@ -105,8 +105,8 @@ class PeopletagsforuserAction extends OwnerDesignAction
           // TRANS: Message displayed for anonymous users on page that displays people tags for a user.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a tagger nickname.
-          sprintf(_('These are people tags for **%s**. ' .
-                    'People tags are how you sort similar ' .
+          sprintf(_('These are lists for **%s**. ' .
+                    'lists are how you sort similar ' .
                     'people on %%%%site.name%%%%, a [micro-blogging]' .
                     '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
@@ -117,27 +117,6 @@ class PeopletagsforuserAction extends OwnerDesignAction
         $this->elementEnd('div');
     }
 
-    function showPageNotice()
-    {
-        $this->elementStart('dl', 'filter_tags');
-        $this->elementStart('dd', array('id' => 'filter_tags_for',
-                                         'class' => 'child_1'));
-
-        $user = common_current_user();
-        // TRANS: Page notice.
-        $text = ($this->tagged->id == @$user->id) ? _('People tags by you') :
-                // TRANS: Page notice. %s is a tagger's nickname.
-                sprintf(_('People tags by %s'), $this->tagged->nickname);
-        $this->element('a',
-                       array('href' =>
-                             common_local_url('peopletagsbyuser',
-                                              array('nickname' => $this->tagged->nickname))),
-                           $text);
-        $this->elementEnd('dd');
-        $this->elementEnd('dl');
-    }
-
-
     function showContent()
     {
         #TODO: controls here.
@@ -162,12 +141,24 @@ class PeopletagsforuserAction extends OwnerDesignAction
         // TRANS: Message displayed on page that displays people tags for a user when there are none.
         // TRANS: This message contains Markdown links in the form [description](links).
         // TRANS: %s is a tagger nickname.
-        $message = sprintf(_('%s has not been [tagged](%%%%doc.tags%%%%) by anyone yet.'), $this->tagged->nickname);
+        $message = sprintf(_('%s has not been [listed](%%%%doc.lists%%%%) by anyone yet.'), $this->tagged->nickname);
         $this->elementStart('div', 'guide');
         $this->raw(common_markup_to_html($message));
         $this->elementEnd('div');
     }
 
+    function showObjectNav()
+    {
+        $nav = new PeopletagNav($this, $this->tagged);
+        $nav->show();
+    }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->tagged);
+        $block->show();
+    }
+
     function showSections()
     {
         #TODO: tags with most subscribers
diff --git a/actions/peopletagsubscriptions.php b/actions/peopletagsubscriptions.php
index 5eee82396d..3674cc1e76 100644
--- a/actions/peopletagsubscriptions.php
+++ b/actions/peopletagsubscriptions.php
@@ -48,11 +48,11 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
         if ($this->page == 1) {
             // TRANS: Title for page that displays people tags subscribed to by a user.
             // TRANS: %s is a profile nickname.
-            return sprintf(_('People tags subscriptions by %s'), $this->profile->nickname);
+            return sprintf(_('Lists subscribed to by %s'), $this->profile->nickname);
         } else {
             // TRANS: Title for page that displays people tags subscribed to by a user.
             // TRANS: %1$s is a profile nickname, %2$d is a page number.
-            return sprintf(_('People tags subscriptions by %1$s, page %2$d'), $this->profile->nickname, $this->page);
+            return sprintf(_('Lists subscribed to by %1$s, page %2$d'), $this->profile->nickname, $this->page);
         }
     }
 
@@ -107,13 +107,13 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
           // TRANS: Message displayed for anonymous users on page that displays people tags subscribed to by a user.
           // TRANS: This message contains Markdown links in the form [description](links).
           // TRANS: %s is a profile nickname.
-          sprintf(_('These are people tags subscribed to by **%s**. ' .
-                    'People tags are how you sort similar ' .
+          sprintf(_('These are lists subscribed to by **%s**. ' .
+                    'Lists are how you sort similar ' .
                     'people on %%%%site.name%%%%, a [micro-blogging]' .
                     '(http://en.wikipedia.org/wiki/Micro-blogging) service ' .
                     'based on the Free Software [StatusNet](http://status.net/) tool. ' .
                     'You can easily keep track of what they ' .
-                    'are doing by subscribing to the tag\'s timeline.' ), $this->profile->nickname);
+                    'are doing by subscribing to the list\'s timeline.' ), $this->profile->nickname);
         $this->elementStart('div', array('id' => 'anon_notice'));
         $this->raw(common_markup_to_html($notice));
         $this->elementEnd('div');
@@ -133,6 +133,18 @@ class PeopletagsubscriptionsAction extends OwnerDesignAction
                           $this->page, 'peopletagsubscriptions', array('nickname' => $this->profile->id));
     }
 
+    function showObjectNav()
+    {
+        $nav = new PeopletagNav($this, $this->profile);
+        $nav->show();
+    }
+
+    function showProfileBlock()
+    {
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();
+    }
+
     function showSections()
     {
         #TODO: tags with most subscribers
diff --git a/actions/showprofiletag.php b/actions/showprofiletag.php
index 10ab457861..07603d5a4b 100644
--- a/actions/showprofiletag.php
+++ b/actions/showprofiletag.php
@@ -122,7 +122,7 @@ class ShowprofiletagAction extends Action
             if($this->peopletag->private) {
                 // TRANS: Title for private people tag timeline.
                 // TRANS: %1$s is a people tag, %2$s is a page number.
-                return sprintf(_('Private timeline for people tagged %1$s by you, page %2$d'),
+                return sprintf(_('Private timeline for %1$s list by you, page %2$d'),
                                 $this->peopletag->tag, $this->page);
             }
 
@@ -130,13 +130,13 @@ class ShowprofiletagAction extends Action
             if (!empty($current) && $current->id == $this->peopletag->tagger) {
                 // TRANS: Title for public people tag timeline where the viewer is the tagger.
                 // TRANS: %1$s is a people tag, %2$s is a page number.
-                return sprintf(_('Timeline for people tagged %1$s by you, page %2$d'),
+                return sprintf(_('Timeline for %1$s list by you, page %2$d'),
                                 $this->peopletag->tag, $this->page);
             }
 
             // TRANS: Title for private people tag timeline.
             // TRANS: %1$s is a people tag, %2$s is the tagger's nickname, %3$d is a page number.
-            return sprintf(_('Timeline for people tagged %1$s by %2$s, page %3$d'),
+            return sprintf(_('Timeline for %1$s list by %2$s, page %3$d'),
                                 $this->peopletag->tag,
                                 $this->tagger->nickname,
                                 $this->page
@@ -145,7 +145,7 @@ class ShowprofiletagAction extends Action
             if($this->peopletag->private) {
                 // TRANS: Title for private people tag timeline.
                 // TRANS: %s is a people tag.
-                return sprintf(_('Private timeline of people tagged %s by you'),
+                return sprintf(_('Private timeline of %s list by you'),
                                 $this->peopletag->tag);
             }
 
@@ -153,13 +153,13 @@ class ShowprofiletagAction extends Action
             if (!empty($current) && $current->id == $this->peopletag->tagger) {
                 // TRANS: Title for public people tag timeline where the viewer is the tagger.
                 // TRANS: %s is a people tag.
-                return sprintf(_('Timeline for people tagged %s by you'),
+                return sprintf(_('Timeline for %s list by you'),
                                 $this->peopletag->tag);
             }
 
             // TRANS: Title for private people tag timeline.
             // TRANS: %1$s is a people tag, %2$s is the tagger's nickname.
-            return sprintf(_('Timeline for people tagged %1$s by %2$s'),
+            return sprintf(_('Timeline for %1$s list by %2$s'),
                                 $this->peopletag->tag,
                                 $this->tagger->nickname
                           );
@@ -190,7 +190,7 @@ class ShowprofiletagAction extends Action
                 ),
                 // TRANS: Feed title.
                 // TRANS: %1$s is a people tag, %2$s is tagger's nickname.
-                sprintf(_('Feed for people tagged %1$s by %2$s (Atom)'),
+                sprintf(_('Feed for %1$s list by %2$s (Atom)'),
                             $this->peopletag->tag, $this->tagger->nickname
                        )
               )
@@ -207,7 +207,7 @@ class ShowprofiletagAction extends Action
     {
         // TRANS: Empty list message for people tag timeline.
         // TRANS: %1$s is a people tag, %2$s is a tagger's nickname.
-        $message = sprintf(_('This is the timeline for people tagged %1$s by %2$s but no one has posted anything yet.'),
+        $message = sprintf(_('This is the timeline for %1$s list by %2$s but no one has posted anything yet.'),
                            $this->peopletag->tag,
                            $this->tagger->nickname) . ' ';
 
@@ -291,11 +291,11 @@ class ShowprofiletagAction extends Action
             if(!empty($current) && $this->peopletag->tagger == $current->id) {
                 // TRANS: Header on show profile tag page.
                 // TRANS: %s is a people tag.
-                $title =  sprintf(_('People tagged %s by you'), $this->peopletag->tag);
+                $title =  sprintf(_('Listed'), $this->peopletag->tag);
             } else {
                 // TRANS: Header on show profile tag page.
                 // TRANS: %1$s is a people tag, %2$s is a tagger's nickname.
-                $title = sprintf(_('People tagged %1$s by %2$s'),
+                $title = sprintf(_('Listed'),
                                 $this->peopletag->tag,
                                 $this->tagger->nickname);
             }
diff --git a/lib/peopletageditform.php b/lib/peopletageditform.php
index 27920008a8..9fb824bdbc 100644
--- a/lib/peopletageditform.php
+++ b/lib/peopletageditform.php
@@ -107,7 +107,7 @@ class PeopletagEditForm extends Form
     {
         // TRANS: Form legend for people tag edit form.
         // TRANS: %s is a people tag.
-        $this->out->element('legend', null, sprintf(_('Edit people tag %s'), $this->peopletag->tag));
+        $this->out->element('legend', null, sprintf(_('Edit list %s'), $this->peopletag->tag));
     }
 
     /**
@@ -138,12 +138,12 @@ class PeopletagEditForm extends Form
         $desclimit = Profile_list::maxDescription();
         if ($desclimit == 0) {
             // TRANS: Field title for description of people tag.
-            $descinstr = _('Describe the people tag or topic.');
+            $descinstr = _('Describe the list or topic.');
         } else {
             // TRANS: Field title for description of people tag.
             // TRANS: %d is the maximum number of characters for the description.
-            $descinstr = sprintf(_m('Describe the people tag or topic in %d character.',
-                                    'Describe the people tag or topic in %d characters.',
+            $descinstr = sprintf(_m('Describe the list or topic in %d character.',
+                                    'Describe the list or topic in %d characters.',
                                     $desclimit),
                                  $desclimit);
         }
@@ -172,7 +172,7 @@ class PeopletagEditForm extends Form
                       'submit',
                       'delete',
                       // TRANS: Button title to delete a people tag.
-                      _('Delete this people tag.'));
+                      _('Delete this list.'));
     }
 
     function showProfileList()
diff --git a/lib/peopletaggroupnav.php b/lib/peopletaggroupnav.php
index 5c95487247..a93499ce76 100644
--- a/lib/peopletaggroupnav.php
+++ b/lib/peopletaggroupnav.php
@@ -104,10 +104,10 @@ class PeopletagGroupNav extends Widget
             $this->out->menuItem(common_local_url('showprofiletag', array('tagger' => $user_profile->nickname,
                                                                           'tag'    => $tag->tag)),
                              // TRANS: Menu item in people tag navigation panel.
-                             _m('MENU','People tag'),
+                             _m('MENU','List'),
                              // TRANS: Menu item title in people tag navigation panel.
                              // TRANS: %1$s is a tag, %2$s is a nickname.
-                             sprintf(_('%1$s tag by %2$s.'), $tag->tag,
+                             sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'showprofiletag', 'nav_timeline_peopletag');
 
@@ -115,10 +115,10 @@ class PeopletagGroupNav extends Widget
             $this->out->menuItem(common_local_url('peopletagged', array('tagger' => $user->nickname,
                                                                         'tag'    => $tag->tag)),
                              // TRANS: Menu item in people tag navigation panel.
-                             _m('MENU','Tagged'),
+                             _m('MENU','Listed'),
                              // TRANS: Menu item title in people tag navigation panel.
                              // TRANS: %1$s is a tag, %2$s is a nickname.
-                             sprintf(_('%1$s tag by %2$s.'), $tag->tag,
+                             sprintf(_('%1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagged', 'nav_peopletag_tagged');
 
@@ -129,7 +129,7 @@ class PeopletagGroupNav extends Widget
                              _m('MENU','Subscribers'),
                              // TRANS: Menu item title in people tag navigation panel.
                              // TRANS: %1$s is a tag, %2$s is a nickname.
-                             sprintf(_('Subscribers to %1$s tag by %2$s.'), $tag->tag,
+                             sprintf(_('Subscribers to %1$s list by %2$s.'), $tag->tag,
                                 (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                              $action == 'peopletagsubscribers', 'nav_peopletag_subscribers');
 
@@ -142,7 +142,7 @@ class PeopletagGroupNav extends Widget
                                  _m('MENU','Edit'),
                                  // TRANS: Menu item title in people tag navigation panel.
                                  // TRANS: %s is a tag.
-                                 sprintf(_('Edit %s tag by you.'), $tag->tag,
+                                 sprintf(_('Edit %s list by you.'), $tag->tag,
                                     (($user_profile && $user_profile->fullname) ? $user_profile->fullname : $nickname)),
                                  $action == 'editpeopletag', 'nav_peopletag_edit');
             }
diff --git a/lib/peopletaglist.php b/lib/peopletaglist.php
index 729ff8814e..10ebc8cb9e 100644
--- a/lib/peopletaglist.php
+++ b/lib/peopletaglist.php
@@ -193,7 +193,7 @@ class PeopletagListItem extends Widget
                     common_local_url('editpeopletag', array('tagger' => $this->profile->nickname,
                                                     'tag' => $this->peopletag->tag)),
                                   // TRANS: Title for link to edit people tag settings.
-                                  'title' => _('Edit people tag settings.')),
+                                  'title' => _('Edit list settings.')),
                        // TRANS: Text for link to edit people tag settings.
                        _('Edit'));
         $this->out->elementEnd('li');
diff --git a/lib/peopletagnav.php b/lib/peopletagnav.php
new file mode 100644
index 0000000000..cc03b59a35
--- /dev/null
+++ b/lib/peopletagnav.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Tabset for a particular list
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Action
+ * @package   StatusNet
+ * @author    Shashi Gowda <connect2shashi@gmail.com>
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
+
+/**
+ * Tabset for a group
+ *
+ * Shows a group of tabs for a particular user group
+ *
+ * @category Output
+ * @package  StatusNet
+ * @author   Shashi Gowda <connect2shashi@gmail.com>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      HTMLOutputter
+ */
+class PeopletagNav extends Menu
+{
+    var $group = null;
+
+    /**
+     * Construction
+     *
+     * @param Action $action current action, used for output
+     */
+    function __construct($action=null, $profile=null)
+    {
+        parent::__construct($action);
+        $this->profile = $profile;
+    }
+
+    /**
+     * Show the menu
+     *
+     * @return void
+     */
+    function show()
+    {
+        $action_name = $this->action->trimmed('action');
+        $nickname = $this->profile->nickname;
+
+        $this->out->elementStart('ul', array('class' => 'nav'));
+        if (Event::handle('StartPeopletagGroupNav', array($this))) {
+            $this->out->menuItem(common_local_url('peopletagsubscriptions', array('nickname' =>
+                                                                     $nickname)),
+                                 // TRANS: Menu item in the group navigation page.
+                                 _m('MENU','List Subscriptions'),
+                                 // TRANS: Tooltip for menu item in the group navigation page.
+                                 // TRANS: %s is the nickname of the group.
+                                 sprintf(_m('TOOLTIP','Lists subscribed to by %s'), $nickname),
+                                 $action_name == 'peopletagsubscriptions',
+                                 'nav_list_group');
+            $this->out->menuItem(common_local_url('peopletagsforuser', array('nickname' =>
+                                                                        $nickname)),
+                                 // TRANS: Menu item in the group navigation page.
+                                 sprintf(_m('MENU','Lists with %s'), $nickname),
+                                 // TRANS: Tooltip for menu item in the group navigation page.
+                                 // TRANS: %s is the nickname of the group.
+                                 sprintf(_m('TOOLTIP','Lists with %s'), $nickname),
+                                 $action_name == 'peopletagsforuser',
+                                 'nav_lists_with');
+            $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
+                                                                        $nickname)),
+                                 // TRANS: Menu item in the group navigation page.
+                                 sprintf(_m('MENU','Lists by %s'), $nickname),
+                                 // TRANS: Tooltip for menu item in the group navigation page.
+                                 // TRANS: %s is the nickname of the group.
+                                 sprintf(_m('TOOLTIP','Lists by %s'), $nickname),
+                                 $action_name == 'peopletagsbyuser',
+                                 'nav_lists_by');
+            Event::handle('EndGroupGroupNav', array($this));
+        }
+        $this->out->elementEnd('ul');
+    }
+}
diff --git a/lib/peopletagsbysubssection.php b/lib/peopletagsbysubssection.php
index d67b7fb88d..e1e3251f84 100644
--- a/lib/peopletagsbysubssection.php
+++ b/lib/peopletagsbysubssection.php
@@ -66,7 +66,7 @@ class PeopletagsBySubsSection extends PeopletagSection
     function title()
     {
         // TRANS: Title for section contaning people tags with the most subscribers.
-        return _('People tags with most subscribers');
+        return _('Lists with most subscribers');
     }
 
     function divId()
diff --git a/lib/peopletagsection.php b/lib/peopletagsection.php
index 20358cb85d..a6c587e04e 100644
--- a/lib/peopletagsection.php
+++ b/lib/peopletagsection.php
@@ -83,6 +83,7 @@ class PeopletagSection extends Section
 
 class PeopletagSectionItem extends PeopletagListItem
 {
+
     function showStart()
     {
     }
@@ -104,10 +105,11 @@ class PeopletagSectionItem extends PeopletagListItem
             common_log(LOG_WARNING, "Trying to show missing peopletag; skipping.");
             return;
         }
+        $mode = ($this->peopletag->private) ? 'private' : 'public';
 
         $this->out->elementStart('tr');
 
-        $this->out->elementStart('td', 'peopletag');
+        $this->out->elementStart('td', 'peopletag mode-' . $mode);
         $this->showPeopletag();
         $this->out->elementEnd('td');
 
@@ -121,11 +123,12 @@ class PeopletagSectionItem extends PeopletagListItem
     {
         // TRANS: Tag summary. %1$d is the number of users tagged with the tag,
         // TRANS: %2$d is the number of subscribers to the tag.
-        $title = sprintf(_('Tagged: %1$d Subscribers: %2$d'),
+        $title = sprintf(_('Listed: %1$d Subscribers: %2$d'),
                          $this->peopletag->taggedCount(),
                          $this->peopletag->subscriberCount());
 
         $this->out->elementStart('span', 'entry-title tag');
+
         $this->out->element('a',
             array('rel'   => 'bookmark',
                   'href'  => $this->url(),
diff --git a/lib/peopletagsforusersection.php b/lib/peopletagsforusersection.php
index fef469eb8d..9f7879d9e1 100644
--- a/lib/peopletagsforusersection.php
+++ b/lib/peopletagsforusersection.php
@@ -62,13 +62,15 @@ class PeopletagsForUserSection extends PeopletagSection
 
     function title()
     {
-        $name = $this->profile->getBestName();
-        if ($this->profile->id == common_current_user()->id) {
-            $name = 'you';
+        $user = common_current_user();
+
+        if (!empty($user) && $this->profile->id == $user->id) {
+            return sprintf(_('Lists with you'));
         }
-        // TRANS: Title for page that displays which people tags a user has been tagged with.
+        // TRANS: Title for page that displays
+        //        which people tags a user has been tagged with.
         // TRANS: %s is a profile name.
-        return sprintf(_('People tags for %s'), $name);
+        return sprintf(_('Lists with %s'), $this->profile->getBestName());
     }
 
     function link()
diff --git a/lib/peopletagsubscriptionssection.php b/lib/peopletagsubscriptionssection.php
index 2182a3d834..616af28d4c 100644
--- a/lib/peopletagsubscriptionssection.php
+++ b/lib/peopletagsubscriptionssection.php
@@ -62,7 +62,7 @@ class PeopletagSubscriptionsSection extends PeopletagSection
     function title()
     {
         // TRANS: Title for page that displays people tags a user has subscribed to.
-        return _('People tag subscriptions');
+        return _('List subscriptions');
     }
 
     function link()
diff --git a/lib/personalgroupnav.php b/lib/personalgroupnav.php
index 3b3a87ff0d..d379dcf528 100644
--- a/lib/personalgroupnav.php
+++ b/lib/personalgroupnav.php
@@ -103,18 +103,6 @@ class PersonalGroupNav extends Menu
                                          // TRANS: Replaces %s in '%s\'s favorite notices'. (Yes, we know we need to fix this.)
                                          ($user_profile) ? $name : _m('FIXME','User')),
                                  $mine && $action =='showfavorites', 'nav_timeline_favorites');
-            $this->out->menuItem(common_local_url('peopletagsbyuser', array('nickname' =>
-                                                                  $nickname)),
-                             // TRANS: Menu item in personal group navigation menu.
-                             _m('MENU','People tags'),
-                             // @todo i18n FIXME: Need to make this two messages.
-                             // TRANS: Menu item title in personal group navigation menu.
-                             // TRANS: %s is a username.
-                             sprintf(_('People tags by %s'),
-                                     // TRANS: Replaces %s in 'People tags by %s'. (Yes, we know we need to fix this.)
-                                     ($user_profile) ? $name : _('User')),
-                             in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
-                             'nav_timeline_peopletags');
 
             $cur = common_current_user();
 
diff --git a/lib/profileaction.php b/lib/profileaction.php
index cd3f5bcde5..16592783c9 100644
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -97,7 +97,6 @@ class ProfileAction extends OwnerDesignAction
         $this->showSubscriptions();
         $this->showSubscribers();
         $this->showGroups();
-        $this->showPeopletagSubs();
         $this->showPeopletags();
         $this->showStatistics();
     }
@@ -190,21 +189,6 @@ class ProfileAction extends OwnerDesignAction
         $this->elementEnd('div');
     }
 
-    function showPeopletagSubs()
-    {
-        $user = common_current_user();
-        if (!empty($user) && $this->profile->id == $user->id) {
-            if (Event::handle('StartShowPeopletagSubscriptionsSection', array($this))) {
-
-                $profile = $user->getProfile();
-                $section = new PeopletagSubscriptionsSection($this, $profile);
-                $section->show();
-
-                Event::handle('EndShowPeopletagSubscriptionsSection', array($this));
-            }
-        }
-    }
-
     function showPeopletags()
     {
         if (Event::handle('StartShowPeopletagsSection', array($this))) {
diff --git a/lib/publicgroupnav.php b/lib/publicgroupnav.php
index 75aa3dd60f..77243fda7a 100644
--- a/lib/publicgroupnav.php
+++ b/lib/publicgroupnav.php
@@ -77,12 +77,6 @@ class PublicGroupNav extends Menu
                 // TRANS: Menu item title in search group navigation panel.
                 _('Recent tags'), $this->actionName == 'publictagcloud', 'nav_recent-tags');
 
-            // TRANS: Menu item in search group navigation panel.
-            $this->out->menuItem(common_local_url('publicpeopletagcloud'), _m('MENU','People tags'),
-                // TRANS: Menu item title in search group navigation panel.
-                _('People tags'), in_array($this->actionName, array('publicpeopletagcloud',
-                                    'peopletag', 'selftag')), 'nav_people-tags');
-
             if (count(common_config('nickname', 'featured')) > 0) {
                 // TRANS: Menu item in search group navigation panel.
                 $this->out->menuItem(common_local_url('featured'), _m('MENU','Featured'),
diff --git a/lib/subgroupnav.php b/lib/subgroupnav.php
index 6ff3b4609c..49bd357f29 100644
--- a/lib/subgroupnav.php
+++ b/lib/subgroupnav.php
@@ -128,16 +128,16 @@ class SubGroupNav extends Menu
                                          $this->user->nickname),
                                  $action == 'usergroups',
                                  'nav_usergroups');
-            $this->out->menuItem(common_local_url('peopletagsbyuser',
+            $this->out->menuItem(common_local_url('peopletagsubscriptions',
                                                   array('nickname' =>
                                                         $this->user->nickname)),
                                  // TRANS: Menu item title in local navigation menu.
-                                 _m('MENU','People tags'),
+                                 _m('MENU','Lists'),
                                  // TRANS: Menu item title in local navigation menu.
                                  // TRANS: %s is a user nickname.
-                                 sprintf(_('People tags by %s.'),
+                                 sprintf(_('List subscriptions by %s.'),
                                          $this->user->nickname),
-                                 in_array($action, array('peopletagsbyuser', 'peopletagsforuser')),
+                                 in_array($action, array('peopletagsbyuser', 'peopletagsubscriptions', 'peopletagsforuser')),
                                  'nav_timeline_peopletags');
 
             if (common_config('invite', 'enabled') && !is_null($cur) && $this->user->id === $cur->id) {
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index a74ce6201b..b0b67569c6 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -855,7 +855,7 @@ class OStatusPlugin extends Plugin
         if ($oprofile) {
             if (!$oprofile->subscribe()) {
                 // TRANS: Exception thrown when setup of remote people tag subscription fails.
-                throw new Exception(_m('Could not set up remote people tag subscription.'));
+                throw new Exception(_m('Could not set up remote list subscription.'));
             }
 
             $sub = $user->getProfile();
@@ -876,7 +876,7 @@ class OStatusPlugin extends Plugin
             $act->title = _m('TITLE','Follow list');
             // TRANS: Success message for remote list follow through OStatus.
             // TRANS: %1$s is the subscriber name, %2$s the prople tag, %3$s is the tagger's name.
-            $act->content = sprintf(_m("%1$s is now following people tagged %2$s by %3$s."),
+            $act->content = sprintf(_m("%1$s is now following people listed in %2$s by %3$s."),
                                     $sub->getBestName(),
                                     $oprofile->getBestName(),
                                     $tagger->getBestName());
@@ -1000,7 +1000,7 @@ class OStatusPlugin extends Plugin
                                   common_date_iso8601(time()));
         $act->time = time();
         $act->title = _m('TITLE','Tag');
-        $act->content = sprintf(_m('%1$s tagged %2$s in the list %3$s.'),
+        $act->content = sprintf(_m('%1$s listed %2$s in the list %3$s.'),
                                 $tagger->getBestName(),
                                 $tagged->getBestName(),
                                 $plist->getBestName());
diff --git a/plugins/OStatus/actions/ostatuspeopletag.php b/plugins/OStatus/actions/ostatuspeopletag.php
index 6d6199b811..1a8495ce21 100644
--- a/plugins/OStatus/actions/ostatuspeopletag.php
+++ b/plugins/OStatus/actions/ostatuspeopletag.php
@@ -169,7 +169,7 @@ class OStatusPeopletagAction extends OStatusSubAction
 
     function getInstructions()
     {
-        return _m('You can subscribe to people tags from other supported sites. Paste the tag\'s profile URI below:');
+        return _m('You can subscribe to lists from other supported sites. Paste the lists\'s URI below:');
     }
 
     function selfLink()
diff --git a/plugins/OStatus/actions/peopletagsalmon.php b/plugins/OStatus/actions/peopletagsalmon.php
index 21025f511e..a200ca9eef 100644
--- a/plugins/OStatus/actions/peopletagsalmon.php
+++ b/plugins/OStatus/actions/peopletagsalmon.php
@@ -42,13 +42,13 @@ class PeopletagsalmonAction extends SalmonAction
         $this->peopletag = Profile_list::staticGet('id', $id);
 
         if (empty($this->peopletag)) {
-            $this->clientError(_m('No such people tag.'));
+            $this->clientError(_m('No such list.'));
         }
 
         $oprofile = Ostatus_profile::staticGet('peopletag_id', $id);
 
         if (!empty($oprofile)) {
-            $this->clientError(_m('Cannot accept remote posts for a remote people tag.'));
+            $this->clientError(_m('Cannot accept remote posts for a remote list.'));
         }
 
         return true;
@@ -89,7 +89,7 @@ class PeopletagsalmonAction extends SalmonAction
             $this->clientError(_m('Cannot read profile to set up profile tag subscription.'));
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m('Groups cannot subscribe to people tags.'));
+            $this->clientError(_m('Groups cannot subscribe to lists.'));
         }
 
         common_log(LOG_INFO, "Remote profile {$oprofile->uri} subscribing to local peopletag ".$this->peopletag->getBestName());
@@ -107,7 +107,7 @@ class PeopletagsalmonAction extends SalmonAction
         try {
             Profile_tag_subscription::add($this->peopletag, $profile);
         } catch (Exception $e) {
-            $this->serverError(sprintf(_m('Could not subscribe remote user %1$s to people tag %2$s.'),
+            $this->serverError(sprintf(_m('Could not subscribe remote user %1$s to list %2$s.'),
                                        $oprofile->uri, $this->peopletag->getBestName()));
         }
     }
@@ -120,10 +120,10 @@ class PeopletagsalmonAction extends SalmonAction
     {
         $oprofile = $this->ensureProfile();
         if (!$oprofile) {
-            $this->clientError(_m('Cannot read profile to cancel people tag membership.'));
+            $this->clientError(_m('Cannot read profile to cancel list membership.'));
         }
         if ($oprofile->isGroup()) {
-            $this->clientError(_m('Groups cannot subscribe to people tags.'));
+            $this->clientError(_m('Groups cannot subscribe to lists.'));
         }
 
         common_log(LOG_INFO, "Remote profile {$oprofile->uri} unsubscribing from local peopletag ".$this->peopletag->getBestName());
@@ -133,7 +133,7 @@ class PeopletagsalmonAction extends SalmonAction
                 Profile_tag_subscription::remove($this->peopletag->tagger, $this->peopletag->tag, $profile->id);
 
         } catch (Exception $e) {
-            $this->serverError(sprintf(_m('Could not remove remote user %1$s from people tag %2$s.'),
+            $this->serverError(sprintf(_m('Could not remove remote user %1$s from list %2$s.'),
                                        $oprofile->uri, $this->peopletag->getBestName()));
             return;
         }