diff --git a/dropship.glade b/dropship.glade
index 2ec7c55..193fd4e 100644
--- a/dropship.glade
+++ b/dropship.glade
@@ -1,20 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.36.0 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="stock">gtk-close</property>
+    <property name="stock">gtk-no</property>
     <property name="icon_size">3</property>
   </object>
-  <template class="PendingTransmission" parent="GtkWindow">
+  <object class="GtkWindow" id="PendingTransmission">
     <property name="name">pendingTransmission</property>
     <property name="can_focus">False</property>
     <property name="decorated">False</property>
-    <child>
-      <placeholder/>
-    </child>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -132,27 +129,15 @@
         </child>
       </object>
     </child>
-  </template>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
+  </object>
   <object class="GtkApplicationWindow" id="mainWindow">
     <property name="can_focus">False</property>
     <property name="resizable">False</property>
     <property name="default_width">250</property>
     <property name="default_height">250</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="show_close_button">True</property>
-        <child>
-          <object class="GtkStackSwitcher">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_left">10</property>
-            <property name="stack">sendReceiveStack</property>
-          </object>
-        </child>
-      </object>
-    </child>
     <child>
       <object class="GtkStack" id="sendReceiveStack">
         <property name="visible">True</property>
@@ -253,6 +238,21 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <object class="GtkHeaderBar">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="show_close_button">True</property>
+        <child>
+          <object class="GtkStackSwitcher">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">10</property>
+            <property name="stack">sendReceiveStack</property>
+          </object>
+        </child>
+      </object>
+    </child>
   </object>
   <object class="GtkFileChooserDialog" id="filePicker">
     <property name="can_focus">False</property>
@@ -261,9 +261,6 @@
     <property name="transient_for">mainWindow</property>
     <property name="has_resize_grip">True</property>
     <property name="select_multiple">True</property>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
     <child internal-child="vbox">
       <object class="GtkBox">
         <property name="can_focus">False</property>
@@ -291,5 +288,8 @@
         </child>
       </object>
     </child>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/dropship.py b/dropship.py
index a5dd638..560beec 100644
--- a/dropship.py
+++ b/dropship.py
@@ -78,6 +78,9 @@ class DropShip:
     def init_ui_elements(self):
         """Initialize the UI elements."""
 
+        # TODO (rra) find out how to use composite templates
+        # https://github.com/sebp/PyGObject-Tutorial/issues/149
+
         # Send UI
         # Drag & Drop Box
         self.files_to_send = ""
@@ -95,7 +98,7 @@ class DropShip:
         self.file_chooser.add_buttons(
             'Cancel', gtk.ResponseType.CANCEL, "Add", gtk.ResponseType.OK
         )
- 
+
         # Receive UI
         # Code entry box
         self.recv_box = self.builder.get_object('receiveBoxCodeEntry')