diff --git a/.vscode/launch.json b/.vscode/launch.json
index a8300f84f..5afc2d051 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,8 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "NODE_ENV": "development"
+                "NODE_ENV": "development",
+                "OS_PLATFORM": "win32"
             }
         },
         {
@@ -18,9 +19,10 @@
             "name": "Franz – Live API",
             "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
             "program": "${workspaceFolder}/build/index.js",
-            "protocol": "inspector",
+            "protocol": "inspector",    
             "env": {
-                "LIVE_API": "1"
+                "LIVE_API": "1",
+                "OS_PLATFORM": "win32"
             }
         },
         {
@@ -31,7 +33,8 @@
             "program": "${workspaceFolder}/build/index.js",
             "protocol": "inspector",
             "env": {
-                "LOCAL_API": "1"
+                "LOCAL_API": "1",
+                "OS_PLATFORM": "win32"
             }
         }
     ]
diff --git a/package.json b/package.json
index fd96c602b..f35da9880 100644
--- a/package.json
+++ b/package.json
@@ -35,6 +35,7 @@
     "classnames": "^2.2.5",
     "du": "^0.1.0",
     "electron-fetch": "^1.1.0",
+    "electron-react-titlebar": "^0.7.1",
     "electron-spellchecker": "^1.1.2",
     "electron-updater": "^2.4.3",
     "electron-window-state": "^4.1.0",
diff --git a/src/I18n.js b/src/I18n.js
index ae3ba2fa9..4ee34157c 100644
--- a/src/I18n.js
+++ b/src/I18n.js
@@ -9,11 +9,18 @@ import UserStore from './stores/UserStore';
 
 @inject('stores') @observer
 export default class I18N extends Component {
+  componentDidUpdate() {
+    window.franz.menu.rebuild();
+  }
+
   render() {
     const { stores, children } = this.props;
     const { locale } = stores.app;
     return (
-      <IntlProvider {...{ locale, key: locale, messages: translations[locale] }}>
+      <IntlProvider
+        {...{ locale, key: locale, messages: translations[locale] }}
+        ref={(intlProvider) => { window.franz.intl = intlProvider ? intlProvider.getChildContext().intl : null; }}
+      >
         {children}
       </IntlProvider>
     );
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 20dc2f764..686476317 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -2,10 +2,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { observer, PropTypes as MobxPropTypes } from 'mobx-react';
 import { defineMessages, intlShape } from 'react-intl';
+import { TitleBar } from 'electron-react-titlebar';
 
 import InfoBar from '../ui/InfoBar';
 import globalMessages from '../../i18n/globalMessages';
 
+import { isMac } from '../../environment';
+
 function createMarkup(HTMLString) {
   return { __html: HTMLString };
 }
@@ -87,64 +90,67 @@ export default class AppLayout extends Component {
     return (
       <div>
         <div className="app">
-          {sidebar}
-          <div className="app__service">
-            {news.length > 0 && news.map(item => (
-              <InfoBar
-                key={item.id}
-                position="top"
-                type={item.type}
-                sticky={item.sticky}
-                onHide={() => removeNewsItem({ newsId: item.id })}
-              >
-                <span dangerouslySetInnerHTML={createMarkup(item.message)} />
-              </InfoBar>
-            ))}
-            {!isOnline && (
-              <InfoBar
-                type="danger"
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
-              </InfoBar>
-            )}
-            {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
-              <InfoBar
-                type="danger"
-                ctaLabel="Try again"
-                ctaLoading={areRequiredRequestsLoading}
-                sticky
-                onClick={retryRequiredRequests}
-              >
-                <span className="mdi mdi-flash" />
-                {intl.formatMessage(messages.requiredRequestsFailed)}
-              </InfoBar>
-            )}
-            {showServicesUpdatedInfoBar && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
-                onClick={reloadServicesAfterUpdate}
-                sticky
-              >
-                <span className="mdi mdi-power-plug" />
-                {intl.formatMessage(messages.servicesUpdated)}
-              </InfoBar>
-            )}
-            {appUpdateIsDownloaded && (
-              <InfoBar
-                type="primary"
-                ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
-                onClick={installAppUpdate}
-                sticky
-              >
-                <span className="mdi mdi-information" />
-                {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
-                  <u>{intl.formatMessage(messages.changelog)}</u>
-                </a>
-              </InfoBar>
-            )}
-            {services}
+          {!isMac && <TitleBar menu={window.franz.menu.template} icon={'assets/images/logo.svg'} />}
+          <div className="app__content">
+            {sidebar}
+            <div className="app__service">
+              {news.length > 0 && news.map(item => (
+                <InfoBar
+                  key={item.id}
+                  position="top"
+                  type={item.type}
+                  sticky={item.sticky}
+                  onHide={() => removeNewsItem({ newsId: item.id })}
+                >
+                  <span dangerouslySetInnerHTML={createMarkup(item.message)} />
+                </InfoBar>
+              ))}
+              {!isOnline && (
+                <InfoBar
+                  type="danger"
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(globalMessages.notConnectedToTheInternet)}
+                </InfoBar>
+              )}
+              {!areRequiredRequestsSuccessful && showRequiredRequestsError && (
+                <InfoBar
+                  type="danger"
+                  ctaLabel="Try again"
+                  ctaLoading={areRequiredRequestsLoading}
+                  sticky
+                  onClick={retryRequiredRequests}
+                >
+                  <span className="mdi mdi-flash" />
+                  {intl.formatMessage(messages.requiredRequestsFailed)}
+                </InfoBar>
+              )}
+              {showServicesUpdatedInfoBar && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonReloadServices)}
+                  onClick={reloadServicesAfterUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-power-plug" />
+                  {intl.formatMessage(messages.servicesUpdated)}
+                </InfoBar>
+              )}
+              {appUpdateIsDownloaded && (
+                <InfoBar
+                  type="primary"
+                  ctaLabel={intl.formatMessage(messages.buttonInstallUpdate)}
+                  onClick={installAppUpdate}
+                  sticky
+                >
+                  <span className="mdi mdi-information" />
+                  {intl.formatMessage(messages.updateAvailable)} <a href="https://meetfranz.com/changelog" target="_blank">
+                    <u>{intl.formatMessage(messages.changelog)}</u>
+                  </a>
+                </InfoBar>
+              )}
+              {services}
+            </div>
           </div>
         </div>
         {children}
