diff --git a/module/bug/model.php b/module/bug/model.php
index fc6552a47f..ce37b24263 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -30,6 +30,18 @@ class bugModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'bug');
         $selectHtml = $this->product->select($products, $productID, 'bug', 'browse', '', $branch, $moduleID, 'bug');
 
+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         if($this->config->global->flow == 'full')
@@ -77,6 +89,7 @@ class bugModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;
diff --git a/module/product/model.php b/module/product/model.php
index 9b5314afc5..3a903559ed 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -50,6 +50,35 @@ class productModel extends model
         if($currentMethod == 'report') $currentMethod = 'browse';
 
         $selectHtml = $this->select($products, $productID, $currentModule, $currentMethod, $extra, $branch, $module, $moduleType);
+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $label = $this->lang->product->index;
+            if($currentModule == 'product' && $currentMethod == 'all')    $label = $this->lang->product->all;
+            if($currentModule == 'product' && $currentMethod == 'create') $label = $this->lang->product->create;
+
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
+            $productIndex .= '<ul class="dropdown-menu">';
+            if(common::hasPriv('product', 'index'))  $productIndex .= '<li>' . html::a(helper::createLink('product', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->product->index) . '</li>';
+            if(common::hasPriv('product', 'all'))    $productIndex .= '<li>' . html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->product->all) . '</li>';
+            if(common::isTutorialMode())
+            {
+                $wizardParams = helper::safe64Encode('');
+                $link = helper::createLink('tutorial', 'wizard', "module=product&method=create&params=$wizardParams");
+                $productIndex .= '<li>' . html::a($link, "<i class='icon icon-plus'></i> {$this->lang->product->create}", '', "class='create-product-btn'") . '</li>';
+            }
+            else
+            {
+                if(common::hasPriv('product', 'create')) $productIndex .= '<li>' . html::a(helper::createLink('product', 'create'), '<i class="icon icon-plus"></i> ' . $this->lang->product->create) . '</li>';
+            }
+            $productIndex .= '</ul></div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
 
         $label = $this->lang->product->index;
         if($this->config->global->flow != 'full') $label = $this->lang->product->all;
@@ -72,6 +101,7 @@ class productModel extends model
         }
         $pageNav .= '</ul></div></div>';
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $pageActions = '';
         if($this->config->global->flow != 'full')
diff --git a/module/project/model.php b/module/project/model.php
index 4437c32e68..d4c640b114 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -102,29 +102,35 @@ class projectModel extends model
         }
 
         $selectHtml = $this->select($projects, $projectID, $buildID, $moduleName, $methodName, $extra);
