diff --git a/module/bug/control.php b/module/bug/control.php
index b5dfe64eb7..d651935588 100644
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -103,7 +103,7 @@ class bug extends control
 
         /* Set productID, moduleID, queryID and branch. */
         if(!$this->projectID) $productID = $this->product->saveState($productID, $this->products);
-        $branch    = ($branch == '') ? (int)$this->cookie->preBranch  : (int)$branch;
+        $branch = ($branch == '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
 
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index c72588101b..9fd69dc308 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -49,12 +49,12 @@ $lang->my->menu->contacts   = array('link' => "$lang->contact|my|managecontacts|
 $lang->my->menuOrder[5]  = 'index';
 $lang->my->menuOrder[10] = 'calendar';
 $lang->my->menuOrder[15] = 'work';
-$lang->my->menuOrder[20] = 'project';
-$lang->my->menuOrder[25] = 'execution';
-$lang->my->menuOrder[30] = 'contribute';
-$lang->my->menuOrder[35] = 'score';
+$lang->my->menuOrder[20] = 'follow';
+$lang->my->menuOrder[25] = 'project';
+$lang->my->menuOrder[30] = 'execution';
+$lang->my->menuOrder[35] = 'contribute';
 $lang->my->menuOrder[40] = 'dynamic';
-$lang->my->menuOrder[45] = 'follow';
+$lang->my->menuOrder[45] = 'score';
 $lang->my->menuOrder[50] = 'contacts';
 
 $lang->my->menu->work['subMenu'] = new stdclass();
@@ -81,7 +81,7 @@ $lang->my->menu->contribute['subMenu']->testcase = "{$lang->testcase->shortCommo
 $lang->my->menu->contribute['subMenu']->testtask = "{$lang->testtask->common}|my|contribute|mode=testtask&type=done";
 $lang->my->menu->contribute['subMenu']->doc      = "{$lang->doc->common}|my|contribute|mode=doc&type=openedbyme";
 
-$lang->my->dividerMenu = ',work,score,';
+$lang->my->dividerMenu = ',work,dynamic,';
 
 /* Program menu. */
 $lang->program->homeMenu = new stdclass();
diff --git a/module/my/view/todo.html.php b/module/my/view/todo.html.php
index 1f8898b455..be1a6569fc 100644
--- a/module/my/view/todo.html.php
+++ b/module/my/view/todo.html.php
@@ -37,7 +37,7 @@
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('todo', 'export')) echo html::a(helper::createLink('todo', 'export', "userID={$user->id}&orderBy=$orderBy", 'html', true), "<i class='icon-export muted'> </i> " . $lang->todo->export, '', "class='btn btn-link export'");?>
     <?php common::printLink('todo', 'batchCreate', '', "<i class='icon icon-plus'></i> " . $lang->todo->batchCreate, '', "id='batchCreate' class='btn btn-secondary iframe' data-width='80%'", '', 'true');?>
-    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%'", '', 'true');?>
+    <?php common::printLink('todo', 'create', '', "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "id='create' class='btn btn-primary iframe' data-width='80%' data-app='my'", '', 'true');?>
   </div>
 </div>
 <div id="mainContent">
@@ -46,7 +46,7 @@
     <p>
       <span class="text-muted"><?php echo $lang->my->noTodo;?></span>
       <?php if(common::hasPriv('todo', 'create')):?>
-      <?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info'");?>
+      <?php echo html::a($this->createLink('todo', 'create'), "<i class='icon icon-plus'></i> " . $lang->todo->create, '', "class='btn btn-info' data-app='my'");?>
       <?php endif;?>
     </p>
   </div>
diff --git a/module/story/control.php b/module/story/control.php
index 6e39e781c0..3dd13d73cd 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -191,7 +191,7 @@ class story extends control
         if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
 
         /* Set menu. */
-        $this->product->setMenu($products, $product->id, $branch);
+        $this->product->setMenu($product->id, $branch);
 
         /* Init vars. */
         $source     = '';