diff --git a/drupal_commons.make b/drupal_commons.make
index f5b6b87..e3b1b06 100644
--- a/drupal_commons.make
+++ b/drupal_commons.make
@@ -312,6 +312,15 @@ projects[views][subdir] = "contrib"
 ; http://drupal.org/node/402944#comment-4650020
 projects[views][patch][] = "http://drupal.org/files/issues/views-402944-31.patch"
 
+; The dev branch has a revised UI for determining cache criteria.
+projects[views_content_cache][subdir] = "contrib"
+projects[views_content_cache][download][type] = "git"
+projects[views_content_cache][download][url] = ""http://git.drupal.org/project/views_content_cache.git""
+projects[views_content_cache][download][version] = "6.x-2.x"
+
+projects[views_field_view][subdir] = "contrib"
+
+
 projects[views_slideshow][subdir] = "contrib"
 projects[views_slideshow][version] = "2.3"
 
diff --git a/modules/features/commons_core/commons_core.blocks.inc b/modules/features/commons_core/commons_core.blocks.inc
index 21438bf..74c9988 100644
--- a/modules/features/commons_core/commons_core.blocks.inc
+++ b/modules/features/commons_core/commons_core.blocks.inc
@@ -66,9 +66,20 @@ function _commons_core_block_list() {
     'info' => t('Create a notice'),
     'cache' => BLOCK_CACHE_GLOBAL,
   );
+  $blocks['your_content'] = array(
+    'info' => t('Your content'),
+    'cache' => BLOCK_CACHE_GLOBAL,
+  );
   return $blocks;
 }
 
+function _commons_core_your_content_block_view() {
+  $block = array();
+  $block['subject'] = t('Your content');
+  $block['content'] = l(t('Your posts and comments'), 'mycontent/mine', array('attributes' => array('class' => 'my-content')));
+  $block['content'] .= l(t('Your bookmarks'), 'bookmarks', array('attributes' => array('class' => 'my-bookmarks')));
+  return $block;
+}
 /**
  * Display a block with global user statistics
  */