diff --git a/src/environment.js b/src/environment.js
index e185120c0..e1762129b 100644
--- a/src/environment.js
+++ b/src/environment.js
@@ -4,11 +4,17 @@ export const isDevMode = Boolean(process.execPath.match(/[\\/]electron/));
 export const useLiveAPI = process.env.LIVE_API;
 export const useLocalAPI = process.env.LOCAL_API;
 
-export const isMac = process.platform === 'darwin';
-export const isWindows = process.platform === 'win32';
-export const isLinux = process.platform === 'linux';
+let platform = process.platform;
+if (process.env.OS_PLATFORM) {
+  platform = process.env.OS_PLATFORM;
+}
+
+export const isMac = platform === 'darwin';
+export const isWindows = platform === 'win32';
+export const isLinux = platform === 'linux';
 
 export const ctrlKey = isMac ? '⌘' : 'Ctrl';
+export const cmdKey = isMac ? 'Cmd' : 'Ctrl';
 
 let api;
 if (!isDevMode || (isDevMode && useLiveAPI)) {
diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js
index a8a242d54..2f762437d 100644
--- a/src/helpers/validation-helpers.js
+++ b/src/helpers/validation-helpers.js
@@ -1,6 +1,31 @@
+import { defineMessages } from 'react-intl';
+
+const messages = defineMessages({
+  required: {
+    id: 'validation.required',
+    defaultMessage: '!!!Field is required',
+  },
+  email: {
+    id: 'validation.email',
+    defaultMessage: '!!!Email not valid',
+  },
+  url: {
+    id: 'validation.url',
+    defaultMessage: '!!!Not a valid URL',
+  },
+  minLength: {
+    id: 'validation.minLength',
+    defaultMessage: '!!!Too few characters',
+  },
+  oneRequired: {
+    id: 'validation.oneRequired',
+    defaultMessage: '!!!At least one is required',
+  },
+});
+
 export function required({ field }) {
   const isValid = (field.value.trim() !== '');
-  return [isValid, `${field.label} is required`];
+  return [isValid, window.franz.intl.formatMessage(messages.required, { field: field.label })];
 }
 
 export function email({ field }) {
@@ -13,7 +38,7 @@ export function email({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} not valid`];
+  return [isValid, window.franz.intl.formatMessage(messages.email, { field: field.label })];
 }
 
 export function url({ field }) {
@@ -27,7 +52,7 @@ export function url({ field }) {
     isValid = true;
   }
 
-  return [isValid, `${field.label} is not a valid url`];
+  return [isValid, window.franz.intl.formatMessage(messages.url, { field: field.label })];
 }
 
 export function minLength(length) {
@@ -36,13 +61,13 @@ export function minLength(length) {
     if (field.touched) {
       isValid = field.value.length >= length;
     }
-    return [isValid, `${field.label} should be at least ${length} characters long.`];
+    return [isValid, window.franz.intl.formatMessage(messages.minLength, { field: field.label, length })];
   };
 }
 
 export function oneRequired(targets) {
   return ({ field, form }) => {
     const invalidFields = targets.filter(target => form.$(target).value === '');
-    return [targets.length !== invalidFields.length, `${field.label} is required`];
+    return [targets.length !== invalidFields.length, window.franz.intl.formatMessage(messages.required, { field: field.label })];
   };
 }
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d5c0ea441..400a9a5d8 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -199,5 +199,52 @@
   "service.crashHandler.action": "Reload {name}",
   "service.crashHandler.autoReload": "Trying to automatically restore {name} in {seconds} seconds",
   "service.disabledHandler.headline": "{name} is disabled",
-  "service.disabledHandler.action": "Enable {name}"
+  "service.disabledHandler.action": "Enable {name}",
+  "menu.edit": "Edit",
+  "menu.edit.undo": "Undo",
+  "menu.edit.redo": "Redo",
+  "menu.edit.cut": "Cut",
+  "menu.edit.copy": "Copy",
+  "menu.edit.paste": "Paste",
+  "menu.edit.pasteAndMatchStyle": "Paste And Match Style",
+  "menu.edit.delete": "Delete",
+  "menu.edit.selectAll": "Select All",
+  "menu.edit.speech": "Speech",
+  "menu.edit.startSpeaking": "Start Speaking",
+  "menu.edit.stopSpeaking": "Stop Speaking",
+  "menu.edit.startDictation": "Start Dictation",
+  "menu.edit.emojiSymbols": "Emoji & Symbols",
+  "menu.view.resetZoom": "Actual Size",
+  "menu.view.zoomIn": "Zoom In",
+  "menu.view.zoomOut": "Zoom Out",
+  "menu.view.enterFullScreen": "Enter Full Screen",
+  "menu.view.exitFullScreen": "Exit Full Screen",
+  "menu.view.toggleFullScreen": "Toggle Full Screen",
+  "menu.view.toggleDevTools": "Toggle Developer Tools",
+  "menu.view.toggleServiceDevTools": "Toggle Service Developer Tools",
+  "menu.view.reloadService": "Reload Service",
+  "menu.view.reloadFranz": "Reload Franz",
+  "menu.window.minimize": "Minimize",
+  "menu.window.close": "Close",
+  "menu.help.learnMore": "Learn More",
+  "menu.help.changelog": "Changelog",
+  "menu.help.support": "Support",
+  "menu.help.tos": "Terms of Service",
+  "menu.help.privacy": "Privacy Statement",
+  "menu.file": "File",
+  "menu.view": "View",
+  "menu.services": "Services",
+  "menu.window": "Window",
+  "menu.help": "Help",
+  "menu.app.about": "About Franz",
+  "menu.app.settings": "Settings",
+  "menu.app.hide": "Hide",
+  "menu.app.hideOthers": "Hide Others",
+  "menu.app.unhide": "Unhide",
+  "menu.app.quit": "Quit",
+  "menu.services.addNewService": "Add New Service...",
+  "validation.required": "{field} is required",
+  "validation.email": "{field} is not valid",
+  "validation.url": "{field} is not a valid URL",
+  "validation.minLength": "{field} should be at least {length} characters long"
 }
diff --git a/src/index.html b/src/index.html
index 9e5acd705..6c259e5be 100644
--- a/src/index.html
+++ b/src/index.html
@@ -11,7 +11,7 @@
   <div class="dev-warning">DEV MODE</div>
   <div id="root"></div>
   <script>
-    document.querySelector('body').classList.add(process.platform);
+    document.querySelector('body').classList.add(process.env.OS_PLATFORM ? process.env.OS_PLATFORM : process.platform);
 
     const { isDevMode } = require('./environment');
     if (isDevMode) {
diff --git a/src/index.js b/src/index.js
index f82bb3590..bb09bf42c 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,7 +4,7 @@ import path from 'path';
 
 import windowStateKeeper from 'electron-window-state';
 
-import { isDevMode, isWindows } from './environment';
+import { isDevMode, isMac, isWindows } from './environment';
 import ipcApi from './electron/ipc-api';
 import Tray from './lib/Tray';
 import Settings from './electron/Settings';
@@ -72,9 +72,9 @@ const createWindow = () => {
     height: mainWindowState.height,
     minWidth: 600,
     minHeight: 500,
-    titleBarStyle: 'hidden',
+    titleBarStyle: isMac ? 'hidden' : '',
+    frame: false,
     backgroundColor: '#3498db',
-    autoHideMenuBar: true,
   });
 
   // Initialize System Tray
diff --git a/src/lib/Menu.js b/src/lib/Menu.js
index 16e91374e..5a05e47b3 100644
--- a/src/lib/Menu.js
+++ b/src/lib/Menu.js
@@ -1,113 +1,477 @@
 import { remote, shell } from 'electron';
-import { autorun, computed, observable, toJS } from 'mobx';
+import { observable, autorun, computed } from 'mobx';
+import { defineMessages } from 'react-intl';
 
-import { isMac } from '../environment';
+import { isMac, ctrlKey, cmdKey } from '../environment';
 
 const { app, Menu, dialog } = remote;
 
-const template = [
+const menuItems = defineMessages({
+  edit: {
+    id: 'menu.edit',
+    defaultMessage: '!!!Edit',
+  },
+  undo: {
+    id: 'menu.edit.undo',
+    defaultMessage: '!!!Undo',
+  },
+  redo: {
+    id: 'menu.edit.redo',
+    defaultMessage: '!!!Redo',
+  },
+  cut: {
+    id: 'menu.edit.cut',
+    defaultMessage: '!!!Cut',
+  },
+  copy: {
+    id: 'menu.edit.copy',
+    defaultMessage: '!!!Copy',
+  },
+  paste: {
+    id: 'menu.edit.paste',
+    defaultMessage: '!!!Paste',
+  },
+  pasteAndMatchStyle: {
+    id: 'menu.edit.pasteAndMatchStyle',
+    defaultMessage: '!!!Paste And Match Style',
+  },
+  delete: {
+    id: 'menu.edit.delete',
+    defaultMessage: '!!!Delete',
+  },
+  selectAll: {
+    id: 'menu.edit.selectAll',
+    defaultMessage: '!!!Select All',
+  },
+  speech: {
+    id: 'menu.edit.speech',
+    defaultMessage: '!!!Speech',
+  },
+  startSpeaking: {
+    id: 'menu.edit.startSpeaking',
+    defaultMessage: '!!!Start Speaking',
+  },
+  stopSpeaking: {
+    id: 'menu.edit.stopSpeaking',
+    defaultMessage: '!!!Stop Speaking',
+  },
+  startDictation: {
+    id: 'menu.edit.startDictation',
+    defaultMessage: '!!!Start Dictation',
+  },
+  emojiSymbols: {
+    id: 'menu.edit.emojiSymbols',
+    defaultMessage: '!!!Emoji & Symbols',
+  },
+  resetZoom: {
+    id: 'menu.view.resetZoom',
+    defaultMessage: '!!!Actual Size',
+  },
+  zoomIn: {
+    id: 'menu.view.zoomIn',
+    defaultMessage: '!!!Zoom In',
+  },
+  zoomOut: {
+    id: 'menu.view.zoomOut',
+    defaultMessage: '!!!Zoom Out',
+  },
+  enterFullScreen: {
+    id: 'menu.view.enterFullScreen',
+    defaultMessage: '!!!Enter Full Screen',
+  },
+  exitFullScreen: {
+    id: 'menu.view.exitFullScreen',
+    defaultMessage: '!!!Exit Full Screen',
+  },
+  toggleFullScreen: {
+    id: 'menu.view.toggleFullScreen',
+    defaultMessage: '!!!Toggle Full Screen',
+  },
+  toggleDevTools: {
+    id: 'menu.view.toggleDevTools',
+    defaultMessage: '!!!Toggle Developer Tools',
+  },
+  toggleServiceDevTools: {
+    id: 'menu.view.toggleServiceDevTools',
+    defaultMessage: '!!!Toggle Service Developer Tools',
+  },
+  reloadService: {
+    id: 'menu.view.reloadService',
+    defaultMessage: '!!!Reload Service',
+  },
+  reloadFranz: {
+    id: 'menu.view.reloadFranz',
+    defaultMessage: '!!!Reload Franz',
+  },
+  minimize: {
+    id: 'menu.window.minimize',
+    defaultMessage: '!!!Minimize',
+  },
+  close: {
+    id: 'menu.window.close',
+    defaultMessage: '!!!Close',
+  },
+  learnMore: {
+    id: 'menu.help.learnMore',
+    defaultMessage: '!!!Learn More',
+  },
+  changelog: {
+    id: 'menu.help.changelog',
+    defaultMessage: '!!!Changelog',
+  },
+  support: {
+    id: 'menu.help.support',
+    defaultMessage: '!!!Support',
+  },
+  tos: {
+    id: 'menu.help.tos',
+    defaultMessage: '!!!Terms of Service',
+  },
+  privacy: {
+    id: 'menu.help.privacy',
+    defaultMessage: '!!!Privacy Statement',
+  },
+  file: {
+    id: 'menu.file',
+    defaultMessage: '!!!File',
+  },
+  view: {
+    id: 'menu.view',
+    defaultMessage: '!!!View',
+  },
+  services: {
+    id: 'menu.services',
+    defaultMessage: '!!!Services',
+  },
+  window: {
+    id: 'menu.window',
+    defaultMessage: '!!!Window',
+  },
+  help: {
+    id: 'menu.help',
+    defaultMessage: '!!!Help',
+  },
+  about: {
+    id: 'menu.app.about',
+    defaultMessage: '!!!About Franz',
+  },
+  settings: {
+    id: 'menu.app.settings',
+    defaultMessage: '!!!Settings',
+  },
+  hide: {
+    id: 'menu.app.hide',
+    defaultMessage: '!!!Hide',
+  },
+  hideOthers: {
+    id: 'menu.app.hideOthers',
+    defaultMessage: '!!!Hide Others',
+  },
+  unhide: {
+    id: 'menu.app.unhide',
+    defaultMessage: '!!!Unhide',
+  },
+  quit: {
+    id: 'menu.app.quit',
+    defaultMessage: '!!!Quit',
+  },
+  addNewService: {
+    id: 'menu.services.addNewService',
+    defaultMessage: '!!!Add New Service...',
+  },
+});
+
+function getActiveWebview() {
+  return window.franz.stores.services.active.webview;
+}
+
+const _templateFactory = intl => [
   {
-    label: 'Edit',
+    label: intl.formatMessage(menuItems.edit),
     submenu: [
       {
+        label: intl.formatMessage(menuItems.undo),
         role: 'undo',
       },
       {
+        label: intl.formatMessage(menuItems.redo),
         role: 'redo',
       },
       {
         type: 'separator',
       },
       {
-        role: 'cut',
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: 'Cmd+X',
+        selector: 'cut:',
       },
       {
-        label: 'Copy',
-        accelerator: 'CmdOrCtrl+C',
+        label: intl.formatMessage(menuItems.copy),
+        accelerator: 'Cmd+C',
         selector: 'copy:',
       },
       {
-        label: 'Paste',
-        accelerator: 'CmdOrCtrl+V',
+        label: intl.formatMessage(menuItems.paste),
+        accelerator: 'Cmd+V',
         selector: 'paste:',
       },
       {
-        role: 'pasteandmatchstyle',
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: 'Cmd+Shift+V',
+        selector: 'pasteAndMatchStyle:',
       },
       {
+        label: intl.formatMessage(menuItems.delete),
         role: 'delete',
       },
       {
-        role: 'selectall',
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: 'Cmd+A',
+        selector: 'selectAll:',
       },
     ],
   },
   {
-    label: 'View',
+    label: intl.formatMessage(menuItems.view),
     submenu: [
       {
         type: 'separator',
       },
       {
+        label: intl.formatMessage(menuItems.resetZoom),
         role: 'resetzoom',
       },
       {
+        label: intl.formatMessage(menuItems.zoomIn),
+        // accelerator: 'Cmd+=',
         role: 'zoomin',
-        accelerator: 'CommandOrControl+=',
       },
       {
+        label: intl.formatMessage(menuItems.zoomOut),
         role: 'zoomout',
       },
       {
         type: 'separator',
       },
       {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
         role: 'togglefullscreen',
       },
     ],
   },
   {
-    label: 'Services',
+    label: intl.formatMessage(menuItems.services),
     submenu: [],
   },
   {
+    label: intl.formatMessage(menuItems.window),
     role: 'window',
     submenu: [
       {
+        label: intl.formatMessage(menuItems.minimize),
         role: 'minimize',
       },
       {
+        label: intl.formatMessage(menuItems.close),
         role: 'close',
       },
     ],
   },
   {
+    label: intl.formatMessage(menuItems.help),
     role: 'help',
     submenu: [
       {
-        label: 'Learn More',
+        label: intl.formatMessage(menuItems.learnMore),
         click() { shell.openExternal('http://meetfranz.com'); },
       },
       {
-        label: 'Changelog',
+        label: intl.formatMessage(menuItems.changelog),
         click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Support',
+        label: intl.formatMessage(menuItems.support),
         click() { shell.openExternal('http://meetfranz.com/support'); },
       },
       {
         type: 'separator',
       },
       {
-        label: 'Terms of Service',
+        label: intl.formatMessage(menuItems.tos),
         click() { shell.openExternal('https://meetfranz.com/terms'); },
       },
       {
-        label: 'Privacy Statement',
+        label: intl.formatMessage(menuItems.privacy),
+        click() { shell.openExternal('https://meetfranz.com/privacy'); },
+      },
+    ],
+  },
+];
+
+const _titleBarTemplateFactory = intl => [
+  {
+    label: intl.formatMessage(menuItems.edit),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.undo),
+        accelerator: `${ctrlKey}+Z`,
+        click() {
+          getActiveWebview().undo();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.redo),
+        accelerator: `${ctrlKey}+Y`,
+        click() {
+          getActiveWebview().redo();
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.cut),
+        accelerator: `${ctrlKey}+X`,
+        click() {
+          getActiveWebview().cut();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.copy),
+        accelerator: `${ctrlKey}+C`,
+        click() {
+          getActiveWebview().copy();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.paste),
+        accelerator: `${ctrlKey}+V`,
+        click() {
+          getActiveWebview().paste();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.pasteAndMatchStyle),
+        accelerator: `${ctrlKey}+Shift+V`,
+        click() {
+          getActiveWebview().pasteAndMatchStyle();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.delete),
+        click() {
+          getActiveWebview().delete();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.selectAll),
+        accelerator: `${ctrlKey}+A`,
+        click() {
+          getActiveWebview().selectAll();
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.view),
+    submenu: [
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.resetZoom),
+        accelerator: `${ctrlKey}+0`,
+        click() {
+          getActiveWebview().setZoomLevel(0);
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomIn),
+        accelerator: `${ctrlKey}+Plus`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === 5 ? zoomLevel : zoomLevel + 1);
+          });
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.zoomOut),
+        accelerator: `${ctrlKey}+-`,
+        click() {
+          getActiveWebview().getZoomLevel((zoomLevel) => {
+            getActiveWebview().setZoomLevel(zoomLevel === -5 ? zoomLevel : zoomLevel - 1);
+          });
+        },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: app.mainWindow.isFullScreen() // label doesn't work, gets overridden by Electron
+          ? intl.formatMessage(menuItems.exitFullScreen)
+          : intl.formatMessage(menuItems.enterFullScreen),
+        accelerator: `${ctrlKey}+F`,
+        click(menuItem, browserWindow) {
+          browserWindow.setFullScreen(!browserWindow.isFullScreen());
+        },
+      },
+    ],
+  },
+  {
+    label: intl.formatMessage(menuItems.services),
+    submenu: [],
+  },
+  {
+    label: intl.formatMessage(menuItems.window),
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.minimize),
+        accelerator: 'Alt+M',
+        click(menuItem, browserWindow) {
+          browserWindow.minimize();
+        },
+      },
+      {
+        label: intl.formatMessage(menuItems.close),
+        accelerator: 'Alt+W',
+        click(menuItem, browserWindow) {
+          browserWindow.close();
+        },
+      },
+    ],
+  },
+  {
+    label: '?',
+    submenu: [
+      {
+        label: intl.formatMessage(menuItems.learnMore),
+        click() { shell.openExternal('http://meetfranz.com'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.changelog),
+        click() { shell.openExternal('https://github.com/meetfranz/franz/blob/master/CHANGELOG.md'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.support),
+        click() { shell.openExternal('http://meetfranz.com/support'); },
+      },
+      {
+        type: 'separator',
+      },
+      {
+        label: intl.formatMessage(menuItems.tos),
+        click() { shell.openExternal('https://meetfranz.com/terms'); },
+      },
+      {
+        label: intl.formatMessage(menuItems.privacy),
         click() { shell.openExternal('https://meetfranz.com/privacy'); },
       },
     ],
@@ -115,7 +479,7 @@ const template = [
 ];
 
 export default class FranzMenu {
-  @observable tpl = template;
+  @observable currentTemplate = [];
 
   constructor(stores, actions) {
     this.stores = stores;
@@ -124,23 +488,45 @@ export default class FranzMenu {
     autorun(this._build.bind(this));
   }
 
+  rebuild() {
+    this._build();
+  }
+
+  get template() {
+    return this.currentTemplate.toJS();
+  }
+
   _build() {
-    const tpl = toJS(this.tpl);
+    // console.log(window.franz);
+    const serviceTpl = Object.assign([], this.serviceTpl); // need to clone object so we don't modify computed (cached) object
+
+    if (window.franz === undefined) {
+      return;
+    }
+
+    const intl = window.franz.intl;
+    const tpl = isMac ? _templateFactory(intl) : _titleBarTemplateFactory(intl);
 
     tpl[1].submenu.push({
-      role: 'toggledevtools',
+      type: 'separator',
+    }, {
+      label: intl.formatMessage(menuItems.toggleDevTools),
+      accelerator: `${cmdKey}+Alt+I`,
+      click: (menuItem, browserWindow) => {
+        browserWindow.webContents.toggleDevTools();
+      },
     }, {
-      label: 'Toggle Service Developer Tools',
-      accelerator: 'CmdOrCtrl+Shift+Alt+i',
+      label: intl.formatMessage(menuItems.toggleServiceDevTools),
+      accelerator: `${cmdKey}+Shift+Alt+I`,
       click: () => {
         this.actions.service.openDevToolsForActiveService();
       },
     });
 
     tpl[1].submenu.unshift({
-      label: 'Reload Service',
-      id: 'reloadService',
-      accelerator: 'CmdOrCtrl+R',
+      label: intl.formatMessage(menuItems.reloadService),
+      id: 'reloadService', // TODO: needed?
+      accelerator: `${cmdKey}+R`,
       click: () => {
         if (this.stores.user.isLoggedIn
           && this.stores.services.enabled.length > 0) {
@@ -150,93 +536,128 @@ export default class FranzMenu {
         }
       },
     }, {
-      label: 'Reload Franz',
-      accelerator: 'CmdOrCtrl+Shift+R',
+      label: intl.formatMessage(menuItems.reloadFranz),
+      accelerator: `${cmdKey}+Shift+R`,
       click: () => {
         window.location.reload();
       },
     });
 
-    if (isMac) {
-      tpl.unshift({
-        label: app.getName(),
-        submenu: [
-          {
-            role: 'about',
-          },
-          {
-            type: 'separator',
-          },
-          {
-            label: 'Settings',
-            accelerator: 'CmdOrCtrl+,',
-            click: () => {
-              this.actions.ui.openSettings({ path: 'app' });
-            },
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'services',
-            submenu: [],
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'hide',
-          },
-          {
-            role: 'hideothers',
-          },
-          {
-            role: 'unhide',
-          },
-          {
-            type: 'separator',
-          },
-          {
-            role: 'quit',
+    tpl.unshift({
+      label: isMac ? app.getName() : intl.formatMessage(menuItems.file),
+      submenu: [
+        {
+          label: intl.formatMessage(menuItems.about),
+          role: 'about',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'CmdOrCtrl+,',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
           },
-        ],
-      });
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.services),
+          role: 'services',
+          submenu: [],
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.hide),
+          role: 'hide',
+        },
+        {
+          label: intl.formatMessage(menuItems.hideOthers),
+          role: 'hideothers',
+        },
+        {
+          label: intl.formatMessage(menuItems.unhide),
+          role: 'unhide',
+        },
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          role: 'quit',
+        },
+      ],
+    });
+
+    const about = {
+      label: intl.formatMessage(menuItems.about),
+      click: () => {
+        dialog.showMessageBox({
+          type: 'info',
+          title: 'Franz',
+          message: 'Franz',
+          detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
+        });
+      },
+    };
+
+    if (isMac) {
       // Edit menu.
       tpl[1].submenu.push(
         {
           type: 'separator',
         },
         {
-          label: 'Speech',
+          label: intl.formatMessage(menuItems.speech),
           submenu: [
             {
+              label: intl.formatMessage(menuItems.startSpeaking),
               role: 'startspeaking',
             },
             {
+              label: intl.formatMessage(menuItems.stopSpeaking),
               role: 'stopspeaking',
             },
           ],
         },
       );
+
+      tpl[4].submenu.unshift(about, {
+        type: 'separator',
+      });
     } else {
-      tpl[4].submenu.unshift({
-        role: 'about',
-        click: () => {
-          dialog.showMessageBox({
-            type: 'info',
-            title: 'Franz',
-            message: 'Franz',
-            detail: `Version: ${remote.app.getVersion()}\nRelease: ${process.versions.electron} / ${process.platform} / ${process.arch}`,
-          });
+      tpl[0].submenu = [
+        {
+          label: intl.formatMessage(menuItems.settings),
+          accelerator: 'Ctrl+P',
+          click: () => {
+            this.actions.ui.openSettings({ path: 'app' });
+          },
         },
-      });
-    }
+        {
+          type: 'separator',
+        },
+        {
+          label: intl.formatMessage(menuItems.quit),
+          accelerator: 'Alt+F4',
+          click: () => {
+            app.quit();
+          },
+        },
+      ];
 
-    const serviceTpl = this.serviceTpl;
+      tpl[5].submenu.push({
+        type: 'separator',
+      }, about);
+    }
 
     serviceTpl.unshift({
-      label: 'Add new Service',
-      accelerator: 'CmdOrCtrl+N',
+      label: intl.formatMessage(menuItems.addNewService),
+      accelerator: `${cmdKey}+N`,
       click: () => {
         this.actions.ui.openSettings({ path: 'recipes' });
       },
@@ -245,9 +666,10 @@ export default class FranzMenu {
     });
 
     if (serviceTpl.length > 0) {
-      tpl[isMac ? 3 : 2].submenu = toJS(this.serviceTpl);
+      tpl[3].submenu = serviceTpl;
     }
 
+    this.currentTemplate = tpl;
     const menu = Menu.buildFromTemplate(tpl);
     Menu.setApplicationMenu(menu);
   }
@@ -258,7 +680,7 @@ export default class FranzMenu {
     if (this.stores.user.isLoggedIn) {
       return services.map((service, i) => ({
         label: this._getServiceName(service),
-        accelerator: i <= 9 ? `CmdOrCtrl+${i + 1}` : null,
+        accelerator: i <= 9 ? `${cmdKey}+${i + 1}` : null,
         type: 'radio',
         checked: service.isActive,
         click: () => {
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index afdd7dec7..964a9fcea 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -6,7 +6,11 @@ html {
 
 .app {
   display: flex;
-  flex-direction: row;
+  flex-direction: column;
+
+  .app__content {
+    display: flex;
+  }
 
   .app__service {
     display: flex;
@@ -15,6 +19,10 @@ html {
   }
 }
 
+.electron-app-title-bar {
+  z-index: 99999999;
+}
+
 .window-draggable {
   position: absolute;
   width: 100%;
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 446bdca14..784a04d3d 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -4,6 +4,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 }
 
 @import './node_modules/mdi/scss/materialdesignicons.scss';
+@import './node_modules/electron-react-titlebar/assets/style';
 
 // modules
 @import './reset.scss';
@@ -28,6 +29,7 @@ $mdi-font-path: '../node_modules/mdi/fonts';
 @import './subscription-popup.scss';
 @import './content-tabs.scss';
 @import './invite.scss';
+@import './title-bar.scss';
 
 // form
 @import './input.scss';
diff --git a/src/styles/title-bar.scss b/src/styles/title-bar.scss
new file mode 100644
index 000000000..492245e2f
--- /dev/null
+++ b/src/styles/title-bar.scss
@@ -0,0 +1,50 @@
+#electron-app-title-bar {
+  background: $theme-gray-lightest;
+  border-bottom: 0;
+  box-shadow: 0px 0 8px rgba(#000, 0.1);
+
+  span {
+    line-height: normal;
+  }
+
+  div {
+    height: auto;
+  }
+
+  .toolbar-dropdown {
+    &.open {
+      box-shadow: 0px 0 8px rgba(#000, 0.1);
+    }
+
+    &:not(.open) {
+      .menu-item .menu-label {
+        opacity: 1;
+      }
+
+      &>.toolbar-button > button:hover {
+        background: $theme-brand-primary;
+      }
+    }
+  }
+
+  .list-item {
+    .menu-item {
+      margin: 4px;
+      border-radius: $theme-border-radius-small;
+    }
+    &.selected {
+      // background: $theme-brand-primary;
+      background: none;
+
+      .menu-item {
+        background: $theme-brand-primary;
+      }
+    }
+  }
+
+  .menu-pane {
+    box-shadow: 0px 0 10px rgba(#000, 0.5);
+    border-bottom-left-radius: $theme-border-radius-small;
+    border-bottom-right-radius: $theme-border-radius-small;
+  }
+}
diff --git a/yarn.lock b/yarn.lock
index c788006b7..317f7b220 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1367,7 +1367,7 @@ circular-json@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
 
-classnames@^2.2.0, classnames@^2.2.5:
+classnames@^2.2.0, classnames@^2.2.3, classnames@^2.2.5:
   version "2.2.5"
   resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.5.tgz#fb3801d453467649ef3603c7d61a02bd129bde6d"
 
@@ -1766,6 +1766,10 @@ doctrine@^2.0.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+"dom-helpers@^2.4.0 || ^3.0.0":
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.3.1.tgz#fc1a4e15ffdf60ddde03a480a9c0fece821dd4a6"
+
 dom-helpers@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-3.2.1.tgz#3203e07fed217bd1f424b019735582fc37b2825a"
@@ -1995,6 +1999,13 @@ electron-publish@19.15.0:
     fs-extra-p "^4.3.0"
     mime "^1.3.6"
 
+electron-react-titlebar@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/electron-react-titlebar/-/electron-react-titlebar-0.7.1.tgz#d56517d01ef0e935caa994e9b577dfd63a56c66c"
+  dependencies:
+    lodash "^4.17.4"
+    react-virtualized "^9.7.6"
+
 electron-rebuild@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.6.0.tgz#e8d26f4d8e9fe5388df35864b3658e5cfd4dcb7e"
@@ -2450,6 +2461,18 @@ fast-levenshtein@~2.0.4:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
+fbjs@^0.8.16:
+  version "0.8.16"
+  resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  dependencies:
+    core-js "^1.0.0"
+    isomorphic-fetch "^2.1.1"
+    loose-envify "^1.0.0"
+    object-assign "^4.1.0"
+    promise "^7.1.1"
+    setimmediate "^1.0.5"
+    ua-parser-js "^0.7.9"
+
 fbjs@^0.8.9:
   version "0.8.14"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.14.tgz#d1dbe2be254c35a91e09f31f9cd50a40b2a0ed1c"
@@ -4058,7 +4081,7 @@ longest@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.0, loose-envify@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
   dependencies:
@@ -4948,6 +4971,14 @@ prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.7, prop-types@^15.5.8:
     fbjs "^0.8.9"
     loose-envify "^1.3.1"
 
+prop-types@^15.6.0:
+  version "15.6.0"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 proxy-middleware@~0.15.0:
   version "0.15.0"
   resolved "https://registry.yarnpkg.com/proxy-middleware/-/proxy-middleware-0.15.0.tgz#a3fdf1befb730f951965872ac2f6074c61477a56"
@@ -5126,6 +5157,16 @@ react-transition-group@^1.2.0:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
+react-virtualized@^9.7.6:
+  version "9.18.5"
+  resolved "https://registry.yarnpkg.com/react-virtualized/-/react-virtualized-9.18.5.tgz#42dd390ebaa7ea809bfcaf775d39872641679b89"
+  dependencies:
+    babel-runtime "^6.26.0"
+    classnames "^2.2.3"
+    dom-helpers "^2.4.0 || ^3.0.0"
+    loose-envify "^1.3.0"
+    prop-types "^15.6.0"
+
 react@^15.4.1:
   version "15.6.1"
   resolved "https://registry.yarnpkg.com/react/-/react-15.6.1.tgz#baa8434ec6780bde997cdc380b79cd33b96393df"