diff --git a/module/mr/control.php b/module/mr/control.php
index 216cb772a3..9c2065744a 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -451,9 +451,9 @@ class mr extends control
         $this->view->rawMR   = isset($rawMR) ? $rawMR : false;
         $this->view->product = $product;
         $this->view->repoID  = $MR->repoID;
-        $this->view->stories = $this->mr->getLinkList($MR->id, $product->id, 'story');
-        $this->view->bugs    = $this->mr->getLinkList($MR->id, $product->id, 'bug');
-        $this->view->tasks   = $this->mr->getLinkList($MR->id, $product->id, 'task');
+        $this->view->stories = $this->mr->getLinkList($MR->id, zget($product, 'id', 0), 'story');
+        $this->view->bugs    = $this->mr->getLinkList($MR->id, zget($product, 'id', 0), 'bug');
+        $this->view->tasks   = $this->mr->getLinkList($MR->id, zget($product, 'id', 0), 'task');
         $this->view->actions = $this->loadModel('action')->getList('mr', $MRID);
         $this->view->users   = $this->loadModel('user')->getPairs('noletter|noclosed');
 
diff --git a/module/mr/css/common.ui.css b/module/mr/css/common.ui.css
index d21247ae0c..c94a2acf2e 100644
--- a/module/mr/css/common.ui.css
+++ b/module/mr/css/common.ui.css
@@ -1,3 +1,5 @@
 .mr-linkstory-title {background-color: #e6f0ff; color: #2e7fff; padding: 12px 6px 12px;}
 #log .action-btn .caret {display: none; color: red}
 .dropmenu-btn > .text {max-width: 280px;}
+
+#monacoTabs .menu-item > a {justify-content: start;}
diff --git a/module/mr/model.php b/module/mr/model.php
index b1e46ff01e..b3abbc3569 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -1148,6 +1148,8 @@ class mrModel extends model
         $scm  = $host->type;
 
         $repo = $this->loadModel('repo')->getByID($MR->repoID);
+        if(!$repo) return array();
+
         $repo->gitService = $host->id;
         $repo->project    = $MR->targetProject;
         $repo->password   = $host->token;
@@ -1977,8 +1979,10 @@ class mrModel extends model
      */
     public function getMRProduct($MR)
     {
-        $product = array();
+        $product = new stdclass();
+        $product->id = 0;
 
+        $productID = 0;
         if(is_object($MR) && $MR->repoID)
         {
             $productID = $this->dao->select('product')->from(TABLE_REPO)->where('id')->eq($MR->repoID)->fetch('product');
diff --git a/module/mr/ui/diff.html.php b/module/mr/ui/diff.html.php
index 741cdd5589..8448ec8218 100644
--- a/module/mr/ui/diff.html.php
+++ b/module/mr/ui/diff.html.php
@@ -33,7 +33,7 @@ detailHeader
             setClass('label danger'),
             $lang->product->deleted,
         ) : null,
-    )
+    ),
 );
 
 $entry        = count($diffs) ? $diffs[0]->fileName : '';
@@ -168,11 +168,11 @@ panel
         sidebar
         (
             set::side('left'),
-            tree
+            treeEditor
             (
                 set::id('monacoTree'),
-                set::canSplit(false),
                 set::items($tree),
+                set::canSplit(false),
                 set::collapsedIcon('folder'),
                 set::expandedIcon('folder-open'),
                 set::normalIcon('file-text-alt'),
diff --git a/module/repo/css/common.ui.css b/module/repo/css/common.ui.css
index 0c8ef78452..c5c04a1701 100644
--- a/module/repo/css/common.ui.css
+++ b/module/repo/css/common.ui.css
@@ -51,4 +51,7 @@
 #monacoTabs .gap-x-5 {-moz-column-gap: 0; column-gap: 0;}
 #reviewBugContainer {position: fixed; right: 0; top: 0px; width: 25%; height: 100%; background: #fff; border-left: 5px solid #F4F5F7; overflow-y: auto; z-index: 9;}
 #log .action-btn .btn {padding-left: .25rem; padding-right: .25rem;}
-.dropmenu-btn>.text {max-width: 280px;}
\ No newline at end of file
+.dropmenu-btn>.text {max-width: 280px;}
+
+#mainMenu + #mainContent > .repo-sidebar {margin-top: 0;}
+#monacoTabs .menu-item > a, #monacoEditor .menu-item > a {justify-content: start;}
diff --git a/module/repo/css/monaco.ui.css b/module/repo/css/monaco.ui.css
index 9a3a73104d..d9eb83d277 100644
--- a/module/repo/css/monaco.ui.css
+++ b/module/repo/css/monaco.ui.css
@@ -6,6 +6,4 @@
 .tree li.tree-item.selected{color: #438EFF !important;}
 #monacoTree{overflow: auto;}
 
-#mainMenu + #mainContent > .repo-sidebar {margin-top: 0;}
-
 #monacoTabs .dropdown-menu {--menu-min-width: 1rem;}
diff --git a/module/repo/ui/diffeditor.html.php b/module/repo/ui/diffeditor.html.php
index b8f4ad162d..6935cb5bb8 100644
--- a/module/repo/ui/diffeditor.html.php
+++ b/module/repo/ui/diffeditor.html.php
@@ -80,7 +80,8 @@ div(
 sidebar
 (
     set::side('left'),
-    tree
+    setClass('repo-sidebar canvas'),
+    treeEditor
     (
         set::id('monacoTree'),
         set::items($tree),
diff --git a/module/repo/ui/monaco.html.php b/module/repo/ui/monaco.html.php
index 421bb1d377..b4290caaa7 100644
--- a/module/repo/ui/monaco.html.php
+++ b/module/repo/ui/monaco.html.php
@@ -91,7 +91,7 @@ div(
 helper::isAjaxRequest('modal') ? null : sidebar
 (
     set::side('left'),
-    setClass('repo-sidebar'),
+    setClass('repo-sidebar canvas'),
     dropmenu
     (
         setID('repoBranchDropMenu'),