diff --git a/app/app.js b/app/app.js
index 81556d662f..9b2022ef1c 100644
--- a/app/app.js
+++ b/app/app.js
@@ -43,25 +43,50 @@ app.on('ready', () => {
     mainWindow = null;
   });
 
-  var Menu = require("menu");
-
   var template = [{
     label: "Application",
     submenu: [
-      { label: "About Application", selector: "orderFrontStandardAboutPanel:" },
-      { type: "separator" },
-      { label: "Quit", accelerator: "Command+Q", click: function() { app.quit(); }}
-    ]}, {
+      {label: "About Application", selector: "orderFrontStandardAboutPanel:"},
+      {type: "separator"},
+      {
+        label: "Quit",
+        accelerator: "Command+Q",
+        click: function () {
+          app.quit();
+        }
+      }
+    ]
+  }, {
     label: "Edit",
     submenu: [
-      { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" },
-      { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" },
-      { type: "separator" },
-      { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" },
-      { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" },
-      { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" },
-      { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" }
-    ]}
-  ];
+      {label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:"},
+      {label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:"},
+      {type: "separator"},
+      {label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:"},
+      {label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:"},
+      {label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:"},
+      {label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:"}
+    ]
+  }];
+
+  if (IS_DEV) {
+    template.push({
+      label: 'View',
+      submenu: [{
+        label: 'Reload',
+        accelerator: 'Command+R',
+        click: function () {
+          mainWindow.reload();
+        }
+      }, {
+        label: 'Toggle DevTools',
+        accelerator: 'Alt+Command+I',
+        click: function () {
+          mainWindow.toggleDevTools();
+        }
+      }]
+    });
+  }
+
   Menu.setApplicationMenu(Menu.buildFromTemplate(template));
 });
diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js
index 41a1b24e81..9816a014f5 100644
--- a/app/components/Sidebar.js
+++ b/app/components/Sidebar.js
@@ -5,6 +5,7 @@ import RequestActionsDropdown from './dropdowns/RequestActionsDropdown'
 import RequestGroupActionsDropdown from './dropdowns/RequestGroupActionsDropdown'
 import DebouncingInput from './base/DebouncingInput'
 import MethodTag from './MethodTag'
+import * as db from '../database'
 
 class Sidebar extends Component {
   onFilterChange (value) {
@@ -28,10 +29,12 @@ class Sidebar extends Component {
           return true;
         }
 
-        const toMatch = `${r.method} ::: ${r.name}`.toLowerCase();
+        const requestGroupName = requestGroup ? requestGroup.name : '';
+        const toMatch = `${requestGroupName}✌${r.method}✌${r.name}`.toLowerCase();
         const matchTokens = activeFilter.toLowerCase().split(' ');
         for (let i = 0; i < matchTokens.length; i++) {
-          if (toMatch.indexOf(matchTokens[i]) === -1) {
+          let token = `${matchTokens[i]}`;
+          if (toMatch.indexOf(token) === -1) {
             return false;
           }
         }
@@ -56,7 +59,7 @@ class Sidebar extends Component {
     const isActive = activeRequest && filteredRequests.find(r => r._id == activeRequest._id);
 
     let folderIconClass = 'fa-folder';
-    let expanded = !requestGroup.collapsed || activeFilter;
+    let expanded = !requestGroup.collapsed;
     folderIconClass += !expanded ? '' : '-open';
     folderIconClass += isActive ? '' : '-o';
 
@@ -136,13 +139,15 @@ class Sidebar extends Component {
             {this.renderRequestGroupRow(null)}
             {requestGroups.map(requestGroup => this.renderRequestGroupRow(requestGroup))}
           </ul>
-          <div className="form-control form-control--underlined">
-            <DebouncingInput
-              type="text"
-              placeholder="Filter Requests"
-              debounceMillis={300}
-              value={activeFilter}
-              onChange={this.onFilterChange.bind(this)}/>
+          <div className="grid grid--center">
+            <div className="grid__cell form-control form-control--underlined">
+              <DebouncingInput
+                type="text"
+                placeholder="Filter Items"
+                debounceMillis={300}
+                value={activeFilter}
+                onChange={this.onFilterChange.bind(this)}/>
+            </div>
           </div>
         </div>
       </section>