diff --git a/modules/features/commons_core/commons_core.context.inc b/modules/features/commons_core/commons_core.context.inc
index 887ae05..fffaee2 100644
--- a/modules/features/commons_core/commons_core.context.inc
+++ b/modules/features/commons_core/commons_core.context.inc
@@ -5,6 +5,7 @@
  */
 function commons_core_context_default_contexts() {
   $export = array();
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -37,8 +38,8 @@ function commons_core_context_default_contexts() {
   // Included for use with string extractors like potx.
   t('Bookmarks');
   t('The bookmarks page');
-
   $export['bookmarks'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -82,8 +83,8 @@ function commons_core_context_default_contexts() {
   // Included for use with string extractors like potx.
   t('Show on every page');
   t('Sitewide');
-
   $export['global'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -118,8 +119,8 @@ function commons_core_context_default_contexts() {
   // Included for use with string extractors like potx.
   t('Group');
   t('The context of a group');
-
   $export['group-context'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -172,8 +173,8 @@ function commons_core_context_default_contexts() {
   // Included for use with string extractors like potx.
   t('Group');
   t('The group home page');
-
   $export['group-home'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -230,8 +231,8 @@ function commons_core_context_default_contexts() {
   // Translatables
   // Included for use with string extractors like potx.
   t('The list of available groups on the site');
-
   $export['group-listing'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -274,8 +275,8 @@ function commons_core_context_default_contexts() {
   // Translatables
   // Included for use with string extractors like potx.
   t('A listing of your groups');
-
   $export['group-listing-mine'] = $context;
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
@@ -321,7 +322,7 @@ function commons_core_context_default_contexts() {
   // Included for use with string extractors like potx.
   t('Notice listing and nodes');
   t('Notices');
-
   $export['notices'] = $context;
+
   return $export;
 }
diff --git a/modules/features/commons_core/commons_core.features.inc b/modules/features/commons_core/commons_core.features.inc
index 5f295bc..63289b0 100644
--- a/modules/features/commons_core/commons_core.features.inc
+++ b/modules/features/commons_core/commons_core.features.inc
@@ -222,8 +222,8 @@ function commons_core_imagecache_default_presets() {
           'module' => 'imagecache',
           'action' => 'imagecache_scale_and_crop',
           'data' => array(
-            'width' => '30',
-            'height' => '30',
+            'width' => '50',
+            'height' => '50',
           ),
         ),
       ),
diff --git a/modules/features/commons_core/commons_core.info b/modules/features/commons_core/commons_core.info
index fdb1764..506e53c 100644
--- a/modules/features/commons_core/commons_core.info
+++ b/modules/features/commons_core/commons_core.info
@@ -1,4 +1,7 @@
+name = "Commons Core"
+description = "The main components of Commons"
 core = "6.x"
+package = "Commons"
 dependencies[] = "ajax_load"
 dependencies[] = "chart"
 dependencies[] = "comment"
@@ -21,7 +24,6 @@ dependencies[] = "imagefield"
 dependencies[] = "insert"
 dependencies[] = "link"
 dependencies[] = "menu"
-dependencies[] = "node"
 dependencies[] = "og"
 dependencies[] = "og_access"
 dependencies[] = "og_features"
@@ -41,7 +43,6 @@ dependencies[] = "taxonomy"
 dependencies[] = "text"
 dependencies[] = "token"
 dependencies[] = "tracker"
-dependencies[] = "user"
 dependencies[] = "user_relationship_blocks"
 dependencies[] = "user_relationship_mailer"
 dependencies[] = "user_relationship_views"
@@ -55,7 +56,6 @@ dependencies[] = "views_slideshow"
 dependencies[] = "views_slideshow_singleframe"
 dependencies[] = "wysiwyg"
 dependencies[] = "wysiwyg_filter"
-description = "The main components of Commons"
 features[content][] = "group-field_featured_group"
 features[content][] = "group-field_group_image"
 features[content][] = "group-field_grouplink"
@@ -204,11 +204,11 @@ features[variable][] = "og_home_page_view"
 features[variable][] = "og_private_groups"
 features[variable][] = "og_statistics_include_unapproved_members"
 features[variable][] = "og_visibility"
+features[variable][] = "quant_height"
+features[variable][] = "quant_width"
 features[variable][] = "remove_markup_default_group"
 features[variable][] = "remove_markup_default_notice"
 features[variable][] = "remove_markup_default_page"
-features[variable][] = "quant_height"
-features[variable][] = "quant_width"
 features[variable][] = "tagadelic_block_tags_1"
 features[variable][] = "tagadelic_sort_order"
 features[variable][] = "tagging_inject_1"
@@ -246,6 +246,8 @@ features[views][] = "groups_newest_groups"
 features[views][] = "most_bookmarked"
 features[views][] = "my_recent_items"
 features[views][] = "my_unread_items"
+features[views][] = "new_groups_field"
+features[views][] = "new_your_groups"
 features[views][] = "newest_users"
 features[views][] = "notice_latest_comments"
 features[views][] = "og_my_content"
@@ -253,5 +255,3 @@ features[views][] = "recent_notices"
 features[views][] = "tag_cloud"
 features[views][] = "user_meta"
 features[views_api][] = "api:2"
-name = "Commons Core"
-package = "Commons"
diff --git a/modules/features/commons_core/commons_core.install b/modules/features/commons_core/commons_core.install
index 759625a..d3dcc62 100644
--- a/modules/features/commons_core/commons_core.install
+++ b/modules/features/commons_core/commons_core.install
@@ -413,4 +413,12 @@ function commons_core_update_6015() {
     drupal_install_modules(array('tidy_node_links'));
   }
   return array();
+}
+
+/**
+** Don't redirect requests for the frontpage to 'stream'.
+** See http://drupal.org/node/1411684 for more.
+*/
+function commons_core_update_6016() {
+  variable_set('commons_status_streams_auth_frontpage', 0);
 }
\ No newline at end of file
diff --git a/modules/features/commons_core/commons_core.strongarm.inc b/modules/features/commons_core/commons_core.strongarm.inc
index 27a68f0..09b5436 100644
--- a/modules/features/commons_core/commons_core.strongarm.inc
+++ b/modules/features/commons_core/commons_core.strongarm.inc
@@ -187,41 +187,41 @@ function commons_core_strongarm() {
   $strongarm->name = 'og_visibility';
   $strongarm->value = '2';
   $export['og_visibility'] = $strongarm;
-  
+
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'remove_markup_default_group';
-  $strongarm->value = 1;
-  $export['remove_markup_default_group'] = $strongarm;
-  
+  $strongarm->name = 'quant_height';
+  $strongarm->value = '175';
+  $export['quant_height'] = $strongarm;
+
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'remove_markup_default_notice';
-  $strongarm->value = 1;
-  $export['remove_markup_default_notice'] = $strongarm;
-  
+  $strongarm->name = 'quant_width';
+  $strongarm->value = '425';
+  $export['quant_width'] = $strongarm;
+
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'remove_markup_default_page';
+  $strongarm->name = 'remove_markup_default_group';
   $strongarm->value = 1;
-  $export['remove_markup_default_page'] = $strongarm;
+  $export['remove_markup_default_group'] = $strongarm;
 
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'quant_height';
-  $strongarm->value = '175';
-  $export['quant_height'] = $strongarm;
+  $strongarm->name = 'remove_markup_default_notice';
+  $strongarm->value = 1;
+  $export['remove_markup_default_notice'] = $strongarm;
 
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'quant_width';
-  $strongarm->value = '425';
-  $export['quant_width'] = $strongarm;
+  $strongarm->name = 'remove_markup_default_page';
+  $strongarm->value = 1;
+  $export['remove_markup_default_page'] = $strongarm;
 
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
@@ -287,6 +287,13 @@ function commons_core_strongarm() {
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
+  $strongarm->name = 'user_pictures';
+  $strongarm->value = '1';
+  $export['user_pictures'] = $strongarm;
+
+  $strongarm = new stdClass;
+  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
+  $strongarm->api_version = 1;
   $strongarm->name = 'user_picture_dimensions';
   $strongarm->value = '';
   $export['user_picture_dimensions'] = $strongarm;
@@ -322,13 +329,6 @@ function commons_core_strongarm() {
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
-  $strongarm->name = 'user_pictures';
-  $strongarm->value = '1';
-  $export['user_pictures'] = $strongarm;
-
-  $strongarm = new stdClass;
-  $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
-  $strongarm->api_version = 1;
   $strongarm->name = 'user_relationships_notifications_disabled';
   $strongarm->value = 1;
   $export['user_relationships_notifications_disabled'] = $strongarm;
diff --git a/modules/features/commons_core/commons_core.views_default.inc b/modules/features/commons_core/commons_core.views_default.inc
index 071f764..5690332 100644
--- a/modules/features/commons_core/commons_core.views_default.inc
+++ b/modules/features/commons_core/commons_core.views_default.inc
@@ -4018,6 +4018,677 @@ function commons_core_views_default_views() {
 
   $views[$view->name] = $view;
 
+  // Exported view: new_groups_field
+  $view = new view;
+  $view->name = 'new_groups_field';
+  $view->description = 'A view that displays 3 posts in a given organic group. Intended to be used as a views_field_view field as innew_your_groups.';
+  $view->tag = '';
+  $view->base_table = 'node';
+  $view->core = 6;
+  $view->api_version = '2';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('fields', array(
+    'nid' => array(
+      'label' => 'Nid',
+      '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_to_node' => 0,
+      'exclude' => 1,
+      'id' => 'nid',
+      'table' => 'node',
+      'field' => 'nid',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+    'group_nid' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => FALSE,
+        'text' => '',
+        'make_link' => FALSE,
+        'path' => '',
+        'absolute' => '',
+        'alt' => '',
+        'rel' => '',
+        'link_class' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'trim' => FALSE,
+        'max_length' => '',
+        'word_boundary' => TRUE,
+        'ellipsis' => TRUE,
+        'strip_tags' => FALSE,
+        'html' => FALSE,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
+      'type' => 'separator',
+      'separator' => ', ',
+      'exclude' => 1,
+      'id' => 'group_nid',
+      'table' => 'og_ancestry',
+      'field' => 'group_nid',
+      'relationship' => 'none',
+    ),
+    'picture' => array(
+      '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,
+      'imagecache_preset' => 'user_picture_meta',
+      'exclude' => 0,
+      'id' => 'picture',
+      'table' => 'users',
+      'field' => 'picture',
+      'relationship' => 'none',
+      'override' => array(
+        'button' => 'Override',
+      ),
+    ),
+    'name' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 1,
+        'text' => 'by [name]',
+        '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_to_user' => 1,
+      'overwrite_anonymous' => 0,
+      'anonymous_text' => '',
+      'exclude' => 0,
+      'id' => 'name',
+      'table' => 'users',
+      'field' => 'name',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+    'title' => array(
+      '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_to_node' => 1,
+      'exclude' => 0,
+      'id' => 'title',
+      'table' => 'node',
+      'field' => 'title',
+      'relationship' => 'none',
+    ),
+    'created' => array(
+      '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,
+      'date_format' => 'small',
+      'custom_date_format' => '',
+      'exclude' => 0,
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
+      'relationship' => 'none',
+      'override' => array(
+        'button' => 'Override',
+      ),
+    ),
+    'comment_count' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 1,
+        'text' => 'Comments: [comment_count]',
+        'make_link' => 1,
+        'path' => 'node/[nid]#comments',
+        'absolute' => 1,
+        '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,
+      'set_precision' => FALSE,
+      'precision' => 0,
+      'decimal' => '.',
+      'separator' => ',',
+      'format_plural' => 0,
+      'format_plural_singular' => '1',
+      'format_plural_plural' => '@count',
+      'prefix' => '',
+      'suffix' => '',
+      'exclude' => 0,
+      'id' => 'comment_count',
+      'table' => 'node_comment_statistics',
+      'field' => 'comment_count',
+      'relationship' => 'none',
+      'override' => array(
+        'button' => 'Override',
+      ),
+    ),
+    'new_comments' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 1,
+        'text' => '([new_comments] new)',
+        'make_link' => 1,
+        'path' => 'node/[nid]#new',
+        'absolute' => 1,
+        '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,
+      'set_precision' => FALSE,
+      'precision' => 0,
+      'decimal' => '.',
+      'separator' => ',',
+      'format_plural' => 0,
+      'format_plural_singular' => '1',
+      'format_plural_plural' => '@count',
+      'prefix' => '',
+      'suffix' => '',
+      'link_to_comment' => 1,
+      'exclude' => 0,
+      'id' => 'new_comments',
+      'table' => 'node',
+      'field' => 'new_comments',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('sorts', array(
+    'created' => array(
+      'order' => 'DESC',
+      'granularity' => 'second',
+      'id' => 'created',
+      'table' => 'node',
+      'field' => 'created',
+      'override' => array(
+        'button' => 'Override',
+      ),
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('arguments', array(
+    'group_nid' => array(
+      'default_action' => 'not found',
+      'style_plugin' => 'default_summary',
+      'style_options' => array(),
+      'wildcard' => 'all',
+      'wildcard_substitution' => 'All',
+      'title' => '',
+      'breadcrumb' => '',
+      'default_argument_type' => 'fixed',
+      'default_argument' => '',
+      'validate_type' => 'none',
+      'validate_fail' => 'not found',
+      'break_phrase' => 0,
+      'not' => 0,
+      'id' => 'group_nid',
+      'table' => 'og_ancestry',
+      'field' => 'group_nid',
+      'validate_user_argument_type' => 'uid',
+      'validate_user_roles' => array(
+        2 => 0,
+        3 => 0,
+        4 => 0,
+        5 => 0,
+      ),
+      'relationship' => 'none',
+      'default_options_div_prefix' => '',
+      'default_taxonomy_tid_term_page' => 0,
+      'default_taxonomy_tid_node' => 0,
+      'default_taxonomy_tid_limit' => 0,
+      'default_taxonomy_tid_vids' => array(
+        2 => 0,
+        4 => 0,
+        1 => 0,
+        3 => 0,
+      ),
+      'default_argument_user' => 0,
+      'default_argument_fixed' => '',
+      'default_argument_activity_log_stream_owner_type' => 'user',
+      'default_argument_php' => '',
+      'validate_argument_node_type' => array(
+        'blog' => 0,
+        'poll' => 0,
+        'answer' => 0,
+        'question' => 0,
+        'discussion' => 0,
+        'document' => 0,
+        'event' => 0,
+        'wiki' => 0,
+        'group' => 0,
+        'notice' => 0,
+        'page' => 0,
+      ),
+      'validate_argument_node_access' => 0,
+      'validate_argument_nid_type' => 'nid',
+      'validate_argument_vocabulary' => array(
+        2 => 0,
+        4 => 0,
+        1 => 0,
+        3 => 0,
+      ),
+      'validate_argument_type' => 'tid',
+      'validate_argument_transform' => 0,
+      'validate_user_restrict_roles' => 0,
+      'validate_argument_node_flag_name' => '*relationship*',
+      'validate_argument_node_flag_test' => 'flaggable',
+      'validate_argument_node_flag_id_type' => 'id',
+      'validate_argument_user_flag_name' => '*relationship*',
+      'validate_argument_user_flag_test' => 'flaggable',
+      'validate_argument_user_flag_id_type' => 'id',
+      'validate_argument_is_member' => '0',
+      'validate_argument_group_node_type' => array(
+        'group' => 0,
+      ),
+      'validate_argument_php' => '',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status' => array(
+      'operator' => '=',
+      'value' => '1',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status',
+      'table' => 'node',
+      'field' => 'status',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('cache', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('title', 'What\'s new in your groups');
+  $handler->override_option('items_per_page', 3);
+  $handler->override_option('style_plugin', 'list');
+  $handler->override_option('style_options', array(
+    'grouping' => '',
+    'type' => 'ul',
+  ));
+  $handler->override_option('row_options', array(
+    'inline' => array(
+      'picture' => 'picture',
+      'name' => 'name',
+      'created' => 'created',
+      'comment_count' => 'comment_count',
+      'new_comments' => 'new_comments',
+    ),
+    'separator' => '',
+    'hide_empty' => 0,
+  ));
+  $handler = $view->new_display('block', 'Block', 'block_1');
+  $handler->override_option('block_description', '');
+  $handler->override_option('block_caching', '-1');
+
+  $views[$view->name] = $view;
+
+  // Exported view: new_your_groups
+  $view = new view;
+  $view->name = 'new_your_groups';
+  $view->description = '';
+  $view->tag = '';
+  $view->base_table = 'node';
+  $view->core = 6;
+  $view->api_version = '2';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+  $handler = $view->new_display('default', 'Defaults', 'default');
+  $handler->override_option('fields', array(
+    'nid' => array(
+      'label' => 'Nid',
+      '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_to_node' => 0,
+      'exclude' => 1,
+      'id' => 'nid',
+      'table' => 'node',
+      'field' => 'nid',
+      'relationship' => 'none',
+    ),
+    'title' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => 0,
+        'text' => '[title]',
+        'make_link' => 0,
+        'path' => 'node/[nid]',
+        'absolute' => 1,
+        'link_class' => 'group-title',
+        '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_to_node' => 1,
+      'exclude' => 0,
+      'id' => 'title',
+      'table' => 'node',
+      'field' => 'title',
+      'relationship' => 'none',
+      'override' => array(
+        'button' => 'Override',
+      ),
+    ),
+    'view' => array(
+      'label' => '',
+      'alter' => array(
+        'alter_text' => FALSE,
+        'text' => '',
+        'make_link' => FALSE,
+        'path' => '',
+        'absolute' => '',
+        'link_class' => '',
+        'alt' => '',
+        'rel' => '',
+        'prefix' => '',
+        'suffix' => '',
+        'target' => '',
+        'help' => '',
+        'trim' => FALSE,
+        'max_length' => '',
+        'word_boundary' => TRUE,
+        'ellipsis' => TRUE,
+        'html' => FALSE,
+        'strip_tags' => FALSE,
+      ),
+      'empty' => '',
+      'hide_empty' => 0,
+      'empty_zero' => 0,
+      'hide_alter_empty' => 1,
+      'view' => 'new_groups_field',
+      'display' => 'block_1',
+      'arguments' => '[nid]',
+      'query_aggregation' => 0,
+      'exclude' => 0,
+      'id' => 'view',
+      'table' => 'views',
+      'field' => 'view',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('sorts', array(
+    'title' => array(
+      'order' => 'ASC',
+      'id' => 'title',
+      'table' => 'node',
+      'field' => 'title',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('filters', array(
+    'status' => array(
+      'operator' => '=',
+      'value' => '1',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'status',
+      'table' => 'node',
+      'field' => 'status',
+      'relationship' => 'none',
+    ),
+    'uid' => array(
+      'operator' => '=',
+      'value' => '1',
+      'group' => '0',
+      'exposed' => FALSE,
+      'expose' => array(
+        'operator' => FALSE,
+        'label' => '',
+      ),
+      'id' => 'uid',
+      'table' => 'og_uid',
+      'field' => 'uid',
+      'relationship' => 'none',
+    ),
+  ));
+  $handler->override_option('access', array(
+    'type' => 'none',
+  ));
+  $handler->override_option('cache', array(
+    'type' => 'views_content_cache',
+    'keys' => array(
+      'AND' => array(
+        'comment' => array(
+          'changed' => 0,
+        ),
+        'node' => array(
+          'answer' => 'answer',
+          'blog' => 'blog',
+          'discussion' => 'discussion',
+          'document' => 'document',
+          'event' => 'event',
+          'group' => 'group',
+          'notice' => 'notice',
+          'page' => 'page',
+          'poll' => 'poll',
+          'question' => 'question',
+          'wiki' => 'wiki',
+        ),
+        'og' => array(
+          'user' => 'user',
+          'current' => 0,
+        ),
+      ),
+      'OR' => array(
+        'votingapi' => array(
+          'tag:vote' => 0,
+          'function:count' => 0,
+          'function:average' => 0,
+          'function:sum' => 0,
+          'function:positives' => 0,
+          'function:negatives' => 0,
+        ),
+      ),
+    ),
+    'results_min_lifespan' => '-1',
+    'results_max_lifespan' => '3600',
+    'output_min_lifespan' => '-1',
+    'output_max_lifespan' => '3600',
+  ));
+  $handler->override_option('title', 'What\'s new in your groups');
+  $handler->override_option('empty', 'You haven\'t joined any groups yet. You can <a href = "groups">view the Groups directory</a> to find and join interesting groups.');
+  $handler->override_option('empty_format', '1');
+  $handler->override_option('style_options', array(
+    'grouping' => '',
+  ));
+  $handler->override_option('row_options', array(
+    'inline' => array(
+      'created' => 'created',
+      'comment_count' => 'comment_count',
+      'new_comments' => 'new_comments',
+    ),
+    'separator' => '',
+    'hide_empty' => 0,
+  ));
+  $handler = $view->new_display('block', 'Block', 'block_1');
+  $handler->override_option('block_description', '');
+  $handler->override_option('block_caching', '-1');
+
+  $views[$view->name] = $view;
+
   // Exported view: newest_users
   $view = new view;
   $view->name = 'newest_users';
@@ -5926,39 +6597,6 @@ function commons_core_views_default_views() {
   ));
   $handler = $view->new_display('block', 'Block', 'block_1');
   $handler->override_option('fields', array(
-    'picture' => array(
-      'label' => '',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        '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,
-      'imagecache_preset' => 'user_picture_meta',
-      'exclude' => 0,
-      'id' => 'picture',
-      'table' => 'users',
-      'field' => 'picture',
-      'override' => array(
-        'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
     'title' => array(
       'label' => '',
       'alter' => array(
@@ -6054,41 +6692,6 @@ function commons_core_views_default_views() {
       ),
       'relationship' => 'none',
     ),
-    'name' => array(
-      'label' => 'by',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        '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,
-      'link_to_user' => 1,
-      'overwrite_anonymous' => 0,
-      'anonymous_text' => '',
-      'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
-      'override' => array(
-        'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
   ));
   $handler->override_option('items_per_page', 3);
   $handler->override_option('use_pager', 'mini');
diff --git a/modules/features/commons_home/commons_home.box.inc b/modules/features/commons_home/commons_home.box.inc
index bbfe799..f83fa4b 100644
--- a/modules/features/commons_home/commons_home.box.inc
+++ b/modules/features/commons_home/commons_home.box.inc
@@ -5,6 +5,7 @@
  */
 function commons_home_default_box() {
   $export = array();
+
   $box = new stdClass;
   $box->disabled = FALSE; /* Edit this to true to make a default box disabled initially */
   $box->api_version = 1;
@@ -13,26 +14,26 @@ function commons_home_default_box() {
   $box->title = 'Community Powered Innovation';
   $box->description = 'Homepage Commons information';
   $box->options = array(
-    'body' => '<p>Welcome to your Commons installation, your ready-to-use solution for communities of all types - from intranets to customer community sites and more. Next, you may want to:</p>
-
-<div class="intro-textblock">
-<h3>Customize your site</h3>
-Add your own look &amp; feel, configure how it works, or extend it by installing more Drupal modules.
-</div>
-
-<div class="intro-textblock">
-<h3>Link in the Network</h3>
-Enable your free Acquia Network trial to add content recommendations, advanced site search &amp; other features to your site.</div>
-
-<div class="intro-textblock">
-<h3>Get help</h3>
-Find a consultant to add new features, get support for what\'s there, or learn how to grow your community.
-</div>
-
+    'body' => '<p>Welcome to your Commons installation, your ready-to-use solution for communities of all types - from intranets to customer community sites and more. Next, you may want to:</p>
+
+<div class="intro-textblock">
+<h3>Customize your site</h3>
+Add your own look &amp; feel, configure how it works, or extend it by installing more Drupal modules.
+</div>
+
+<div class="intro-textblock">
+<h3>Link in the Network</h3>
+Enable your free Acquia Network trial to add content recommendations, advanced site search &amp; other features to your site.</div>
+
+<div class="intro-textblock">
+<h3>Get help</h3>
+Find a consultant to add new features, get support for what\'s there, or learn how to grow your community.
+</div>
+
 <p><a class="intro-morebutton" href="http://commons.acquia.com/get-started" target="_blank">Learn more</a></p>',
     'format' => '2',
   );
-
   $export['homepage_info_box'] = $box;
+
   return $export;
 }
diff --git a/modules/features/commons_home/commons_home.context.inc b/modules/features/commons_home/commons_home.context.inc
index d45d6a0..3a6f70c 100644
--- a/modules/features/commons_home/commons_home.context.inc
+++ b/modules/features/commons_home/commons_home.context.inc
@@ -5,13 +5,95 @@
  */
 function commons_home_context_default_contexts() {
   $export = array();
+
   $context = new stdClass;
   $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
   $context->api_version = 3;
   $context->name = 'home';
-  $context->description = 'The community homepage';
+  $context->description = 'The community homepage for authenticated users';
+  $context->tag = 'Home';
+  $context->conditions = array(
+    'path' => array(
+      'values' => array(
+        '<front>' => '<front>',
+        'home' => 'home',
+      ),
+    ),
+    'user' => array(
+      'values' => array(
+        'authenticated user' => 'authenticated user',
+      ),
+    ),
+  );
+  $context->reactions = array(
+    'block' => array(
+      'blocks' => array(
+        'commons_core-join_learn' => array(
+          'module' => 'commons_core',
+          'delta' => 'join_learn',
+          'region' => 'sidebar_last',
+          'weight' => 0,
+        ),
+        'views-recent_notices-block_1' => array(
+          'module' => 'views',
+          'delta' => 'recent_notices-block_1',
+          'region' => 'sidebar_last',
+          'weight' => 1,
+        ),
+        'commons_core-your_content' => array(
+          'module' => 'commons_core',
+          'delta' => 'your_content',
+          'region' => 'sidebar_last',
+          'weight' => 2,
+        ),
+        'views-activity_log_stream-block_1' => array(
+          'module' => 'views',
+          'delta' => 'activity_log_stream-block_1',
+          'region' => 'sidebar_last',
+          'weight' => 3,
+        ),
+        'views-a3e7b5edbe74088872090245cc4288ec' => array(
+          'module' => 'views',
+          'delta' => 'a3e7b5edbe74088872090245cc4288ec',
+          'region' => 'sidebar_last',
+          'weight' => 4,
+        ),
+        'views-new_your_groups-block_1' => array(
+          'module' => 'views',
+          'delta' => 'new_your_groups-block_1',
+          'region' => 'content',
+          'weight' => 0,
+        ),
+      ),
+    ),
+  );
+  $context->condition_mode = 1;
+
+  // Translatables
+  // Included for use with string extractors like potx.
+  t('Home');
+  t('The community homepage for authenticated users');
+  $export['home'] = $context;
+
+  $context = new stdClass;
+  $context->disabled = FALSE; /* Edit this to true to make a default context disabled initially */
+  $context->api_version = 3;
+  $context->name = 'home_anon';
+  $context->description = 'The community homepage for anonymous users';
   $context->tag = 'Home';
-  $context->conditions = array();
+  $context->conditions = array(
+    'path' => array(
+      'values' => array(
+        '<front>' => '<front>',
+        'home' => 'home',
+      ),
+    ),
+    'user' => array(
+      'values' => array(
+        'anonymous user' => 'anonymous user',
+      ),
+    ),
+  );
   $context->reactions = array(
     'block' => array(
       'blocks' => array(
@@ -60,13 +142,13 @@ function commons_home_context_default_contexts() {
       ),
     ),
   );
-  $context->condition_mode = 0;
+  $context->condition_mode = 1;
 
   // Translatables
   // Included for use with string extractors like potx.
   t('Home');
-  t('The community homepage');
+  t('The community homepage for anonymous users');
+  $export['home_anon'] = $context;
 
-  $export['home'] = $context;
   return $export;
 }
diff --git a/modules/features/commons_home/commons_home.info b/modules/features/commons_home/commons_home.info
index 85482f3..3db1882 100644
--- a/modules/features/commons_home/commons_home.info
+++ b/modules/features/commons_home/commons_home.info
@@ -1,4 +1,8 @@
+name = "Commons Home"
+description = "The components that make up the Commons home page"
 core = "6.x"
+package = "Commons"
+dependencies[] = "activity_log"
 dependencies[] = "boxes"
 dependencies[] = "comment"
 dependencies[] = "commons_core"
@@ -10,9 +14,9 @@ dependencies[] = "strongarm"
 dependencies[] = "tagadelic_views"
 dependencies[] = "taxonomy"
 dependencies[] = "views"
-description = "The components that make up the Commons home page"
 features[box][] = "homepage_info_box"
 features[context][] = "home"
+features[context][] = "home_anon"
 features[ctools][] = "boxes:box:1"
 features[ctools][] = "context:context:3"
 features[ctools][] = "strongarm:strongarm:1"
@@ -20,5 +24,3 @@ features[variable][] = "site_frontpage"
 features[views][] = "homepage_group_showcase"
 features[views][] = "homepage_recent_featured"
 features[views_api][] = "api:2"
-name = "Commons Home"
-package = "Commons"
diff --git a/modules/features/commons_home/commons_home.pages.inc b/modules/features/commons_home/commons_home.pages.inc
index b9ad8c6..8d9a7ed 100644
--- a/modules/features/commons_home/commons_home.pages.inc
+++ b/modules/features/commons_home/commons_home.pages.inc
@@ -9,8 +9,5 @@
  * Page callback for the homepage
  */
 function commons_home_homepage() {
-  // Active the context
-  context_set('context', 'home', context_load('home'));  
-  // Return nothing, as context handles the content
   return '';
 }
diff --git a/modules/features/commons_home/commons_home.strongarm.inc b/modules/features/commons_home/commons_home.strongarm.inc
index 06a98c8..c87c021 100644
--- a/modules/features/commons_home/commons_home.strongarm.inc
+++ b/modules/features/commons_home/commons_home.strongarm.inc
@@ -5,12 +5,13 @@
  */
 function commons_home_strongarm() {
   $export = array();
+
   $strongarm = new stdClass;
   $strongarm->disabled = FALSE; /* Edit this to true to make a default strongarm disabled initially */
   $strongarm->api_version = 1;
   $strongarm->name = 'site_frontpage';
   $strongarm->value = 'home';
-
   $export['site_frontpage'] = $strongarm;
+
   return $export;
 }
diff --git a/modules/features/commons_home/commons_home.views_default.inc b/modules/features/commons_home/commons_home.views_default.inc
index adc5776..483903e 100644
--- a/modules/features/commons_home/commons_home.views_default.inc
+++ b/modules/features/commons_home/commons_home.views_default.inc
@@ -11,10 +11,9 @@ function commons_home_views_default_views() {
   $view->name = 'homepage_group_showcase';
   $view->description = 'Show the largest groups and some recent activity from each';
   $view->tag = 'commons';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('fields', array(
@@ -478,9 +477,9 @@ function commons_home_views_default_views() {
       'field' => 'group_nid',
       'validate_user_argument_type' => 'uid',
       'validate_user_roles' => array(
-        '2' => 0,
-        '3' => 0,
-        '4' => 0,
+        2 => 0,
+        3 => 0,
+        4 => 0,
       ),
       'override' => array(
         'button' => 'Use default',
@@ -504,8 +503,8 @@ function commons_home_views_default_views() {
       'validate_argument_node_access' => 0,
       'validate_argument_nid_type' => 'nid',
       'validate_argument_vocabulary' => array(
-        '2' => 0,
-        '1' => 0,
+        2 => 0,
+        1 => 0,
       ),
       'validate_argument_type' => 'tid',
       'validate_argument_transform' => 0,
@@ -596,10 +595,9 @@ function commons_home_views_default_views() {
   $view->name = 'homepage_recent_featured';
   $view->description = 'Show the latest featured content items';
   $view->tag = 'commons';
-  $view->view_php = '';
   $view->base_table = 'node';
-  $view->is_cacheable = FALSE;
-  $view->api_version = 2;
+  $view->core = 0;
+  $view->api_version = '2';
   $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
   $handler = $view->new_display('default', 'Defaults', 'default');
   $handler->override_option('relationships', array(
@@ -803,8 +801,8 @@ function commons_home_views_default_views() {
       'link_to_taxonomy' => 1,
       'limit' => 0,
       'vids' => array(
-        '2' => 0,
-        '1' => 0,
+        2 => 0,
+        1 => 0,
       ),
       'exclude' => 0,
       'id' => 'tid',
@@ -952,6 +950,7 @@ function commons_home_views_default_views() {
       'id' => 'tid',
       'table' => 'term_node',
       'field' => 'tid',
+      'vid' => '1',
     ),
     'uid' => array(
       'id' => 'uid',
@@ -966,7 +965,7 @@ function commons_home_views_default_views() {
   $handler->override_option('cache', array(
     'type' => 'none',
   ));
-  $handler->override_option('title', 'Latest featured content');
+  $handler->override_option('title', 'Featured content');
   $handler->override_option('empty', 'No featured items are available');
   $handler->override_option('empty_format', '1');
   $handler->override_option('use_ajax', TRUE);
@@ -981,39 +980,6 @@ function commons_home_views_default_views() {
   ));
   $handler = $view->new_display('block', 'Block', 'block_1');
   $handler->override_option('fields', array(
-    'picture' => array(
-      'label' => '',
-      'alter' => array(
-        'alter_text' => 0,
-        'text' => '',
-        'make_link' => 0,
-        'path' => '',
-        'link_class' => '',
-        'alt' => '',
-        '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,
-      'imagecache_preset' => 'user_picture_meta',
-      'exclude' => 0,
-      'id' => 'picture',
-      'table' => 'users',
-      'field' => 'picture',
-      'override' => array(
-        'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
     'title' => array(
       'label' => '',
       'alter' => array(
@@ -1075,70 +1041,37 @@ function commons_home_views_default_views() {
       'field' => 'timestamp',
       'relationship' => 'none',
     ),
-    'created' => array(
-      'label' => 'Posted',
+    'group_nid' => array(
+      'label' => 'in',
       'alter' => array(
-        'alter_text' => 0,
-        'text' => '[created] [name]',
-        'make_link' => 0,
+        'alter_text' => FALSE,
+        'text' => '',
+        'make_link' => FALSE,
         'path' => '',
-        'link_class' => '',
+        'absolute' => '',
         'alt' => '',
-        '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,
-      'date_format' => 'small',
-      'custom_date_format' => '',
-      'exclude' => 0,
-      'id' => 'created',
-      'table' => 'node',
-      'field' => 'created',
-      'override' => array(
-        'button' => 'Use default',
-      ),
-      'relationship' => 'none',
-    ),
-    'name' => array(
-      'label' => '',
-      'alter' => array(
-        'alter_text' => 1,
-        'text' => 'by [name]',
-        'make_link' => 0,
-        'path' => '',
+        'rel' => '',
         'link_class' => '',
-        'alt' => '',
         'prefix' => '',
         'suffix' => '',
         'target' => '',
-        'help' => '',
-        'trim' => 0,
+        'trim' => FALSE,
         'max_length' => '',
-        'word_boundary' => 1,
-        'ellipsis' => 1,
-        'html' => 0,
-        'strip_tags' => 0,
+        'word_boundary' => TRUE,
+        'ellipsis' => TRUE,
+        'strip_tags' => FALSE,
+        'html' => FALSE,
       ),
       'empty' => '',
       'hide_empty' => 0,
       'empty_zero' => 0,
-      'link_to_user' => 1,
-      'overwrite_anonymous' => 0,
-      'anonymous_text' => '',
+      'hide_alter_empty' => 1,
+      'type' => 'separator',
+      'separator' => ', ',
       'exclude' => 0,
-      'id' => 'name',
-      'table' => 'users',
-      'field' => 'name',
+      'id' => 'group_nid',
+      'table' => 'og_ancestry',
+      'field' => 'group_nid',
       'override' => array(
         'button' => 'Use default',
       ),
diff --git a/modules/features/commons_status_streams/commons_status_streams.module b/modules/features/commons_status_streams/commons_status_streams.module
index 8a4fa4e..c432fee 100644
--- a/modules/features/commons_status_streams/commons_status_streams.module
+++ b/modules/features/commons_status_streams/commons_status_streams.module
@@ -28,7 +28,7 @@ function commons_status_streams_form_system_site_information_settings_alter(&$fo
     '#type' => 'checkbox',
     '#title' => t('Use the activity stream as the front page for authenticated users'),
     '#description' => t('If enabled, users who get to the front page by clicking your site name or logo or who are directed to the front page by Drupal will be redirected to their activity stream at <code>/stream</code> if they are logged in. Users can still visit the "normal" front page that anonymous users see by visiting its path directly or by clicking on the "Home" link in the menu.'),
-    '#default_value' => variable_get('commons_status_streams_auth_frontpage', 1),
+    '#default_value' => variable_get('commons_status_streams_auth_frontpage', 0),
   );
   $form['buttons']['#weight'] = 10;
 }
@@ -45,7 +45,7 @@ function commons_status_streams_facebook_status_link_alter(&$links, $status) {
  * Implementation of hook_init().
  */
 function commons_status_streams_init() {
-  if (variable_get('commons_status_streams_auth_frontpage', 1) && !user_is_anonymous()) {
+  if (variable_get('commons_status_streams_auth_frontpage', 0) && !user_is_anonymous()) {
     // example.com requested, but not example.com/home
     if (!str_replace(base_path(), '', $_SERVER['REQUEST_URI'])) {
       drupal_goto('stream');
diff --git a/themes/commons_roots/css/commons_roots-style.css b/themes/commons_roots/css/commons_roots-style.css
index 499dbc2..7a6ce9d 100644
--- a/themes/commons_roots/css/commons_roots-style.css
+++ b/themes/commons_roots/css/commons_roots-style.css
@@ -428,6 +428,48 @@ h1 + #content-tabs {
   font-weight:bold;
 } 
 
+a.my-content, a.my-bookmarks {
+  display: block;
+  clear: both;
+  font-weight: bold;
+  padding-top: 4px;
+}
+
+div #block-views-new_your_groups-block_1 {
+  padding-left: 15px;
+}
+
+#block-views-new_your_groups-block_1 .views-field-title {
+  font-size: 1.7em;
+  margin-bottom: 20px;
+}
+
+
+#block-views-new_your_groups-block_1 .views-field-view .view-new-groups-field .views-field-title {
+  font-size: 1em;
+  margin-bottom: none;
+}
+
+#block-views-new_your_groups-block_1 .block-title {
+  font-size: 2.4em;
+  color: #1E587C;
+  padding-bottom: 15px;
+}
+
+#block-views-new_your_groups-block_1 h3 {
+  font-size: 1.6em;
+  font-weight: normal;
+}
+#block-views-new_your_groups-block_1 .view-new-groups-field .item-list .views-row {
+  background: none;
+  padding-left: 0px;
+  border-bottom: none;
+}
+
+#block-views-new_your_groups-block_1 .view-new-groups-field ul {
+  border-bottom: 1px solid #ddd;
+}
+
 .intro-textblock {
   width: 30%;
   float: left;
diff --git a/themes/commons_roots/template.php b/themes/commons_roots/template.php
index 93b077a..1f1ddcf 100644
--- a/themes/commons_roots/template.php
+++ b/themes/commons_roots/template.php
@@ -1,4 +1,5 @@
 <?php
+
 // $Id: template.php 8021 2010-10-19 13:01:34Z sheena $
 
 /**
@@ -154,7 +155,7 @@ function commons_roots_shoutbox_post($shout, $links = array(), $alter_row_color=
   if ($links) {
     foreach ($links as $link) {
       $linkattributes = $link['linkattributes'];
-      $link_html = '<img src="'. $link['img'] .'"  width="'. $link['img_width'] .'" height="'. $link['img_height'] .'" alt="'. $link['title'] .'" class="shoutbox-imglink"/>';
+      $link_html = '<img src="'. $link['img'] .'" alt="'. $link['title'] .'" class="shoutbox-imglink"/>';
       $link_url = 'shout/'. $shout->shout_id .'/'. $link['action'];
       $img_links = l($link_html, $link_url, array('html' => TRUE, 'query' => array('destination' => drupal_get_path_alias($_GET['q'])))) . $img_links;
     }