diff --git a/modules/block/block.module b/modules/block/block.module
index ae4889e..2d2e848 100644
--- a/modules/block/block.module
+++ b/modules/block/block.module
@@ -580,6 +580,19 @@ function block_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function block_field_extra_fields() {
+  $extra['user']['user']['form']['block'] = array(
+    'label' => 'Personalize blocks',
+    'description' => t('Block module form element.'),
+    'weight' => 0,
+  );
+
+  return $extra;
+}
+
+/**
  * Implements hook_user_presave().
  */
 function block_user_presave(&$edit, $account, $category) {
@@ -1015,3 +1028,4 @@ function block_modules_uninstalled($modules) {
     ->condition('module', $modules, 'IN')
     ->execute();
 }
+
diff --git a/modules/contact/contact.module b/modules/contact/contact.module
index 7ecaa67..2b56a0a 100644
--- a/modules/contact/contact.module
+++ b/modules/contact/contact.module
@@ -256,3 +256,16 @@ function contact_form_user_admin_settings_alter(&$form, &$form_state) {
     '#default_value' => variable_get('contact_default_status', 1),
   );
 }
+
+/**
+ * Implements hook_field_extra_fields().
+ */
+function contact_field_extra_fields() {
+  $extra['user']['user']['form']['contact'] = array(
+    'label' => 'Contact',
+    'description' => t('Contact module form element.'),
+    'weight' => 0,
+  );
+
+  return $extra;
+}
diff --git a/modules/overlay/overlay.module b/modules/overlay/overlay.module
index 6d62c54..12d45b9 100644
--- a/modules/overlay/overlay.module
+++ b/modules/overlay/overlay.module
@@ -104,6 +104,19 @@ function overlay_form_user_profile_form_alter(&$form, &$form_state) {
 }
 
 /**
+ * Implements hook_field_extra_fields().
+ */
+function overlay_field_extra_fields() {
+  $extra['user']['user']['form']['overlay_control'] = array(
+    'label' => 'Administrative overlay',
+    'description' => t('Overlay module form element.'),
+    'weight' => 0,
+  );
+
+  return $extra;
+}
+
+/**
  * Implements hook_user_presave().
  */
 function overlay_user_presave(&$edit, $account, $category) {
@@ -955,3 +968,4 @@ function overlay_trigger_refresh() {
 function overlay_ajax_render_region($region) {
   print overlay_render_region($region);
 }
+
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 150b55e..2ac8e19 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -66,7 +66,10 @@ function system_admin_config_page() {
 function system_admin_menu_block_page() {
   $item = menu_get_item();
   if ($content = system_admin_menu_block($item)) {
-    $output = theme('admin_block_content', array('content' => $content));
+    $output = '<div class="admin clearfix">';
+    $output .= theme('system_compact_link');
+    $output .= theme('admin_block_content', array('content' => $content));
+    $output .= '</div>';
   }
   else {
     $output = t('You do not have any administrative items.');
diff --git a/modules/user/user.module b/modules/user/user.module
index 5ecffa6..cf74b80 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -197,7 +197,7 @@ function user_field_extra_fields() {
     'form' => array(
       'account' => array(
         'label' => 'User name and password',
-        'description' => t('User module account form elements'),
+        'description' => t('User module account form elements.'),
         'weight' => -10,
       ),
       'timezone' => array(
@@ -215,6 +215,26 @@ function user_field_extra_fields() {
     ),
   );
 
+  if (variable_get('user_pictures', 1) == 1) {
+    $return['user']['user']['form'] += array(
+      'picture' => array(
+        'label' => 'User picture',
+        'description' => t('User module picture form element.'),
+        'weight' => 0,
+      ),
+    );
+  }
+
+  if (variable_get('user_signatures', 1) == 1) {
+    $return['user']['user']['form'] += array(
+      'signature_settings' => array(
+        'label' => 'User signature',
+        'description' => t('User module signature form element.'),
+        'weight' => 0,
+      ),
+    );
+  }
+
   return $return;
 }