diff --git a/data/day-entry.ui b/data/day-entry.ui
index 4f60448aff8fe2415df736879d7c7665f0338f7a..b1ae0240a9ab81b4a2c30c5cacc6700983cead31 100644
--- a/data/day-entry.ui
+++ b/data/day-entry.ui
@@ -103,150 +103,137 @@
           </object>
         </child>
         <child>
-          <object class="GtkGrid">
-            <property name="vexpand">True</property>
-            <property name="row_spacing">8</property>
-            <property name="row_homogeneous">true</property>
-            <property name="column_homogeneous">true</property>
-            <child>
-              <object class="GtkLabel" id="nightTemperatureLabel">
-                <property name="label">16°</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="morningTemperatureLabel">
-                <property name="label">16°</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="afternoonTemperatureLabel">
-                <property name="label">16°</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="eveningTemperatureLabel">
-                <property name="label">16°</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">4</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="icon_name">temperature-symbolic</property>
-                <layout>
-                  <property name="column">0</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="icon_name">weather-showers-scattered-symbolic</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkImage">
-                <property name="icon_name">weather-windy</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">0</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="nightHumidity">
-                <property name="label">2.1 mm</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="morningHumidity">
-                <property name="label">2.1 mm</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="afternoonHumidity">
-                <property name="label">2.1 mm</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="eveningHumidity">
-                <property name="label">2.1 mm</property>
-                <layout>
-                  <property name="column">1</property>
-                  <property name="row">4</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="nightWind">
-                <property name="label">5 m/s</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="morningWind">
-                <property name="label">5 m/s</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="afternoonWind">
-                <property name="label">5 m/s</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">3</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel" id="eveningWind">
-                <property name="label">5 m/s</property>
-                <layout>
-                  <property name="column">2</property>
-                  <property name="row">4</property>
-                </layout>
-              </object>
-            </child>
+          <object class="GtkImage">
+            <property name="icon_name">temperature-symbolic</property>
             <layout>
               <property name="column">2</property>
               <property name="row">0</property>
-              <property name="row-span">5</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="nightTemperatureLabel">
+            <property name="label">16°</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="morningTemperatureLabel">
+            <property name="label">16°</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="afternoonTemperatureLabel">
+            <property name="label">16°</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="eveningTemperatureLabel">
+            <property name="label">16°</property>
+            <layout>
+              <property name="column">2</property>
+              <property name="row">4</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkImage">
+            <property name="icon_name">weather-showers-scattered-symbolic</property>
+            <layout>
+              <property name="column">3</property>
+              <property name="row">0</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="nightHumidity">
+            <property name="label">2.1 mm</property>
+            <layout>
+              <property name="column">3</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="morningHumidity">
+            <property name="label">2.1 mm</property>
+            <layout>
+              <property name="column">3</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="afternoonHumidity">
+            <property name="label">2.1 mm</property>
+            <layout>
+              <property name="column">3</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="eveningHumidity">
+            <property name="label">2.1 mm</property>
+            <layout>
+              <property name="column">3</property>
+              <property name="row">4</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkImage">
+            <property name="icon_name">weather-windy</property>
+            <layout>
+              <property name="column">4</property>
+              <property name="row">0</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="nightWind">
+            <property name="label">5 m/s</property>
+            <layout>
+              <property name="column">4</property>
+              <property name="row">1</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="morningWind">
+            <property name="label">5 m/s</property>
+            <layout>
+              <property name="column">4</property>
+              <property name="row">2</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="afternoonWind">
+            <property name="label">5 m/s</property>
+            <layout>
+              <property name="column">4</property>
+              <property name="row">3</property>
+            </layout>
+          </object>
+        </child>
+        <child>
+          <object class="GtkLabel" id="eveningWind">
+            <property name="label">5 m/s</property>
+            <layout>
+              <property name="column">4</property>
+              <property name="row">4</property>
             </layout>
           </object>
         </child>