diff --git a/.all-contributorsrc b/.all-contributorsrc
index 0058edf8..e76f0530 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -77,6 +77,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "AARYAN-MAHENDRA",
+      "name": "AARYAN-MAHENDRA",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/64866670?v=4",
+      "profile": "https://github.com/AARYAN-MAHENDRA",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Nothing-Works",
+      "name": "Andy",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/18606648?v=4",
+      "profile": "https://github.com/Nothing-Works",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index ed1b5ae0..633001ec 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Responsively App [![Twitter Follow](https://img.shields.io/twitter/follow/ResponsivelyApp?style=social)](https://twitter.com/ResponsivelyApp)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Gitter chat](https://img.shields.io/gitter/room/badges/shields.svg)](https://gitter.im/responsively-app) [![xscode](https://img.shields.io/badge/Available%20on-xs%3Acode-blue?style=?style=plastic&logo=appveyor&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAAZQTFRF////////VXz1bAAAAAJ0Uk5T/wDltzBKAAAAlUlEQVR42uzXSwqAMAwE0Mn9L+3Ggtgkk35QwcnSJo9S+yGwM9DCooCbgn4YrJ4CIPUcQF7/XSBbx2TEz4sAZ2q1RAECBAiYBlCtvwN+KiYAlG7UDGj59MViT9hOwEqAhYCtAsUZvL6I6W8c2wcbd+LIWSCHSTeSAAECngN4xxIDSK9f4B9t377Wd7H5Nt7/Xz8eAgwAvesLRjYYPuUAAAAASUVORK5CYII=)](https://xscode.com/manojvivek/responsively-app)
 
@@ -74,6 +74,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/RomainFrancony"><img src="https://avatars3.githubusercontent.com/u/22396965?v=4" width="100px;" alt=""/><br /><sub><b>Romain Francony</b></sub></a><br /><a href="https://github.com/manojVivek/responsively-app/commits?author=RomainFrancony" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/AARYAN-MAHENDRA"><img src="https://avatars1.githubusercontent.com/u/64866670?v=4" width="100px;" alt=""/><br /><sub><b>AARYAN-MAHENDRA</b></sub></a><br /><a href="https://github.com/manojVivek/responsively-app/commits?author=AARYAN-MAHENDRA" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/Nothing-Works"><img src="https://avatars3.githubusercontent.com/u/18606648?v=4" width="100px;" alt=""/><br /><sub><b>Andy</b></sub></a><br /><a href="https://github.com/manojVivek/responsively-app/commits?author=Nothing-Works" title="Code">💻</a></td>
   </tr>
 </table>
 
diff --git a/desktop-app/app/components/Addressinput/style.css b/desktop-app/app/components/Addressinput/style.css
index 704d9933..36982e52 100644
--- a/desktop-app/app/components/Addressinput/style.css
+++ b/desktop-app/app/components/Addressinput/style.css
@@ -2,9 +2,6 @@
   display: flex;
   position: relative;
   align-items: center;
-}
-
-.addressInput {
   font-size: 16px;
   height: 20px;
   width: 100%;
@@ -17,7 +14,19 @@
   transition: border 500ms ease-out;
 }
 
-.addressInput:focus {
+.addressInput {
+height: 20px;
+padding: 14px 10px;
+  background: unset;
+  color: #ffffffcc;
+  border:none;
+  width:92%;
+  margin:0;
+  outline: none;
+text-overflow: ellipsis;
+}
+
+.addressBarContainer:focus-within {
   color: white;
   border: solid 1px #7587ec;
 }
diff --git a/desktop-app/app/components/WebView/index.js b/desktop-app/app/components/WebView/index.js
index 94a825ea..eb76cd34 100644
--- a/desktop-app/app/components/WebView/index.js
+++ b/desktop-app/app/components/WebView/index.js
@@ -141,8 +141,8 @@ class WebView extends Component {
       }
     );
 
-    const urlChangeHandler = ({url}) => {
-      if (url === this.props.browser.address) {
+    const urlChangeHandler = ({url, isMainFrame = true}) => {
+      if (!isMainFrame || url === this.props.browser.address) {
         return;
       }
       this.props.onAddressChange(url);
@@ -375,13 +375,13 @@ class WebView extends Component {
       });
 
       document.addEventListener(
-        'click', 
+        'click',
         (e) => {
           if (e.target === window.responsivelyApp.lastClickElement || e.responsivelyAppProcessed) {
             window.responsivelyApp.lastClickElement = null;
             e.responsivelyAppProcessed = true;
             return;
-          } 
+          }
           if (window.responsivelyApp.domInspectorEnabled) {
             e.preventDefault();
             window.responsivelyApp.domInspector.disable();
@@ -398,7 +398,7 @@ class WebView extends Component {
           }
           e.responsivelyAppProcessed = true;
           window.responsivelyApp.sendMessageToHost(
-            '${MESSAGE_TYPES.click}', 
+            '${MESSAGE_TYPES.click}',
             {
               cssPath: window.responsivelyApp.cssPath(e.target),
             }
diff --git a/desktop-app/app/main.dev.js b/desktop-app/app/main.dev.js
index a19a4caf..a79b2c40 100644
--- a/desktop-app/app/main.dev.js
+++ b/desktop-app/app/main.dev.js
@@ -90,6 +90,9 @@ const openUrl = url => {
  */
 
 app.on('will-finish-launching', () => {
+  if (process.platform === 'win32') {
+    urlToOpen = process.argv.filter(i => /^responsively/.test(i))[0];
+  }
   if (['win32', 'darwin'].includes(process.platform)) {
     if (process.argv.length >= 2) {
       app.setAsDefaultProtocolClient(protocol, process.execPath, [
@@ -196,8 +199,9 @@ const createWindow = async () => {
     if (urlToOpen) {
       openUrl(urlToOpen);
       urlToOpen = null;
+    } else {
+      mainWindow.show();
     }
-    mainWindow.show();
   });
 
   ipcMain.on('http-auth-promt-response', (event, ...args) => {