diff --git a/drupal/sites/all/features/friends/friends.views_default.inc b/drupal/sites/all/features/friends/friends.views_default.inc
index 6f93bee323..d91508e365 100644
--- a/drupal/sites/all/features/friends/friends.views_default.inc
+++ b/drupal/sites/all/features/friends/friends.views_default.inc
@@ -176,7 +176,31 @@ function friends_views_default_views() {
       'relationship' => 'none',
     ),
     'uid' => array(
-      'label' => 'Actions',
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 1,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'exclude' => 0,
       'id' => 'uid',
       'table' => 'flag_friend',
@@ -343,7 +367,32 @@ function friends_views_default_views() {
       ),
     ),
     'ops' => array(
-      'label' => 'Actions',
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 1,
+        'text' => '<ul class="tab-list">
+  <li class="first secondary tab">[ops]</li>',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'link_type' => '',
       'exclude' => 0,
       'id' => 'ops',
@@ -356,6 +405,31 @@ function friends_views_default_views() {
     ),
     'uid' => array(
       'label' => 'Flag friend links',
+      'alter' => array(
+        'alter_text' => 1,
+        'text' => '  <li class="secondary tab">[uid]</li>
+</ul>',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'exclude' => 0,
       'id' => 'uid',
       'table' => 'flag_friend',
@@ -412,6 +486,40 @@ function friends_views_default_views() {
   $handler->override_option('header_format', '1');
   $handler->override_option('header_empty', 0);
   $handler->override_option('empty', 'No Friend Requests.');
+  $handler->override_option('style_options', array(
+    'grouping' => '',
+    'override' => 1,
+    'sticky' => 0,
+    'order' => 'asc',
+    'summary' => '',
+    'columns' => array(
+      'picture' => 'picture',
+      'name' => 'name',
+      'message' => 'message',
+      'ops' => 'ops',
+      'uid' => 'ops',
+    ),
+    'info' => array(
+      'picture' => array(
+        'sortable' => 0,
+        'separator' => '',
+      ),
+      'name' => array(
+        'sortable' => 0,
+        'separator' => '',
+      ),
+      'message' => array(
+        'separator' => '',
+      ),
+      'ops' => array(
+        'separator' => '',
+      ),
+      'uid' => array(
+        'separator' => '',
+      ),
+    ),
+    'default' => '-1',
+  ));
   $handler->override_option('path', 'account/%/friends/pending');
   $handler->override_option('menu', array(
     'type' => 'tab',
@@ -514,7 +622,31 @@ function friends_views_default_views() {
       ),
     ),
     'ops' => array(
-      'label' => 'Actions',
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '',
+        'make_link' => 0,
+        'path' => '',
+        'absolute' => 0,
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => 0,
+        'max_length' => '',
+        'word_boundary' => 1,
+        'ellipsis' => 1,
+        'html' => 0,
+        'strip_tags' => 0,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
       'link_type' => '',
       'exclude' => 0,
       'id' => 'ops',
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--ops.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--ops.tpl.php
index 9e09768a3e..bd0276d758 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--ops.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--ops.tpl.php
@@ -19,6 +19,8 @@
   * the view is modified.
   */
 ?>
+<?php if ($output): ?>
 <ul class="tab-list">
   <li class="first last secondary tab"><?php print $output; ?></li>
-</ul>
\ No newline at end of file
+</ul>
+<?php endif;  ?>
\ No newline at end of file
diff --git a/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--uid.tpl.php b/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--uid.tpl.php
index 9e09768a3e..f73d6d5966 100644
--- a/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--uid.tpl.php
+++ b/drupal/sites/default/boinc/themes/boinc/templates/views-view-field--boinc-friends--uid.tpl.php
@@ -19,6 +19,8 @@
   * the view is modified.
   */
 ?>
-<ul class="tab-list">
-  <li class="first last secondary tab"><?php print $output; ?></li>
-</ul>
\ No newline at end of file
+<?php if ($output): ?>
+  <ul class="tab-list">
+    <li class="first last secondary tab"><?php print $output; ?></li>
+  </ul>
+<?php endif; ?>
\ No newline at end of file