diff --git a/modules/user/user-picture.tpl.php b/modules/user/user-picture.tpl.php
index 183f151..56f6e3c 100644
--- a/modules/user/user-picture.tpl.php
+++ b/modules/user/user-picture.tpl.php
@@ -14,6 +14,8 @@
  * @see template_preprocess_user_picture()
  */
 ?>
+<?php if ($picture): ?>
 <div class="picture">
   <?php print $picture; ?>
 </div>
+<?php endif; ?>
diff --git a/modules/user/user.module b/modules/user/user.module
index 98a152e..68e088e 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -662,7 +662,7 @@ function user_user($type, &$edit, &$account, $category = NULL) {
       '#type' => 'user_profile_category',
       '#attributes' => array('class' => 'user-member'),
       '#weight' => 5,
-      '#title' => t('History'),
+      '#title' => $account->name,
     );
     $account->content['summary']['member_for'] = array(
       '#type' => 'user_profile_item',
@@ -1108,7 +1108,7 @@ function user_menu() {
   );
 
   $items['user/%user/view'] = array(
-    'title' => 'View',
+    'title' => 'Desktop',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
   );
@@ -1124,7 +1124,7 @@ function user_menu() {
   );
 
   $items['user/%user_category/edit'] = array(
-    'title' => 'Edit',
+    'title' => 'Edit profile',
     'page callback' => 'user_edit',
     'page arguments' => array(1),
     'access callback' => 'user_edit_access',
@@ -1132,6 +1132,7 @@ function user_menu() {
     'type' => MENU_LOCAL_TASK,
     'load arguments' => array('%map', '%index'),
     'file' => 'user.pages.inc',
+    'weight' => 99,
   );
 
   $items['user/%user_category/edit/account'] = array(