diff --git a/actions/featured.php b/actions/featured.php
index 0356226914..d1ac6e054e 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -1,67 +1,102 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * List of featured users
+ *
+ * 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
+ * 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/>.
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Public
+ * @package   Laconica
+ * @author    Zach Copley <zach@controlyourself.ca>
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/stream.php');
 require_once(INSTALLDIR.'/lib/profilelist.php');
+require_once INSTALLDIR.'/lib/publicgroupnav.php';
 
-class FeaturedAction extends StreamAction
+/**
+ * List of featured users
+ *
+ * @category Public
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class FeaturedAction extends Action
 {
+    var $page = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+        $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
+
+        return true;
+    }
+
+    function title()
+    {
+        if ($this->page == 1) {
+            return _('Featured users');
+        } else {
+            return sprintf(_('Featured users, page %d'), $this->page);
+        }
+    }
 
     function handle($args)
     {
         parent::handle($args);
 
-        $page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-
-        common_show_header(_('Featured users'),
-                           array($this, 'show_header'), null,
-                           array($this, 'show_top'));
-
-        $this->show_notices($page);
-
-        common_show_footer();
+        $this->showPage();
     }
 
-    function show_top()
+    function showPageNotice()
     {
-        $instr = $this->get_instructions();
+        $instr = $this->getInstructions();
         $output = common_markup_to_html($instr);
         $this->elementStart('div', 'instructions');
         $this->raw($output);
         $this->elementEnd('div');
-        $this->public_views_menu();
     }
 
-    function show_header()
+    function showLocalNav()
     {
+        $nav = new PublicGroupNav($this);
+        $nav->show();
     }
 
-    function get_instructions()
+    function getInstructions()
     {
-        return _('Featured users');
+        return sprintf(_('A selection of some of the great users on %s'),
+                       common_config('site', 'name'));
     }
 
-    function show_notices($page)
+    function showContent()
     {
-
         // XXX: Note I'm doing it this two-stage way because a raw query
         // with a JOIN was *not* working. --Zach
 
@@ -77,7 +112,7 @@ class FeaturedAction extends StreamAction
 
             $user = new User;
             $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
-            $user->limit(($page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
+            $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
             $user->orderBy('user.nickname ASC');
 
             $user->find();
@@ -95,14 +130,14 @@ class FeaturedAction extends StreamAction
             $cnt = $profile->find();
 
             if ($cnt > 0) {
-                $featured = new ProfileList($profile);
-                $featured->show_list();
+                $featured = new ProfileList($profile, null, $this);
+                $featured->show();
             }
 
             $profile->free();
 
-            common_pagination($page > 1, $cnt > PROFILES_PER_PAGE, $page, 'featured');
+            $this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE,
+                              $this->page, 'featured');
         }
     }
-
 }
\ No newline at end of file