-
-        $label = $this->lang->project->index;
-        if($moduleName == 'project' && $methodName == 'all')    $label = $this->lang->project->allProjects;
-        if($moduleName == 'project' && $methodName == 'create') $label = $this->lang->project->create;
-
-        $projectIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
-        $projectIndex .= '<ul class="dropdown-menu">';
-        if(common::hasPriv('project', 'index'))  $projectIndex .= '<li>' . html::a(helper::createLink('project', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->project->index) . '</li>';
-        if(common::hasPriv('project', 'all'))    $projectIndex .= '<li>' . html::a(helper::createLink('project', 'all', 'status=all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->project->allProjects) . '</li>';
-
-        if(common::isTutorialMode())
+        if($this->app->viewType == 'mhtml')
         {
-            $wizardParams = helper::safe64Encode('');
-            $link = helper::createLink('tutorial', 'wizard', "module=project&method=create&params=$wizardParams");
-            $projectIndex .= '<li>' . html::a($link, "<i class='icon icon-plus'></i> {$this->lang->project->create}", '', "class='create-project-btn'") . '</li>';
+            $projectIndex = $selectHtml;
         }
         else
         {
-            if(common::hasPriv('project', 'create')) $projectIndex .= '<li>' . html::a(helper::createLink('project', 'create'), '<i class="icon icon-plus"></i> ' . $this->lang->project->create) . '</li>';
-        }
+            $label = $this->lang->project->index;
+            if($moduleName == 'project' && $methodName == 'all')    $label = $this->lang->project->allProjects;
+            if($moduleName == 'project' && $methodName == 'create') $label = $this->lang->project->create;
 
-        $projectIndex .= '</ul></div></div>';
-        $projectIndex .= $selectHtml;
+            $projectIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $label . ' <span class="caret"></span></button>';
+            $projectIndex .= '<ul class="dropdown-menu">';
+            if(common::hasPriv('project', 'index'))  $projectIndex .= '<li>' . html::a(helper::createLink('project', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->project->index) . '</li>';
+            if(common::hasPriv('project', 'all'))    $projectIndex .= '<li>' . html::a(helper::createLink('project', 'all', 'status=all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->project->allProjects) . '</li>';
+
+            if(common::isTutorialMode())
+            {
+                $wizardParams = helper::safe64Encode('');
+                $link = helper::createLink('tutorial', 'wizard', "module=project&method=create&params=$wizardParams");
+                $projectIndex .= '<li>' . html::a($link, "<i class='icon icon-plus'></i> {$this->lang->project->create}", '', "class='create-project-btn'") . '</li>';
+            }
+            else
+            {
+                if(common::hasPriv('project', 'create')) $projectIndex .= '<li>' . html::a(helper::createLink('project', 'create'), '<i class="icon icon-plus"></i> ' . $this->lang->project->create) . '</li>';
+            }
+
+            $projectIndex .= '</ul></div></div>';
+            $projectIndex .= $selectHtml;
+        }
 
         $this->lang->modulePageNav = $projectIndex;
         if($moduleName != 'project') $this->lang->$moduleName->dividerMenu = $this->lang->project->dividerMenu;
diff --git a/module/qa/model.php b/module/qa/model.php
index a71fe80576..30e61c0809 100644
--- a/module/qa/model.php
+++ b/module/qa/model.php
@@ -25,8 +25,15 @@ class qaModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch);
         $selectHtml = $this->product->select($products, $productID, 'qa', 'index', '', $branch);
 
-        $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
-        $productIndex .= $selectHtml;
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
 
         $this->lang->modulePageNav = $productIndex;
         foreach($this->lang->qa->menu as $key => $menu)
diff --git a/module/testcase/model.php b/module/testcase/model.php
index 3f5c0c1c10..27bd88fd09 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -30,6 +30,18 @@ class testcaseModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch, $moduleID, 'case');
         $selectHtml = $this->product->select($products, $productID, 'testcase', 'browse', '', $branch, $moduleID, 'case');
 
+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         if($this->config->global->flow == 'full')
@@ -63,6 +75,7 @@ class testcaseModel extends model
                 }
                 $pageActions .= '</ul>';
                 $pageActions .= '</div>';
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
             }
             if($importPriv or $importFromLibPriv)
diff --git a/module/testsuite/model.php b/module/testsuite/model.php
index b23d323f19..a03208b207 100644
--- a/module/testsuite/model.php
+++ b/module/testsuite/model.php
@@ -27,6 +27,18 @@ class testsuiteModel extends model
         $selectHtml = $this->select($products, $productID, 'testsuite', 'browse');
         if(strpos($selectHtml, 'currentBranch') !== false) $selectHtml = substr($selectHtml, 0, strrpos($selectHtml, "<div class='btn-group'>")) . '</div>';
 
+<<<<<<< HEAD
+        if($this->app->viewType == 'mhtml')
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         if($this->config->global->flow == 'full')
@@ -43,6 +55,7 @@ class testsuiteModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;
@@ -101,18 +114,26 @@ class testsuiteModel extends model
     public function setLibMenu($libraries, $libID, $moduleID = 0)
     {
         $currentLibName = zget($libraries, $libID, '');
-        $selectHtml = '';
+        $isMobile       = $this->app->viewType == 'mhtml';
+        $selectHtml     = '';
         if(!empty($libraries))
         {
-            $dropMenuLink = helper::createLink('testsuite', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
-            $selectHtml = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem'>{$currentLibName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
-            $selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-            $selectHtml .= "</div></div>";
+            if($isMobile)
+            {
+                $selectHtml = "<a id='currentItem' href=\"javascript:showSearchMenu('testsuite', '$libID', 'testsuite', 'library', '')\">{$currentLibName} <span class='icon-caret-down'> </span></a><div id='currentItemDropMenu' class='hidden affix enter-from-bottom layer'></div>";
+            }
+            else
+            {
+                $dropMenuLink = helper::createLink('testsuite', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
+                $selectHtml = "<div class='btn-group angle-btn'><div class='btn-group'><button data-toggle='dropdown' type='button' class='btn btn-limit' id='currentItem'>{$currentLibName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
+                $selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
+                $selectHtml .= "</div></div></div>";
+            }
+
         }
 
         if($this->config->global->flow == 'onlyTest')
         {
-            $isMobile   = $this->app->viewType == 'mhtml';
             $modules    = $this->loadModel('tree')->getModulePairs($libID, 'caselib');
             $moduleName = ($moduleID && isset($modules[$moduleID])) ? $modules[$moduleID] : $this->lang->tree->all;
 
@@ -121,17 +142,31 @@ class testsuiteModel extends model
                 $dropMenuLink = helper::createLink('tree', 'ajaxGetDropMenu', "objectID=$libID&module=testsuite&method=library");
                 $selectHtml .= "<div class='btn-group'><button id='currentModule' data-toggle='dropdown' type='button' class='btn btn-limit'>{$moduleName} <span class='caret'></span></button><div id='dropMenu' class='dropdown-menu search-list' data-ride='searchList' data-url='$dropMenuLink'>";
                 $selectHtml .= '<div class="input-control search-box search-box-circle has-icon-left has-icon-right search-example"><input type="search" class="form-control search-input" /><label class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label><a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a></div>';
-                $selectHtml .= "</div></div>";
+                $selectHtml .= "</div></div></div>";
             }
             else
             {
                 $selectHtml .= "<a id='currentModule' href=\"javascript:showSearchMenu('tree', '$libID', 'testsuite', 'library', '')\">{$moduleName} <span class='icon-caret-down'></span></a><div id='currentBranchDropMenu' class='hidden affix enter-from-bottom layer'></div>";
             }
         }
-        $selectHtml .= '</div>';
 
         setCookie("lastCaseLib", $libID, $this->config->cookieLife, $this->config->webRoot);
 
+<<<<<<< HEAD
+        if($isMobile)
+        {
+            $productIndex = $selectHtml;
+        }
+        else
+        {
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $this->lang->qa->index . ' <span class="caret"></span></button>';
+            $productIndex .= '<ul class="dropdown-menu">';
+            if(common::hasPriv('testsuite', 'createLib')) $productIndex .= '<li>' . html::a(helper::createLink('testsuite', 'createLib'), '<i class="icon icon-plus"></i> ' . $this->lang->testsuite->createLib) . '</li>';
+            $productIndex .= '</ul></div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         if($this->config->global->flow == 'full')
@@ -176,6 +211,7 @@ class testsuiteModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 496b74e077..65a3ec3212 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -26,24 +26,36 @@ class testtaskModel extends model
         $this->loadModel('product')->setMenu($products, $productID, $branch);
         $selectHtml = $this->product->select($products, $productID, 'testtask', 'browse', '', $branch);
 
-        if($testtask)
+        if($this->app->viewType == 'mhtml')
         {
-            $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
-
-            $selectHtml .= "<div class='btn-group angle-btn'>";
-            $selectHtml .= "<div class='btn-group'>";
-            $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
-            $selectHtml .= "<ul class='dropdown-menu'>";
-            foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
-            $selectHtml .= "</ul>";
-            $selectHtml .= "</div>";
-            $selectHtml .= "</div>";
-
-            $this->lang->modulePageActions = '';
-            if(common::hasPriv('testtask', 'view'))     $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
-            if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
+            $productIndex = $selectHtml;
         }
+        else
+        {
+            if($testtask)
+            {
+                $testtasks = $this->getProductTasks($productID, 0, 'id_desc', null, array('local', 'totalStatus'));
 
+                $selectHtml .= "<div class='btn-group angle-btn'>";
+                $selectHtml .= "<div class='btn-group'>";
+                $selectHtml .= "<a data-toggle='dropdown' class='btn'>" . $testtasks[$testtask]->name . " <span class='caret'></span></a>";
+                $selectHtml .= "<ul class='dropdown-menu'>";
+                foreach($testtasks as $testtask) $selectHtml .= '<li>' . html::a(helper::createLink('testtask', 'cases', "taskID=$testtask->id"), "<i class='icon icon-file-o'></i> {$testtask->name}") . '</li>';
+                $selectHtml .= "</ul>";
+                $selectHtml .= "</div>";
+                $selectHtml .= "</div>";
+
+                $this->lang->modulePageActions = '';
+                if(common::hasPriv('testtask', 'view'))     $this->lang->modulePageActions .= html::a(helper::createLink('testtask', 'view', "taskID={$testtask->id}"), "<i class='icon icon-file-text'> </i>" . $this->lang->testtask->view, '', "class='btn'");
+                if(common::hasPriv('testreport', 'browse')) $this->lang->modulePageActions .= html::a(helper::createLink('testreport', 'browse', "objectID=$productID&objectType=product&extra={$testtask->id}"), "<i class='icon icon-flag'> </i>" . $this->lang->testtask->reportField, '', "class='btn'");
+            }
+
+<<<<<<< HEAD
+            $this->app->loadLang('qa');
+            $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group">' . html::a(helper::createLink('qa', 'index', 'locate=no'), $this->lang->qa->index, '', "class='btn'") . '</div></div>';
+            $productIndex .= $selectHtml;
+        }
+=======
         $pageNav     = '';
         $pageActions = '';
         if($this->config->global->flow == 'full')
@@ -60,6 +72,7 @@ class testtaskModel extends model
             }
         }
         $pageNav .= $selectHtml;
+>>>>>>> 6e25725965ce1935d9b2ee004157599f82dcfd15
 
         $this->lang->modulePageNav     = $pageNav;
         $this->lang->modulePageActions = $pageActions;