diff --git a/package.json b/package.json
index fec74e54..3e7b574d 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "electron-builder": "5.2.1",
     "electron-connect": "^0.3.7",
     "electron-packager": "^7.0.1",
-    "electron-prebuilt": "1.2.6",
+    "electron-prebuilt": "1.2.7",
     "electron-winstaller": "^2.2.0",
     "esformatter": "^0.9.3",
     "esformatter-jsx": "^5.0.0",
diff --git a/src/browser/menus/context.js b/src/browser/menus/context.js
index 7183f7c3..1e33d1b5 100644
--- a/src/browser/menus/context.js
+++ b/src/browser/menus/context.js
@@ -7,19 +7,15 @@ const MenuItem = remote.MenuItem;
 var createDefault = function() {
   var menu = new Menu();
   menu.append(new MenuItem({
-    label: 'Cut',
     role: 'cut'
   }));
   menu.append(new MenuItem({
-    label: 'Copy',
     role: 'copy'
   }));
   menu.append(new MenuItem({
-    label: 'Paste',
     role: 'paste'
   }));
   menu.append(new MenuItem({
-    label: 'Select All',
     role: 'selectall'
   }));
   return menu;
diff --git a/src/main.js b/src/main.js
index 5d1c7bc6..b4555909 100644
--- a/src/main.js
+++ b/src/main.js
@@ -163,6 +163,10 @@ app.on('activate', function(event) {
 });
 
 app.on('before-quit', function() {
+  // Make sure tray icon gets removed if the user exits via CTRL-Q
+  if (process.platform === 'win32') {
+    trayIcon.destroy();
+  }
   willAppQuit = true;
 });
 
diff --git a/src/main/menus/app.js b/src/main/menus/app.js
index e5fd6432..b3e918f6 100644
--- a/src/main/menus/app.js
+++ b/src/main/menus/app.js
@@ -28,22 +28,13 @@ var createTemplate = function(mainWindow, config) {
       mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
     }
   }, separatorItem, {
-    label: 'Hide ' + app_name,
-    accelerator: 'Command+H',
-    selector: 'hide:'
+    role: 'hide'
   }, {
-    label: 'Hide Others',
-    accelerator: 'Command+Shift+H',
-    selector: 'hideOtherApplications:'
+    role: 'hideothers'
   }, {
-    label: 'Show All',
-    selector: 'unhideAllApplications:'
+    role: 'unhide'
   }, separatorItem, {
-    label: 'Quit ' + app_name,
-    accelerator: 'CmdOrCtrl+Q',
-    click: function(item, focusedWindow) {
-      electron.app.quit();
-    }
+    role: 'quit'
   }] : [{
     label: 'Settings',
     accelerator: 'CmdOrCtrl+,',
@@ -51,7 +42,7 @@ var createTemplate = function(mainWindow, config) {
       mainWindow.loadURL('file://' + __dirname + '/browser/settings.html');
     }
   }, separatorItem, {
-    label: 'Quit',
+    role: 'quit',
     accelerator: 'CmdOrCtrl+Q',
     click: function(item, focusedWindow) {
       electron.app.quit();
@@ -67,28 +58,16 @@ var createTemplate = function(mainWindow, config) {
   template.push({
     label: '&Edit',
     submenu: [{
-      label: 'Undo',
-      accelerator: 'CmdOrCtrl+Z',
       role: 'undo'
     }, {
-      label: 'Redo',
-      accelerator: 'Shift+CmdOrCtrl+Z',
       role: 'redo'
     }, separatorItem, {
-      label: 'Cut',
-      accelerator: 'CmdOrCtrl+X',
       role: 'cut'
     }, {
-      label: 'Copy',
-      accelerator: 'CmdOrCtrl+C',
       role: 'copy'
     }, {
-      label: 'Paste',
-      accelerator: 'CmdOrCtrl+V',
       role: 'paste'
     }, {
-      label: 'Select All',
-      accelerator: 'CmdOrCtrl+A',
       role: 'selectall'
     }, ]
   });
@@ -123,20 +102,7 @@ var createTemplate = function(mainWindow, config) {
         }
       }
     }, {
-      label: 'Toggle Full Screen',
-      accelerator: (function() {
-        if (process.platform === 'darwin') {
-          return 'Ctrl+Command+F';
-        }
-        else {
-          return 'F11';
-        }
-      })(),
-      click: function(item, focusedWindow) {
-        if (focusedWindow) {
-          focusedWindow.setFullScreen(!focusedWindow.isFullScreen());
-        }
-      }
+      role: 'togglefullscreen'
     }, separatorItem, {
       label: 'Actual Size',
       accelerator: 'CmdOrCtrl+0',
@@ -176,21 +142,9 @@ var createTemplate = function(mainWindow, config) {
   const window_menu = {
     label: '&Window',
     submenu: [{
-      label: 'Minimize',
-      accelerator: 'CmdOrCtrl+M',
-      click: function(item, focusedWindow) {
-        if (focusedWindow) {
-          focusedWindow.minimize();
-        }
-      }
+      role: 'minimize'
     }, {
-      label: 'Close',
-      accelerator: 'CmdOrCtrl+W',
-      click: function(item, focusedWindow) {
-        if (focusedWindow) {
-          focusedWindow.close();
-        }
-      }
+      role: 'close'
     }, separatorItem, ...config.teams.slice(0, 9).map((team, i) => {
       return {
         label: team.name,
diff --git a/src/main/menus/tray.js b/src/main/menus/tray.js
index 93431e98..4e0b5fa3 100644
--- a/src/main/menus/tray.js
+++ b/src/main/menus/tray.js
@@ -25,10 +25,7 @@ function createTemplate(mainWindow, config) {
     }), {
       type: 'separator'
     }, {
-      label: 'Quit',
-      click: function(item) {
-        app.quit();
-      }
+      role: 'quit'
     }
   ];
   return template;