diff --git a/themes/zuitedesk/template.php b/themes/zuitedesk/template.php
index 859a3ae..18889f7 100644
--- a/themes/zuitedesk/template.php
+++ b/themes/zuitedesk/template.php
@@ -157,12 +157,13 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
 
   // Main menu: primary links.
   $lang = $vars['language']->language != 'es' ? '/' . $vars['language']->language : '';
+  $home = $vars['language']->language != 'es' ? '/' . $vars['language']->language : '/';
   $deskmenu = $_SESSION['deskmenu'];
 
   $pl = '';
   if ($vars['logged_in'] && !empty($deskmenu)) {
     // Home option:
-    $pl .= _zuitedesk_option(TRUE, "$lang", t('Home'), 'home', NULL, t('Desktop'));
+    $pl .= _zuitedesk_option(TRUE, "$home", t('Home'), 'home', NULL, t('Desktop'));
     // CRM submenu:
     $submenu = '';
     $submenu .= _zuitedesk_option(!empty($_SESSION['SuiteCRM_Session_ID']), "$lang/suitecrm", 'SuiteCRM', 'suitecrm', 'crm', t('Core sales, customer service and marketing processes with SuiteCRM'));
@@ -199,19 +200,21 @@ function zuitedesk_preprocess_page(&$vars, $hook) {
     $partial .= _zuitedesk_option($deskmenu[16], "$lang/timetrackings", t('Timetrackings'), 'timetracking', 'timetracking');
     $submenu .= _zuitedesk_divider($submenu, $partial);
     $partial = '';
-    $partial .= _zuitedesk_option(TRUE, "$lang/search", t('Advanced search'), 'search', 'search');
     $partial .= _zuitedesk_option($deskmenu[2], "$lang/attributes", t('Attributes'), 'attributes', 'filter');
     $partial .= _zuitedesk_option($deskmenu[2], "$lang/admin/settings/suitedesk", t('Configuration'), 'settings', 'storm');
     $submenu .= _zuitedesk_divider($submenu, $partial);
+    $partial = '';
+    $partial .= _zuitedesk_option(TRUE, '', t('SuiteDesk Tour'), 'help', 'help', t('A beginner\'s guide to SuiteDesk'));
+    $partial .= _zuitedesk_option(TRUE, "$lang/search", t('Advanced search'), 'search', 'search');
+    $submenu .= _zuitedesk_divider($submenu, $partial);
     $pl .= _zuitedesk_submenu($submenu, t('Assistance'), 'assistance');
     // User submenu:
     $submenu = '';
     $submenu .= _zuitedesk_option($deskmenu[11], "$lang/notes", t('My notes'), 'notes', 'note');
     $submenu .= _zuitedesk_option($deskmenu[12], "$lang/ideas", t('Reminders'), 'ideas', 'idea');
-    $submenu .= _zuitedesk_option($deskmenu[17], "$lang/user/watcher", t('Watcher'), 'watcher', 'apply');
-    $submenu .= _zuitedesk_option($deskmenu[18], "$lang/trash", t('Trash'), 'trash', 'trash');
     $partial = '';
-    $partial .= _zuitedesk_option(TRUE, '', t('SuiteDesk Tour'), 'help', 'help', t('A beginner\'s guide to SuiteDesk'));
+    $partial .= _zuitedesk_option($deskmenu[17], "$lang/user/watcher", t('Watcher'), 'watcher', 'apply');
+    $partial .= _zuitedesk_option($deskmenu[18], "$lang/trash", t('Trash'), 'trash', 'trash');
     $submenu .= _zuitedesk_divider($submenu, $partial);
     $partial = '';
     $partial .= _zuitedesk_option(TRUE, "$lang/" . drupal_get_path_alias('user/' . $user->uid) . '/edit', t('My SuiteDesk profile'), 'profile', 'user', t('Edit my personal account options'));