2 files changed, 15 insertions, 17 deletions
diff --git a/src/ui/history_box.rs b/src/ui/history_box.rs
index 9d2f59f..445d796 100755
--- a/src/ui/history_box.rs
+++ b/src/ui/history_box.rs
@@ -19,7 +19,6 @@ use gtk::prelude::*;
 use gtk::subclass::prelude::*;
 use gtk::{glib, CompositeTemplate};
 
-use crate::config;
 use crate::database;
 use crate::ui::{FurTasksPage, FurtheranceWindow};
 use crate::FurtheranceApplication;
@@ -42,8 +41,6 @@ mod imp {
         #[template_child]
         pub spinner: TemplateChild<gtk::Spinner>,
         #[template_child]
-        pub welcome_page: TemplateChild<adw::StatusPage>,
-        #[template_child]
         pub tasks_page: TemplateChild<FurTasksPage>,
     }
 
@@ -90,13 +87,6 @@ impl FurHistoryBox {
         } else {
             self.set_view(View::Empty);
         }
-
-        // Change "empty" page icon for development mode
-        let imp = imp::FurHistoryBox::from_instance(self);
-        if config::PROFILE == "development" {
-            imp.welcome_page
-                .set_icon_name(Some("com.lakoliu.Furtherance.Devel"));
-        }
     }
 
     fn set_view(&self, view: View) {
@@ -129,19 +119,20 @@ impl FurHistoryBox {
             Err(_) => false,
         };
         if is_saved_task {
+            window.vertical_align(gtk::Align::Start);
             self.set_view(View::Loading);
             imp.tasks_page.build_task_list();
             self.set_view(View::Tasks);
-            window.set_height_request(300);
         } else {
             self.set_view(View::Empty);
-            window.set_height_request(390);
+            window.vertical_align(gtk::Align::Center);
         }
     }
 
     pub fn empty_view(&self) {
         self.set_view(View::Empty);
         let window = FurtheranceWindow::default();
-        window.set_height_request(390);
+        window.vertical_align(gtk::Align::Center);
     }
 }
+
diff --git a/src/ui/window.rs b/src/ui/window.rs
index d02d1b5..5670696 100755
--- a/src/ui/window.rs
+++ b/src/ui/window.rs
@@ -52,6 +52,9 @@ mod imp {
         pub header_bar: TemplateChild<adw::HeaderBar>,
         #[template_child]
         pub add_task: TemplateChild<gtk::Button>,
+
+        #[template_child]
+        pub win_box: TemplateChild<gtk::Box>,
         #[template_child]
         pub watch: TemplateChild<gtk::Label>,
         #[template_child]
@@ -162,15 +165,13 @@ impl FurtheranceWindow {
     fn setup_widgets(&self) {
         let imp = imp::FurtheranceWindow::from_instance(self);
 
-        // Set initial minimum height
+        // Set initial minimum height and alignment
         let is_saved_task: bool = match database::check_for_tasks() {
             Ok(_) => true,
             Err(_) => false,
         };
         if is_saved_task {
-            self.set_height_request(300);
-        } else {
-            self.set_height_request(390);
+            self.vertical_align(gtk::Align::Start);
         }
 
         // Development mode
@@ -910,6 +911,12 @@ impl FurtheranceWindow {
 
         dialog.show()
     }
+
+    pub fn vertical_align(&self, align: gtk::Align) {
+        let imp = imp::FurtheranceWindow::from_instance(self);
+        imp.win_box.set_valign(align);
+    }
+
 }
 
 impl Default for FurtheranceWindow {