diff --git a/src/window.ui b/src/window.ui
index 3247fe0..8734855 100644
--- a/src/window.ui
+++ b/src/window.ui
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 3.8 -->
   <template class="TeleportAppWindow" parent="GtkApplicationWindow">
     <property name="title" translatable="yes">Teleport</property>
-    <property name="default_width">1000</property>
+    <property name="default_width">700</property>
     <property name="default_height">500</property>
     <child>
       <object class="GtkAdjustment" id="adjustment1">
@@ -34,7 +34,7 @@
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="orientation">vertical</property>
-            <property name="width-request">700</property>
+            <property name="width-request">500</property>
             <child>
               <object class="GtkFrame" id="general-frame">
                 <property name="visible">True</property>
@@ -208,7 +208,7 @@
                                 <property name="can_focus">True</property>
                                 <property name="activatable">false</property>
                                 <child>
-                                  <object class="GtkGrid" id="remote-devices-toggle-grid">
+                                  <object class="GtkGrid" id="remote-devices-grid">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="row_spacing">0</property>
@@ -219,13 +219,13 @@
                                     <property name="margin_bottom">6</property>
                                     <property name="valign">center</property>
                                     <child>
-                                      <object class="GtkLabel" id="remote-devices-toggle-label">
+                                      <object class="GtkLabel" id="remote-devices-name-1">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="hexpand">True</property>
                                         <property name="xalign">0</property>
                                         <property name="valign">end</property>
-                                        <property name="label" translatable="yes">Kim's Librem</property>
+                                        <property name="label" translatable="yes">Jan's Librem</property>
                                         <property name="use_underline">True</property>
                                       </object>
                                       <packing>
@@ -240,7 +240,7 @@
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
                                         <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Drag and drop files here to send it</property>
+                                        <property name="label" translatable="yes">Drop here to send</property>
                                         <style>
                                           <class name="dim-label"/>
                                         </style>
@@ -262,7 +262,7 @@
                                         <property name="can_focus">True</property>
                                         <property name="halign">end</property>
                                         <property name="valign">center</property>
-                                        <property name="label" translatable="yes">send File</property>
+                                        <property name="label" translatable="yes">Send file</property>
                                       </object>
                                       <packing>
                                         <property name="left_attach">1</property>
@@ -396,6 +396,7 @@
         <property name="can_focus">False</property>
         <property name="show_close_button">True</property>
         <property name="decoration_layout">:close</property>
+        <property name="title" translatable="yes">Teleport</property>
         <child>
           <object class="GtkSwitch" id="powerSwitch">
             <property name="visible">True</property>