diff --git a/desktop-app/app/components/Addressinput/index.js b/desktop-app/app/components/Addressinput/index.js
index baf07bde..3ff54a3c 100644
--- a/desktop-app/app/components/Addressinput/index.js
+++ b/desktop-app/app/components/Addressinput/index.js
@@ -93,7 +93,11 @@ class AddressBar extends React.Component<Props> {
 
   _normalize = address => {
     if (!address.startsWith('http')) {
-      address = 'https://' + address;
+      let protocol = 'https://';
+      if (address.startsWith('localhost') || address.startsWith('127.0.0.1')) {
+        protocol = 'http://';
+      }
+      address = `${protocol}${address}`;
     }
     return address;
   };
diff --git a/desktop-app/app/components/DeviceManager/DeviceList/styles.css b/desktop-app/app/components/DeviceManager/DeviceList/styles.css
index f580512f..33dadd8c 100644
--- a/desktop-app/app/components/DeviceManager/DeviceList/styles.css
+++ b/desktop-app/app/components/DeviceManager/DeviceList/styles.css
@@ -3,6 +3,6 @@
   background: #00000030;
   border-radius: 10px;
   border: 1px solid lightgrey;
-  height: 80%;
+  height: 70vh;
   overflow: scroll;
 }
diff --git a/desktop-app/app/components/DeviceManager/index.js b/desktop-app/app/components/DeviceManager/index.js
index 7c716922..1ebcb8eb 100644
--- a/desktop-app/app/components/DeviceManager/index.js
+++ b/desktop-app/app/components/DeviceManager/index.js
@@ -99,8 +99,7 @@ export default function DeviceManager(props) {
         </AppBar>
         <div className={styles.container}>
           <p className={styles.toolTip}>
-            <span>✨</span>Drag and drop the devices across as needed to
-            re-order them.
+            <span>✨</span>Drag and drop the devices across to re-order them.
           </p>
           <DragDropContext onDragEnd={onDragEnd}>
             <Grid container spacing={3} className={styles.content}>
diff --git a/desktop-app/app/components/Header/index.js b/desktop-app/app/components/Header/index.js
index 25b96531..7ee4998e 100644
--- a/desktop-app/app/components/Header/index.js
+++ b/desktop-app/app/components/Header/index.js
@@ -28,12 +28,12 @@ const Header = function() {
       <HttpAuthDialog />
       <ToastContainer
         position="top-right"
-        autoClose={4000}
+        autoClose={3000}
         hideProgressBar
         newestOnTop={false}
         closeOnClick
+        pauseOnFocusLoss={false}
         rtl={false}
-        pauseOnVisibilityChange
         draggable
         pauseOnHover
         toastClassName={styles.darkToast}