diff --git a/podcasts-gtk/resources/gtk/show_widget.ui b/podcasts-gtk/resources/gtk/show_widget.ui
index ee82af3..c3610a9 100644
--- a/podcasts-gtk/resources/gtk/show_widget.ui
+++ b/podcasts-gtk/resources/gtk/show_widget.ui
@@ -30,106 +30,77 @@ Tobias Bernard
   <!-- interface-description A podcast client for the GNOME Desktop -->
   <!-- interface-copyright 2017 - 2018 -->
   <!-- interface-authors Jordan Petridis\nTobias Bernard -->
-  <object class="GtkBox" id="container">
-    <property name="width_request">290</property>
-    <property name="height_request">420</property>
+  <object class="GtkBox" id="sub_container">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="margin_top">32</property>
+    <property name="margin_bottom">32</property>
+    <property name="hexpand">True</property>
     <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
     <child>
-      <object class="GtkScrolledWindow" id="scrolled_window">
-        <property name="name">scrolled_window</property>
+      <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="vexpand">True</property>
-        <property name="hscrollbar_policy">never</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">6</property>
         <child>
-          <object class="GtkViewport">
+          <object class="GtkImage" id="cover">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="pixel_size">256</property>
+            <property name="icon_name">image-x-generic-symbolic</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="min_content_height">80</property>
             <child>
-              <object class="GtkBox" id="sub_container">
+              <object class="GtkViewport">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="margin_top">32</property>
-                <property name="margin_bottom">32</property>
-                <property name="hexpand">True</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
+                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkLabel" id="description">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkImage" id="cover">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="pixel_size">256</property>
-                        <property name="icon_name">image-x-generic-symbolic</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hscrollbar_policy">never</property>
-                        <property name="min_content_height">80</property>
-                        <child>
-                          <object class="GtkViewport">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="shadow_type">none</property>
-                            <child>
-                              <object class="GtkLabel" id="description">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="halign">center</property>
-                                <property name="valign">center</property>
-                                <property name="label" translatable="yes">This is embarrassing!
-Sorry, we could not find a description for this show.</property>
-                                <property name="use_markup">True</property>
-                                <property name="justify">center</property>
-                                <property name="wrap">True</property>
-                                <property name="max_width_chars">70</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
+                    <property name="halign">center</property>
+                    <property name="valign">center</property>
+                    <property name="label">This is embarrasing!
+Sorry, we could not find a description for this Show.</property>
+                    <property name="use_markup">True</property>
+                    <property name="justify">center</property>
+                    <property name="wrap">True</property>
+                    <property name="max_width_chars">70</property>
                   </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="padding">6</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
                 </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
         </child>
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="fill">True</property>
+        <property name="fill">False</property>
+        <property name="padding">6</property>
         <property name="position">0</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
 </interface>
diff --git a/podcasts-gtk/src/widgets/show.rs b/podcasts-gtk/src/widgets/show.rs
index c1a6179..73b5ff6 100644
--- a/podcasts-gtk/src/widgets/show.rs
+++ b/podcasts-gtk/src/widgets/show.rs
@@ -1,5 +1,5 @@
 use glib;
-use gtk::{self, prelude::*, SelectionMode};
+use gtk::{self, prelude::*, Orientation, SelectionMode};
 
 use crossbeam_channel::Sender;
 use failure::Error;
@@ -35,10 +35,15 @@ pub(crate) struct ShowWidget {
 
 impl Default for ShowWidget {
     fn default() -> Self {
+        let container = gtk::Box::new(Orientation::Horizontal, 0);
+        let scrolled_window = gtk::ScrolledWindow::new(None, None);
+        container.add(&scrolled_window);
+
         let builder = gtk::Builder::new_from_resource("/org/gnome/Podcasts/gtk/show_widget.ui");
-        let container: gtk::Box = builder.get_object("container").unwrap();
-        let scrolled_window: gtk::ScrolledWindow = builder.get_object("scrolled_window").unwrap();
         let sub_cont: gtk::Box = builder.get_object("sub_container").unwrap();
+        let cover: gtk::Image = builder.get_object("cover").unwrap();
+        let description: gtk::Label = builder.get_object("description").unwrap();
+
         let frame = gtk::Frame::new(None);
         let episodes = gtk::ListBox::new();
         episodes.set_selection_mode(SelectionMode::None);
@@ -51,13 +56,11 @@ impl Default for ShowWidget {
         let column = column.downcast::<gtk::Container>().unwrap();
 
         frame.add(&episodes);
-        column.add(&frame);
-        sub_cont.add(&column);
-        sub_cont.show_all();
-
-        let cover: gtk::Image = builder.get_object("cover").unwrap();
-        let description: gtk::Label = builder.get_object("description").unwrap();
+        sub_cont.add(&frame);
+        column.add(&sub_cont);
+        scrolled_window.add(&column);
 
+        container.show_all();
         ShowWidget {
             container,
             scrolled_window,