diff --git a/manifest.json b/manifest.json
index c09bc2f..7e05020 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
     "manifest_version": 2,
 
     "name": "NitroShare",
-    "version": "1.0",
+    "version": "1.0.1",
 
     "description": "Integration with the NitroShare desktop client",
     "icons": {
@@ -15,7 +15,7 @@
         "default_title": "Send URL with NitroShare"
     },
 
-    "key": "cljjpoinofmbdnbnpebolibochlfenag",
+    "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv6/L+Ye+qjH2KSnXo5CvYO2J25T03a1PGcu7zELfuPUZWXoEZosoHQ3KVqU6dTKzgLdqKQziJwohflL6KZInxnhOvkqbChQ5JHtufbGRnQ/sELfPmvhCzZx+I2ZW71b0c92QKPJohJjA8+bu8JvBHOjsXLb0t5cH2q0cFItnjto+9ingTQh6uMP6PZ90E7p/yuM+OyQwxq0xhdyRTr8G0dxUE5SLXHvOwmUw6auGFT0FVDe9OaIng8YfrN9H2NEqDbxftPkELHfWkMKsCHjwY3fexknmL4xSK+uQULeEeYYjr459FRZApS87Cb0ph8Yniuq8v9fTgAkceaHt9t0/YQIDAQAB",
 
     "permissions": [
         "activeTab",
diff --git a/popup.html b/popup.html
index 66ca480..68e8ec6 100644
--- a/popup.html
+++ b/popup.html
@@ -3,9 +3,8 @@
     <head>
         <style>
             html, body {
-                height: 240px;
                 margin: 0;
-                width: 320px;
+                width: 300px;
             }
             h1, ul {
                 margin: 0;
@@ -13,27 +12,16 @@
             h1 {
                 font-weight: normal;
             }
-            .container {
-                display: flex;
-                flex-direction: column;
-                height: 100%;
-            }
             .header {
                 background: #656;
                 color: #fff;
                 padding: 8px;
             }
-            .content {
-                display: flex;
-                flex-grow: 1;
-                position: relative;
-                text-overflow: auto;
-            }
             .spinner,
             .error {
-                align-self: center;
                 display: none;
-                margin: auto;
+                margin: 40px auto;
+                text-align: center;
             }
             .error {
                 color: #a55;
@@ -69,15 +57,15 @@
         <script src="popup.js"></script>
     </head>
     <body>
-        <div class="container">
-            <div class="header">
-                <h1>Send to Device</h1>
-            </div>
-            <div class="content">
-                <img src="loading.gif" class="spinner">
-                <div class="error"></div>
-                <ul class="devices"></ul>
+        <div class="header">
+            <h1>Send to Device</h1>
+        </div>
+        <div class="content">
+            <div class="spinner">
+                <img src="loading.gif">
             </div>
+            <div class="error"></div>
+            <ul class="devices"></ul>
         </div>
     </body>
 </html>
diff --git a/popup.js b/popup.js
index a4df783..43a2ad0 100644
--- a/popup.js
+++ b/popup.js
@@ -46,8 +46,6 @@ $(function() {
         });
     }
 
-    // TODO: the enumerator is hardcoded in here
-
     // Send the current URL to the specified device
     function sendUrl(device) {
         chrome.tabs.query({
@@ -56,7 +54,7 @@ $(function() {
         }, function (tabs) {
             request(METHOD_SENDURL, {
                 device: device.uuid,
-                enumerator: "mdns",
+                enumerator: device.deviceEnumeratorName,
                 url: tabs[0].url
             });
         });
