diff --git a/app/app.js b/app/app.js
index 3c24caf3b8..9d2650eb21 100644
--- a/app/app.js
+++ b/app/app.js
@@ -14,7 +14,7 @@ let zoomFactor = 1;
 // Enable this for CSS grid layout :)
 electron.app.commandLine.appendSwitch('enable-experimental-web-platform-features');
 
-// Quit when all windows are closed.
+// Quit when all windows are closed (except on Mac).
 app.on('window-all-closed', () => {
   if (!IS_MAC) {
     app.quit();
@@ -36,11 +36,6 @@ app.on('ready', () => {
   // and load the app.html of the app.
   mainWindow.loadURL(`file://${__dirname}/app.html`);
 
-  // Open the DevTools.
-  // if (IS_DEV) {
-  //   mainWindow.webContents.openDevTools();
-  // }
-
   // Emitted when the window is closed.
   mainWindow.on('closed', () => {
     // Dereference the window object, usually you would store windows
diff --git a/app/app.json b/app/app.json
index 14964e98c5..0edc9e38c9 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,9 +1,11 @@
 {
+  "private": true,
   "name": "insomnia",
   "version": "3.0.0",
   "productName": "Insomnia REST Client",
   "description": "The best REST API Client",
   "homepage": "http://insomnia.rest",
+  "author": "Gregory Schier",
   "licence": "GPL-3.0",
   "main": "app.js",
   "dependencies": {
diff --git a/app/components/EnvironmentEditModal.js b/app/components/EnvironmentEditModal.js
index 4c8f308d13..51c3aa1a41 100644
--- a/app/components/EnvironmentEditModal.js
+++ b/app/components/EnvironmentEditModal.js
@@ -62,10 +62,10 @@ class EnvironmentEditModal extends Component {
                           valuePlaceholder="https://api.insomnia.com/v1"/>
         </ModalBody>
         <ModalFooter>
-          <button className="btn pull-right" onClick={this._saveChanges.bind(this)}>
-            Done
-          </button>
-          <div className="pad">
+          <div className="pull-right">
+            <button className="btn" onClick={this._saveChanges.bind(this)}>Save</button>
+          </div>
+          <div className="pad txt-sm">
             This data can be used for&nbsp;
             <Link href="https://mozilla.github.io/nunjucks/templating.html">Nunjucks Templating</Link>&nbsp;
             in your requests.
diff --git a/app/css/components/forms.scss b/app/css/components/forms.scss
index 286809a8fd..a7b778d3b3 100644
--- a/app/css/components/forms.scss
+++ b/app/css/components/forms.scss
@@ -70,7 +70,7 @@ label > .form-control,
 }
 
 .btn:hover:not(:disabled) {
-  background: $hl-xs;
+  background: $hl-sm;
 }
 
 .btn:active {
diff --git a/app/css/components/urlbar.scss b/app/css/components/urlbar.scss
index 7a8a53ed73..92dd62c0e7 100644
--- a/app/css/components/urlbar.scss
+++ b/app/css/components/urlbar.scss
@@ -18,13 +18,17 @@
     height: 100%;
 
     &:hover {
-      background-color: $hl-xxs;
+      background-color: $hl-xs;
     }
   }
 
   & > *:first-child {
     padding-left: $padding-md;
-    padding-right: $padding-md;
+    padding-right: $padding-md / 2;
+  }
+
+  & > *:nth-child(2) {
+    padding-left: $padding-md / 2;
   }
 
   & > *:last-child {
diff --git a/app/database/index.js b/app/database/index.js
index 0ba20068d0..4a6922f019 100644
--- a/app/database/index.js
+++ b/app/database/index.js
@@ -73,7 +73,7 @@ export function initDB () {
           const filePath = getDBFilePath();
           const tmpFilePath = `${filePath}.tmp`;
           
-          fs.writeFile(tmp, JSON.stringify(db, null, 2), err => {
+          fs.writeFile(tmpFilePath, JSON.stringify(db, null, 2), err => {
             if (err) {
               console.error('Failed to write DB to file', err);
             } else {