diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ae8422..63dd6f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,6 +28,7 @@ before_script:
 variables:
 #   RUSTFLAGS: "-C link-dead-code"
   RUST_BACKTRACE: "FULL"
+  CARGO_HOME: $CI_PROJECT_DIR/cargo
 
 stable:test:
   # https://hub.docker.com/_/rust/
diff --git a/hammond-gtk/resources/gtk/episode_widget.ui b/hammond-gtk/resources/gtk/episode_widget.ui
index b0332fc..f6dd911 100644
--- a/hammond-gtk/resources/gtk/episode_widget.ui
+++ b/hammond-gtk/resources/gtk/episode_widget.ui
@@ -10,14 +10,14 @@
       <object class="GtkBox">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="spacing">5</property>
+        <property name="spacing">6</property>
         <child>
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="valign">center</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">5</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">True</property>
@@ -51,7 +51,7 @@
               <object class="GtkBox">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">5</property>
+                <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="date_label">
                     <property name="visible">True</property>
@@ -164,7 +164,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">5</property>
+            <property name="padding">6</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -172,7 +172,7 @@
           <object class="GtkBox">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">5</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkButton" id="cancel_button">
                 <property name="label" translatable="yes">Cancel</property>
@@ -260,7 +260,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="padding">5</property>
+            <property name="padding">6</property>
             <property name="pack_type">end</property>
             <property name="position">1</property>
           </packing>
@@ -269,7 +269,7 @@
       <packing>
         <property name="expand">True</property>
         <property name="fill">False</property>
-        <property name="padding">5</property>
+        <property name="padding">6</property>
         <property name="position">0</property>
       </packing>
     </child>
@@ -281,7 +281,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="padding">5</property>
+        <property name="padding">6</property>
         <property name="pack_type">end</property>
         <property name="position">1</property>
       </packing>
diff --git a/hammond-gtk/resources/gtk/episodes_view.ui b/hammond-gtk/resources/gtk/episodes_view.ui
index 9df8483..1d5333f 100644
--- a/hammond-gtk/resources/gtk/episodes_view.ui
+++ b/hammond-gtk/resources/gtk/episodes_view.ui
@@ -41,14 +41,16 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="halign">center</property>
+                    <property name="margin_top">24</property>
                     <property name="orientation">vertical</property>
-                    <property name="spacing">25</property>
+                    <property name="spacing">24</property>
                     <child>
                       <object class="GtkBox" id="today_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
@@ -102,6 +104,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
@@ -155,6 +158,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
@@ -208,6 +212,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
@@ -261,6 +266,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
@@ -314,6 +320,7 @@
                         <property name="can_focus">False</property>
                         <property name="no_show_all">True</property>
                         <property name="orientation">vertical</property>
+                        <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel">
                             <property name="visible">True</property>
diff --git a/hammond-gtk/resources/gtk/show_widget.ui b/hammond-gtk/resources/gtk/show_widget.ui
index ead850a..0f83b05 100644
--- a/hammond-gtk/resources/gtk/show_widget.ui
+++ b/hammond-gtk/resources/gtk/show_widget.ui
@@ -58,7 +58,7 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
-                                <property name="spacing">10</property>
+                                <property name="spacing">12</property>
                                 <child>
                                   <object class="GtkImage" id="cover">
                                     <property name="visible">True</property>
@@ -77,7 +77,7 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
                                     <property name="orientation">vertical</property>
-                                    <property name="spacing">10</property>
+                                    <property name="spacing">12</property>
                                     <child type="center">
                                       <object class="GtkLabel" id="description">
                                         <property name="visible">True</property>
@@ -191,7 +191,7 @@
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="padding">25</property>
+                        <property name="padding">24</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
diff --git a/hammond-gtk/resources/gtk/shows_view.ui b/hammond-gtk/resources/gtk/shows_view.ui
index 7981cb9..5050ca0 100644
--- a/hammond-gtk/resources/gtk/shows_view.ui
+++ b/hammond-gtk/resources/gtk/shows_view.ui
@@ -21,9 +21,11 @@
                 <property name="can_focus">False</property>
                 <property name="halign">center</property>
                 <property name="valign">start</property>
+                <property name="margin_top">24</property>
+                <property name="margin_bottom">24</property>
                 <property name="homogeneous">True</property>
-                <property name="column_spacing">5</property>
-                <property name="row_spacing">5</property>
+                <property name="column_spacing">12</property>
+                <property name="row_spacing">12</property>
                 <property name="max_children_per_line">20</property>
                 <property name="selection_mode">none</property>
               </object>