diff --git a/po/ka.po b/po/ka.po
index 513756b0d..1d1c712d8 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2023-03-12 12:25+0000\n"
+"PO-Revision-Date: 2024-03-08 08:12+0000\n"
 "Last-Translator: NorwayFun <temuri.doghonadze@gmail.com>\n"
 "Language-Team: Georgian <https://l10n.elementary.io/projects/installer/"
 "installer/ka/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.14.2\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"
 
 #: src/Application.vala:42
@@ -21,10 +21,8 @@ msgid "Install %s"
 msgstr "%s-ის დაყენება"
 
 #: src/Application.vala:61
-#, fuzzy
-#| msgid "%s has been installed"
 msgid "operating system is being installed"
-msgstr "\"%s\" დაყენებულია"
+msgstr "მიმდინარეობს ოპერაციული სისტემის დაყენება"
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
@@ -84,6 +82,8 @@ msgstr "ვირტუალური მანქანა"
 #, c-format
 msgid "Some parts of %s may run slowly, freeze, or not function properly."
 msgstr ""
+"%s-ის ზოგიერთი ნაწილი შეიძლება, ნელი იყოს, ჭედავდეს, ან არასწორად "
+"ფუნქციონირებდეს."
 
 #: src/Views/CheckView.vala:68
 msgid "Your Device May Be Too Slow"
@@ -135,10 +135,8 @@ msgid "Next"
 msgstr "შემდეგი"
 
 #: src/Views/DriversView.vala:27
-#, fuzzy
-#| msgid "Partitioning Drive"
 msgid "Additional Drivers"
-msgstr "დისკის დაყოფა"
+msgstr "დამატებითი დრაივერები"
 
 #: src/Views/DriversView.vala:32
 msgid ""
@@ -156,6 +154,7 @@ msgstr ""
 #: src/Views/DriversView.vala:54
 msgid "An Internet connection is required to install NVIDIA® graphics drivers."
 msgstr ""
+"NVIDIA®-ის გრაფიკული დრაივერების დასაყენებლად ინტერნეტკავშირი აუცილებელია."
 
 #: src/Views/DriversView.vala:65
 msgid ""
@@ -257,11 +256,11 @@ msgstr "სცადეთ, თავიდან დააყენოთ"
 
 #: src/Views/ErrorView.vala:59
 msgid "Use Demo Mode and try to manually recover"
-msgstr ""
+msgstr "გამოიყენეთ საცდელი რეჟიმი და სცადეთ, ხელით აღადგინოთ"
 
 #: src/Views/ErrorView.vala:69
 msgid "Restart the device and boot from another drive"
-msgstr ""
+msgstr "გადატვირთეთ მოწყობილობა და ჩაიტვირთეთ სხვა დისკიდან"
 
 #: src/Views/ErrorView.vala:79
 msgid "Details"
@@ -324,7 +323,7 @@ msgstr ""
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:58
 msgid "You must at least select a <b>Root (/)</b> partition."
-msgstr ""
+msgstr "სულ ცოტა, <b>საწყისი (/)</b> დანაყოფი უნდა შექმნათ."
 
 #. Device is in EFI mode, so we also require a boot partition
 #: src/Views/PartitioningView.vala:62
@@ -335,7 +334,7 @@ msgstr ""
 
 #: src/Views/PartitioningView.vala:66
 msgid "It is also recommended to select a <b>Swap</b> partition."
-msgstr ""
+msgstr "ასევე, რეკომენდებულია, <b>სვოპის</b> დანაყოფიც შექმნათ."
 
 #: src/Views/PartitioningView.vala:118
 msgid "Modify Partitions…"
@@ -402,7 +401,7 @@ msgstr "დისკის წაშლა და დაყენება"
 #: src/Views/TryInstallView.vala:49
 #, c-format
 msgid "Erase everything and install a fresh copy of %s."
-msgstr ""
+msgstr "ყველაფრის წაშლა და %s-ის დაყენება."
 
 #: src/Views/TryInstallView.vala:55
 msgid "Custom Install (Advanced)"
@@ -489,7 +488,7 @@ msgstr "ფორმატი"
 
 #: src/Widgets/PartitionMenu.vala:61
 msgid "Delete all data and set up a new file system"
-msgstr ""
+msgstr "მონაცემების წაშლა და ახალი ფაილური სისტემის აწყობა"
 
 #: src/Widgets/PartitionMenu.vala:64
 msgid "Use as:"
diff --git a/po/pt.po b/po/pt.po
index 4b1a49b4f..0b95d1798 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2022-10-09 17:26+0000\n"
+"PO-Revision-Date: 2024-03-26 22:13+0000\n"
 "Last-Translator: Hugo Carvalho <hugokarvalho@hotmail.com>\n"
 "Language-Team: Portuguese <https://l10n.elementary.io/projects/installer/"
 "installer/pt/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
 
 #: src/Application.vala:42
@@ -21,10 +21,8 @@ msgid "Install %s"
 msgstr "Instalar o %s"
 
 #: src/Application.vala:61
-#, fuzzy
-#| msgid "%s has been installed"
 msgid "operating system is being installed"
-msgstr "%s foi instalado"
+msgstr "o sistema operativo está a ser instalado"
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
@@ -64,20 +62,20 @@ msgid "Test Mode"
 msgstr "Modo de Teste"
 
 #: src/Views/CheckView.vala:50
-#, fuzzy
-#| msgid "Try Installing Again"
 msgid "Before Installing"
-msgstr "Tentar instalar novamente"
+msgstr "Antes de instalar"
 
 #: src/Views/CheckView.vala:56
 msgid "Pre-Release Version"
-msgstr ""
+msgstr "Versão de pré-lançamento"
 
 #: src/Views/CheckView.vala:57
 msgid ""
 "Only install on devices dedicated for development. <b>You will not be able "
 "to upgrade to a stable release</b>."
 msgstr ""
+"Instale apenas em dispositivos dedicados ao desenvolvimento. <b>Não será "
+"possível atualizar para uma versão estável</b>."
 
 #: src/Views/CheckView.vala:62
 msgid "Virtual Machine"
@@ -99,10 +97,8 @@ msgid "This may cause it to run slowly or freeze."
 msgstr "Isto pode causar o seu funcionamento lento ou o seu congelamento."
 
 #: src/Views/CheckView.vala:85
-#, fuzzy
-#| msgid "Install %s"
 msgid "Install Anyway"
-msgstr "Instalar o %s"
+msgstr "Instalar mesmo assim"
 
 #: src/Views/CheckView.vala:211
 msgid "Recommended:"
@@ -142,10 +138,8 @@ msgid "Next"
 msgstr "Seguinte"
 
 #: src/Views/DriversView.vala:27
-#, fuzzy
-#| msgid "Partitioning Drive"
 msgid "Additional Drivers"
-msgstr "A particionar a unidade"
+msgstr "Controladores adicionais"
 
 #: src/Views/DriversView.vala:32
 msgid ""
@@ -153,28 +147,41 @@ msgid ""
 "not function properly without additional drivers. Most devices do not "
 "require additional drivers."
 msgstr ""
+"Adaptadores Wi-Fi Broadcom®, placas gráficas NVIDIA® e algumas máquinas "
+"virtuais podem não funcionar corretamente sem controladores adicionais. A "
+"maioria dos dispositivos não necessita de controladores adicionais."
 
 #: src/Views/DriversView.vala:43
 msgid ""
 "Proprietary drivers contain private code that can't be reviewed. Security "
 "and other updates are dependent on the driver vendor."
 msgstr ""
+"Os controladores proprietários contêm código privado que não pode ser "
+"revisto. As atualizações de segurança e outras dependem do fabricante do "
+"controlador."
 
 #: src/Views/DriversView.vala:54
 msgid "An Internet connection is required to install NVIDIA® graphics drivers."
 msgstr ""
+"É necessária uma ligação à Internet para instalar os controladores de placas "
+"gráficas NVIDIA®."
 
 #: src/Views/DriversView.vala:65
 msgid ""
 "Proprietary drivers can be installed later through AppCenter, but an "
 "Internet connection will be required for all drivers."
 msgstr ""
+"Os controladores proprietários podem ser instalados posteriormente através "
+"do centro de Aplicações, mas será necessária uma ligação à Internet para "
+"todos os controladores."
 
 #: src/Views/DriversView.vala:72
 msgid ""
 "Include third-party proprietary drivers when installing. I agree to their "
 "respective licenses and terms of use."
 msgstr ""
+"Incluir controladores proprietários de terceiros aquando da instalação. "
+"Aceito as respetivas licenças e termos de utilização."
 
 #: src/Views/DriversView.vala:101 src/Views/EncryptView.vala:167
 #: src/Views/KeyboardLayoutView.vala:58 src/Views/PartitioningView.vala:121
diff --git a/po/th.po b/po/th.po
index b55448542..fb07d6b9f 100644
--- a/po/th.po
+++ b/po/th.po
@@ -3,20 +3,22 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2016-05-27 15:29+0000\n"
-"Last-Translator: Maxwell Barvian <Unknown>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"PO-Revision-Date: 2024-03-01 20:12+0000\n"
+"Last-Translator: Aefgh Threenine <aefgh39622@gmail.com>\n"
+"Language-Team: Thai <https://l10n.elementary.io/projects/installer/installer/"
+"th/>\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
-"X-Generator: Launchpad (build 18204)\n"
 
 #: src/Application.vala:42
 #, c-format
 msgid "Install %s"
-msgstr ""
+msgstr "ติดตั้ง %s"
 
 #: src/Application.vala:61
 msgid "operating system is being installed"
@@ -24,38 +26,40 @@ msgstr ""
 
 #: src/MainWindow.vala:262
 msgid "Connect to a Power Source"
-msgstr ""
+msgstr "ต่อแหล่งจ่ายไฟ"
 
 #: src/MainWindow.vala:263
 msgid ""
 "Your device is running on battery power. It's recommended to be plugged in "
 "while installing."
 msgstr ""
+"อุปกรณ์ของคุณกำลังทำงานโดยใช้พลังงานจากแบตเตอรี่ "
+"ขอแนะนำให้เสียบปลั๊กอุปกรณ์ขณะทำการติดตั้ง"
 
 #: src/Utils.vala:34
 msgid "Test mode shutdown"
-msgstr ""
+msgstr "การปิดเครื่องในโหมดทดสอบ"
 
 #: src/Utils.vala:48
 msgid "Test mode reboot"
-msgstr ""
+msgstr "การรีบูตในโหมดทดสอบ"
 
 #: src/Utils.vala:74
 msgid "Test mode switch user"
-msgstr ""
+msgstr "การสลับผู้ใช้ในโหมดทดสอบ"
 
 #: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:221
 #, c-format
 msgid "%s…"
-msgstr ""
+msgstr "%s…"
 
 #: src/Views/AbstractInstallerView.vala:46
 msgid "Cancel Installation"
-msgstr ""
+msgstr "ยกเลิกการติดตั้ง"
 
 #: src/Views/AbstractInstallerView.vala:55
 msgid "Test Mode"
-msgstr ""
+msgstr "โหมดทดสอบ"
 
 #: src/Views/CheckView.vala:50
 msgid "Before Installing"
@@ -82,7 +86,7 @@ msgstr ""
 
 #: src/Views/CheckView.vala:68
 msgid "Your Device May Be Too Slow"
-msgstr ""
+msgstr "อุปกรณ์ของคุณอาจช้าเกินไป"
 
 #: src/Views/CheckView.vala:69
 msgid "This may cause it to run slowly or freeze."
@@ -94,38 +98,40 @@ msgstr ""
 
 #: src/Views/CheckView.vala:211
 msgid "Recommended:"
-msgstr ""
+msgstr "แนะนำ:"
 
 #: src/Views/CheckView.vala:217
 msgid "Your Device:"
-msgstr ""
+msgstr "อุปกรณ์ของคุณ:"
 
 #: src/Views/CheckView.vala:223 src/Views/CheckView.vala:227
 msgid "Processor:"
-msgstr ""
+msgstr "ตัวประมวลผล:"
 
 #: src/Views/CheckView.vala:239 src/Views/CheckView.vala:243
 msgid "Memory:"
-msgstr ""
+msgstr "หน่วยความจำ:"
 
 #: src/Views/DiskView.vala:46
 msgid "Select a Drive"
-msgstr ""
+msgstr "เลือกไดรฟ์"
 
 #: src/Views/DiskView.vala:52
 msgid ""
 "This will erase all data on the selected drive. If you have not backed your "
 "data up, you can cancel the installation and use Demo Mode."
 msgstr ""
+"นี่จะเป็นการลบข้อมูลทั้งหมดในไดรฟ์ที่เลือก หากคุณยังไม่ได้สำรองข้อมูล "
+"คุณสามารถยกเลิกการติดตั้งและใช้โหมดสาธิตได้"
 
 #: src/Views/DiskView.vala:76 src/Views/PartitioningView.vala:95
 msgid "Getting the current configuration…"
-msgstr ""
+msgstr "กำลังรับข้อมูลการกำหนดค่าปัจจุบัน…"
 
 #: src/Views/DiskView.vala:112 src/Views/PartitioningView.vala:123
 #: src/Views/TryInstallView.vala:88
 msgid "Next"
-msgstr ""
+msgstr "ถัดไป"
 
 #: src/Views/DriversView.vala:27
 msgid "Additional Drivers"
@@ -163,9 +169,8 @@ msgstr ""
 #: src/Views/DriversView.vala:101 src/Views/EncryptView.vala:167
 #: src/Views/KeyboardLayoutView.vala:58 src/Views/PartitioningView.vala:121
 #: src/Views/TryInstallView.vala:86
-#, fuzzy
 msgid "Back"
-msgstr "ลบ"
+msgstr "ย้อนกลับ"
 
 #: src/Views/DriversView.vala:104
 msgid "Erase and Install"
@@ -212,15 +217,15 @@ msgstr ""
 
 #: src/Views/EncryptView.vala:114
 msgid "Choose Encryption Password"
-msgstr ""
+msgstr "เลือกรหัสผ่านการเข้ารหัสลับ"
 
 #: src/Views/EncryptView.vala:128
 msgid "Confirm Password"
-msgstr ""
+msgstr "ยืนยันรหัสผ่าน"
 
 #: src/Views/EncryptView.vala:169
 msgid "Choose Password"
-msgstr ""
+msgstr "เลือกรหัสผ่าน"
 
 #: src/Views/EncryptView.vala:192
 msgid "Set Encryption Password"
@@ -232,7 +237,7 @@ msgstr ""
 
 #: src/Views/ErrorView.vala:32
 msgid "Could Not Install"
-msgstr ""
+msgstr "ไม่สามารถติดตั้งได้"
 
 #: src/Views/ErrorView.vala:37
 #, c-format
@@ -259,15 +264,15 @@ msgstr ""
 
 #: src/Views/ErrorView.vala:114 src/Views/SuccessView.vala:66
 msgid "Restart Device"
-msgstr ""
+msgstr "รีสตาร์ทอุปกรณ์"
 
 #: src/Views/ErrorView.vala:116 src/Views/TryInstallView.vala:39
 msgid "Try Demo Mode"
-msgstr ""
+msgstr "ลองโหมดสาธิต"
 
 #: src/Views/ErrorView.vala:118
 msgid "Try Installing Again"
-msgstr ""
+msgstr "ลองติดตั้งอีกครั้ง"
 
 #: src/Views/KeyboardLayoutView.vala:30
 msgid "Select Keyboard Layout"
@@ -275,35 +280,35 @@ msgstr ""
 
 #: src/Views/KeyboardLayoutView.vala:38
 msgid "Type to test your layout"
-msgstr ""
+msgstr "พิมพ์เพื่อทดสอบผังแป้นพิมพ์ของคุณ"
 
 #: src/Views/KeyboardLayoutView.vala:41
 msgid "Show keyboard layout"
-msgstr ""
+msgstr "แสดงผังแป้นพิมพ์"
 
 #: src/Views/KeyboardLayoutView.vala:60 src/Views/LanguageView.vala:111
 msgid "Select"
-msgstr ""
+msgstr "เลือก"
 
 #: src/Views/KeyboardLayoutView.vala:124
 msgid "Default"
-msgstr ""
+msgstr "ค่าเริ่มต้น"
 
 #: src/Views/KeyboardLayoutView.vala:131
 msgid "Input Language"
-msgstr ""
+msgstr "ภาษาป้อนข้อมูล"
 
 #: src/Views/LanguageView.vala:259
 msgid "Languages"
-msgstr ""
+msgstr "ภาษา"
 
 #: src/Views/LanguageView.vala:276
 msgid "Select a Language"
-msgstr ""
+msgstr "เลือกภาษา"
 
 #: src/Views/LanguageView.vala:304 src/Views/LanguageView.vala:349
 msgid "Currently active language"
-msgstr ""
+msgstr "ภาษาที่ใช้งานอยู่ขณะนี้"
 
 #: src/Views/PartitioningView.vala:52
 msgid ""
@@ -377,7 +382,7 @@ msgstr ""
 
 #: src/Views/TryInstallView.vala:28
 msgid "Try or Install"
-msgstr ""
+msgstr "ลองใช้หรือติดตั้ง"
 
 #: src/Views/TryInstallView.vala:41
 msgid ""
diff --git a/po/uk.po b/po/uk.po
index 3ccd3a7f6..d76f785e5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-24 17:42+0000\n"
-"PO-Revision-Date: 2023-08-25 03:04+0000\n"
+"PO-Revision-Date: 2024-03-15 21:13+0000\n"
 "Last-Translator: Ihor Hordiichuk <igor_ck@outlook.com>\n"
 "Language-Team: Ukrainian <https://l10n.elementary.io/projects/installer/"
 "installer/uk/>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.17\n"
+"X-Generator: Weblate 5.0.2\n"
 "X-Launchpad-Export-Date: 2016-09-27 06:41+0000\n"
 
 #: src/Application.vala:42
@@ -346,7 +346,7 @@ msgid ""
 "will erase ALL data on the selected partition.</b>"
 msgstr ""
 "Виберіть, які розділи використовувати на всіх дисках. <b>Натискання "
-"«Форматувати» призведе до стирання УСІХ даних обраного розділу.</b>"
+"«Форматувати» призведе до стирання ВСІХ даних обраного розділу.</b>"
 
 #. Device is in BIOS mode, so we just require a root partition
 #: src/Views/PartitioningView.vala:58
diff --git a/src/Views/AbstractInstallerView.vala b/src/Views/AbstractInstallerView.vala
index 6ad4005c3..4465b6440 100644
--- a/src/Views/AbstractInstallerView.vala
+++ b/src/Views/AbstractInstallerView.vala
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-public abstract class AbstractInstallerView : Gtk.Grid {
+public abstract class AbstractInstallerView : Gtk.Box {
     public bool cancellable { get; construct; }
 
     public signal void cancel ();
@@ -31,7 +31,8 @@ public abstract class AbstractInstallerView : Gtk.Grid {
         content_area = new Gtk.Grid () {
             column_spacing = 12,
             row_spacing = 12,
-            expand = true,
+            hexpand = true,
+            vexpand = true,
             orientation = Gtk.Orientation.VERTICAL
         };
 
@@ -60,8 +61,8 @@ public abstract class AbstractInstallerView : Gtk.Grid {
             action_area.set_child_secondary (test_label, true);
         }
 
-        orientation = Gtk.Orientation.VERTICAL;
-        row_spacing = 24;
+        orientation = VERTICAL;
+        spacing = 24;
         margin_top = 12;
         margin_bottom = 12;
         add (content_area);
diff --git a/src/Views/DiskView.vala b/src/Views/DiskView.vala
index 10d000bf2..f2a6ed7e3 100644
--- a/src/Views/DiskView.vala
+++ b/src/Views/DiskView.vala
@@ -19,7 +19,7 @@
 
 public class Installer.DiskView : AbstractInstallerView {
     private Gtk.Button next_button;
-    private Gtk.Grid disk_grid;
+    private Gtk.Box disk_box;
     private Gtk.Stack load_stack;
 
     public DiskView () {
@@ -38,9 +38,9 @@ public class Installer.DiskView : AbstractInstallerView {
         };
 
         var image_overlay = new Gtk.Overlay () {
-            valign = Gtk.Align.END
+            child = install_image,
+            valign = END
         };
-        image_overlay.add (install_image);
         image_overlay.add_overlay (install_badge);
 
         var install_label = new Gtk.Label (_("Select a Drive")) {
@@ -56,16 +56,13 @@ public class Installer.DiskView : AbstractInstallerView {
             xalign = 0
         };
 
-        disk_grid = new Gtk.Grid () {
-            orientation = Gtk.Orientation.VERTICAL,
-            row_spacing = 6
-        };
+        disk_box = new Gtk.Box (VERTICAL, 6);
 
         var disk_scrolled = new Gtk.ScrolledWindow (null, null) {
+            child = disk_box,
             hscrollbar_policy = Gtk.PolicyType.NEVER,
             propagate_natural_height = true
         };
-        disk_scrolled.add (disk_grid);
 
         var load_spinner = new Gtk.Spinner () {
             halign = Gtk.Align.CENTER,
@@ -79,19 +76,17 @@ public class Installer.DiskView : AbstractInstallerView {
         };
         load_label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
 
-        var load_grid = new Gtk.Grid () {
-            halign = Gtk.Align.CENTER,
-            valign = Gtk.Align.CENTER,
-            orientation = Gtk.Orientation.VERTICAL,
-            row_spacing = 12
+        var load_box = new Gtk.Box (VERTICAL, 12) {
+            halign = CENTER,
+            valign = CENTER
         };
-        load_grid.add (load_spinner);
-        load_grid.add (load_label);
+        load_box.add (load_spinner);
+        load_box.add (load_label);
 
         load_stack = new Gtk.Stack () {
             transition_type = Gtk.StackTransitionType.CROSSFADE
         };
-        load_stack.add (load_grid);
+        load_stack.add (load_box);
         load_stack.add_named (disk_scrolled, "disk");
 
         var title_grid = new Gtk.Grid () {
@@ -180,15 +175,15 @@ public class Installer.DiskView : AbstractInstallerView {
 
         foreach (DiskButton disk_button in enabled_buttons) {
             disk_button.group = no_selection;
-            disk_grid.add (disk_button);
+            disk_box.add (disk_button);
         }
 
         foreach (DiskButton disk_button in disabled_buttons) {
             disk_button.group = no_selection;
-            disk_grid.add (disk_button);
+            disk_box.add (disk_button);
         }
 
-        disk_grid.show_all ();
+        disk_box.show_all ();
         load_stack.set_visible_child_name ("disk");
     }
 }
diff --git a/src/Views/EncryptView.vala b/src/Views/EncryptView.vala
index 77b87e88c..83e30952f 100644
--- a/src/Views/EncryptView.vala
+++ b/src/Views/EncryptView.vala
@@ -41,11 +41,11 @@ public class EncryptView : AbstractInstallerView {
         };
 
         var overlay = new Gtk.Overlay () {
-            halign = Gtk.Align.CENTER,
-            valign = Gtk.Align.END,
+            child = image,
+            halign = CENTER,
+            valign = END,
             width_request = 60
         };
-        overlay.add (image);
         overlay.add_overlay (overlay_image);
 
         var title_label = new Gtk.Label (_("Enable Drive Encryption")) {
@@ -135,18 +135,15 @@ public class EncryptView : AbstractInstallerView {
         confirm_entry_revealer = new ErrorRevealer (".");
         confirm_entry_revealer.label_widget.get_style_context ().add_class (Gtk.STYLE_CLASS_ERROR);
 
-        var password_grid = new Gtk.Grid () {
-            orientation = Gtk.Orientation.VERTICAL,
-            row_spacing = 3
-        };
-        password_grid.add (description);
-        password_grid.add (pw_label);
-        password_grid.add (pw_entry);
-        password_grid.add (pw_levelbar);
-        password_grid.add (pw_error_revealer);
-        password_grid.add (confirm_label);
-        password_grid.add (confirm_entry);
-        password_grid.add (confirm_entry_revealer);
+        var password_box = new Gtk.Box (VERTICAL, 3);
+        password_box.add (description);
+        password_box.add (pw_label);
+        password_box.add (pw_entry);
+        password_box.add (pw_levelbar);
+        password_box.add (pw_error_revealer);
+        password_box.add (confirm_label);
+        password_box.add (confirm_entry);
+        password_box.add (confirm_entry_revealer);
 
         var stack = new Gtk.Stack () {
             vhomogeneous = false,
@@ -155,7 +152,7 @@ public class EncryptView : AbstractInstallerView {
             vexpand = true
         };
         stack.add (choice_grid);
-        stack.add (password_grid);
+        stack.add (password_box);
 
         content_area.column_homogeneous = true;
         content_area.margin_end = 12;
@@ -188,7 +185,7 @@ public class EncryptView : AbstractInstallerView {
         });
 
         encrypt_button.clicked.connect (() => {
-            stack.visible_child = password_grid;
+            stack.visible_child = password_box;
             next_button.label = _("Set Encryption Password");
             update_next_button ();
             back_button.show ();
@@ -198,7 +195,7 @@ public class EncryptView : AbstractInstallerView {
         });
 
         next_button.clicked.connect (() => {
-            if (stack.visible_child == password_grid) {
+            if (stack.visible_child == password_box) {
                 Configuration.get_default ().encryption_password = pw_entry.text;
             }
 
diff --git a/src/Views/ErrorView.vala b/src/Views/ErrorView.vala
index 76cd4a983..23990f8a1 100644
--- a/src/Views/ErrorView.vala
+++ b/src/Views/ErrorView.vala
@@ -87,8 +87,9 @@ public class ErrorView : AbstractInstallerView {
 
         var terminal_view = new Installer.Terminal (buffer);
 
-        var terminal_revealer = new Gtk.Revealer ();
-        terminal_revealer.add (terminal_view);
+        var terminal_revealer = new Gtk.Revealer () {
+            child = terminal_view
+        };
 
         var grid = new Gtk.Grid () {
             column_spacing = 6,
diff --git a/src/Views/KeyboardLayoutView.vala b/src/Views/KeyboardLayoutView.vala
index 8964989a7..81f7db05e 100644
--- a/src/Views/KeyboardLayoutView.vala
+++ b/src/Views/KeyboardLayoutView.vala
@@ -41,19 +41,16 @@ public class KeyboardLayoutView : AbstractInstallerView {
             secondary_icon_tooltip_text = _("Show keyboard layout")
         };
 
-        var stack_grid = new Gtk.Grid () {
-            orientation = Gtk.Orientation.VERTICAL,
-            row_spacing = 12
-        };
-        stack_grid.add (input_variant_widget);
-        stack_grid.add (keyboard_test_entry);
+        var stack_box = new Gtk.Box (VERTICAL, 12);
+        stack_box.add (input_variant_widget);
+        stack_box.add (keyboard_test_entry);
 
         content_area.column_homogeneous = true;
         content_area.margin_end = 12;
         content_area.margin_start = 12;
         content_area.attach (image, 0, 0);
         content_area.attach (title_label, 0, 1);
-        content_area.attach (stack_grid, 1, 0, 1, 2);
+        content_area.attach (stack_box, 1, 0, 1, 2);
 
         var back_button = new Gtk.Button.with_label (_("Back"));
 
@@ -223,7 +220,10 @@ public class KeyboardLayoutView : AbstractInstallerView {
 
             var label = new Gtk.Label (layout_description) {
                 ellipsize = Pango.EllipsizeMode.END,
-                margin = 6,
+                margin_top = 6,
+                margin_end = 6,
+                margin_bottom = 6,
+                margin_start = 6,
                 xalign = 0
             };
             label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
@@ -247,7 +247,10 @@ public class KeyboardLayoutView : AbstractInstallerView {
         construct {
             var label = new Gtk.Label (description) {
                 ellipsize = Pango.EllipsizeMode.END,
-                margin = 6,
+                margin_top = 6,
+                margin_end = 6,
+                margin_bottom = 6,
+                margin_start = 6,
                 xalign = 0
             };
             label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
diff --git a/src/Views/LanguageView.vala b/src/Views/LanguageView.vala
index 3015da143..535a44126 100644
--- a/src/Views/LanguageView.vala
+++ b/src/Views/LanguageView.vala
@@ -87,11 +87,13 @@ public class Installer.LanguageView : AbstractInstallerView {
             row.set_header (null);
             if (!((LangRow)row).preferred_row) {
                 if (before != null && ((LangRow)before).preferred_row) {
-                    var separator = new Gtk.Separator (Gtk.Orientation.HORIZONTAL);
+                    var separator = new Gtk.Separator (HORIZONTAL) {
+                        margin_top = 3,
+                        margin_end = 6,
+                        margin_bottom = 3,
+                        margin_start = 6
+                    };
                     separator.show_all ();
-                    separator.margin = 3;
-                    separator.margin_end = 6;
-                    separator.margin_start = 6;
                     row.set_header (separator);
                 }
             }
@@ -324,13 +326,16 @@ public class Installer.LanguageView : AbstractInstallerView {
             };
             label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
 
-            var grid = new Gtk.Grid ();
-            grid.column_spacing = 6;
-            grid.margin = 6;
-            grid.add (label);
-            grid.add (image);
+            var box = new Gtk.Box (HORIZONTAL, 6) {
+                margin_top = 6,
+                margin_end = 6,
+                margin_bottom = 6,
+                margin_start = 6
+            };
+            box.add (label);
+            box.add (image);
 
-            add (grid);
+            child = box;
         }
     }
 
@@ -363,16 +368,19 @@ public class Installer.LanguageView : AbstractInstallerView {
             image.icon_size = Gtk.IconSize.BUTTON;
 
             var label = new Gtk.Label (country_entry.name);
-            label.get_style_context ().add_class ("h3");
+            label.get_style_context ().add_class (Granite.STYLE_CLASS_H3_LABEL);
             label.xalign = 0;
 
-            var grid = new Gtk.Grid ();
-            grid.column_spacing = 6;
-            grid.margin = 6;
-            grid.add (label);
-            grid.add (image);
+            var box = new Gtk.Box (HORIZONTAL, 6) {
+                margin_top = 6,
+                margin_end = 6,
+                margin_bottom = 6,
+                margin_start = 6
+            };
+            box.add (label);
+            box.add (image);
 
-            add (grid);
+            child = box;
         }
     }
 }
diff --git a/src/Views/PartitioningView.vala b/src/Views/PartitioningView.vala
index 0bd242430..a36309e78 100644
--- a/src/Views/PartitioningView.vala
+++ b/src/Views/PartitioningView.vala
@@ -95,21 +95,24 @@ public class Installer.PartitioningView : AbstractInstallerView {
         var load_label = new Gtk.Label (_("Getting the current configuration…"));
         load_label.get_style_context ().add_class (Granite.STYLE_CLASS_H2_LABEL);
 
-        var load_grid = new Gtk.Grid ();
-        load_grid.row_spacing = 12;
-        load_grid.expand = true;
-        load_grid.orientation = Gtk.Orientation.VERTICAL;
-        load_grid.valign = Gtk.Align.CENTER;
-        load_grid.halign = Gtk.Align.CENTER;
-        load_grid.add (load_spinner);
-        load_grid.add (load_label);
+        var load_box = new Gtk.Box (VERTICAL, 12) {
+            hexpand = true,
+            vexpand = true,
+            valign = CENTER,
+            halign = CENTER
+        };
+        load_box.add (load_spinner);
+        load_box.add (load_label);
 
         load_stack = new Gtk.Stack ();
         load_stack.transition_type = Gtk.StackTransitionType.CROSSFADE;
-        load_stack.add_named (load_grid, "loading");
+        load_stack.add_named (load_box, "loading");
         load_stack.add_named (disk_scroller, "disk");
 
-        content_area.margin = 12;
+        content_area.margin_top = 12;
+        content_area.margin_end = 12;
+        content_area.margin_bottom = 12;
+        content_area.margin_start = 12;
         content_area.attach (description, 0, 0);
         content_area.attach (load_stack, 0, 1);
 
diff --git a/src/Views/ProgressView.vala b/src/Views/ProgressView.vala
index d0e7f105f..313f07909 100644
--- a/src/Views/ProgressView.vala
+++ b/src/Views/ProgressView.vala
@@ -37,7 +37,10 @@ public class ProgressView : AbstractInstallerView {
             // In case the wallpaper can't be loaded, we don't want an icon or text
             icon_name = "invalid-icon-name",
             // We need this for the shadow to not get clipped by Gtk.Overlay
-            margin = 6
+            margin_top = 6,
+            margin_end = 6,
+            margin_bottom = 6,
+            margin_start = 6
         };
         logo.loadable_icon = new FileIcon (File.new_for_uri ("resource://io/elementary/installer/wallpaper.jpg"));
         logo.get_style_context ().add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
@@ -52,10 +55,10 @@ public class ProgressView : AbstractInstallerView {
         icon_style_context.add_provider (style_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
 
         var logo_overlay = new Gtk.Overlay () {
-            halign = Gtk.Align.CENTER,
-            valign = Gtk.Align.CENTER
+            child = logo,
+            halign = CENTER,
+            valign = CENTER
         };
-        logo_overlay.add (logo);
         logo_overlay.add_overlay (icon);
 
         unowned LogHelper log_helper = LogHelper.get_default ();
diff --git a/src/Views/TryInstallView.vala b/src/Views/TryInstallView.vala
index 83ac832f7..2215931a2 100644
--- a/src/Views/TryInstallView.vala
+++ b/src/Views/TryInstallView.vala
@@ -59,21 +59,19 @@ public class Installer.TryInstallView : AbstractInstallerView {
             group = no_selection
         };
 
-        var type_grid = new Gtk.Grid () {
-            orientation = Gtk.Orientation.VERTICAL,
-            row_spacing = 6,
-            valign = Gtk.Align.CENTER
+        var type_box = new Gtk.Box (VERTICAL, 6) {
+            valign = CENTER
         };
-        type_grid.add (demo_button);
-        type_grid.add (clean_install_button);
-        type_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-        type_grid.add (custom_button);
+        type_box.add (demo_button);
+        type_box.add (clean_install_button);
+        type_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
+        type_box.add (custom_button);
 
         var type_scrolled = new Gtk.ScrolledWindow (null, null) {
-            hscrollbar_policy = Gtk.PolicyType.NEVER,
+            child = type_box,
+            hscrollbar_policy = NEVER,
             propagate_natural_height = true
         };
-        type_scrolled.add (type_grid);
 
         content_area.column_homogeneous = true;
         content_area.margin_end = 12;
diff --git a/src/Widgets/DecryptMenu.vala b/src/Widgets/DecryptMenu.vala
index f1c1d1d0d..1d0cccf53 100644
--- a/src/Widgets/DecryptMenu.vala
+++ b/src/Widgets/DecryptMenu.vala
@@ -33,8 +33,12 @@ public class Installer.DecryptMenu: Gtk.Popover {
     public DecryptMenu (string device_path) {
         this.device_path = device_path;
 
-        stack = new Gtk.Stack ();
-        stack.margin = 12;
+        stack = new Gtk.Stack () {
+            margin_top = 12,
+            margin_end = 12,
+            margin_bottom = 12,
+            margin_start = 12
+        };
         create_decrypt_view ();
         add (stack);
         stack.show_all ();
@@ -48,11 +52,12 @@ public class Installer.DecryptMenu: Gtk.Popover {
         overlay_image.halign = Gtk.Align.END;
         overlay_image.valign = Gtk.Align.END;
 
-        var overlay = new Gtk.Overlay ();
-        overlay.halign = Gtk.Align.CENTER;
-        overlay.valign = Gtk.Align.END;
-        overlay.width_request = 60;
-        overlay.add (image);
+        var overlay = new Gtk.Overlay () {
+            child = image,
+            halign = CENTER,
+            valign = END,
+            width_request = 60
+        };
         overlay.add_overlay (overlay_image);
 
         var primary_label = new Gtk.Label (_("Decrypt This Partition"));
diff --git a/src/Widgets/DiskBar.vala b/src/Widgets/DiskBar.vala
index e49c97102..ef43a29ba 100644
--- a/src/Widgets/DiskBar.vala
+++ b/src/Widgets/DiskBar.vala
@@ -102,7 +102,8 @@ public class Installer.DiskBar: Gtk.Grid {
             add_legend ("unused", unused, "unused", null, null);
 
             var unused_bar = new Block () {
-                expand = true
+                hexpand = true,
+                vexpand = true
             };
             unused_bar.get_style_context ().add_class ("unused");
 
diff --git a/src/Widgets/DiskGrid.vala b/src/Widgets/DiskGrid.vala
index f7eeb2097..6a377be03 100644
--- a/src/Widgets/DiskGrid.vala
+++ b/src/Widgets/DiskGrid.vala
@@ -55,9 +55,8 @@ public class Installer.DiskButton : Gtk.RadioButton {
         var grid = new Gtk.Grid () {
             column_spacing = 3,
             row_spacing = 6,
-            margin = 3,
-            margin_bottom = 0,
-            margin_top = 0,
+            margin_end = 3,
+            margin_start = 3,
             hexpand = true
         };
         grid.attach (disk_image, 0, 0, 1, 2);
diff --git a/src/Widgets/InstallTypeGrid.vala b/src/Widgets/InstallTypeGrid.vala
index b63445730..0a7e50b41 100644
--- a/src/Widgets/InstallTypeGrid.vala
+++ b/src/Widgets/InstallTypeGrid.vala
@@ -50,7 +50,10 @@ public class Installer.InstallTypeButton : Gtk.RadioButton {
         var grid = new Gtk.Grid () {
             column_spacing = 3,
             row_spacing = 6,
-            margin = 3
+            margin_top = 3,
+            margin_end = 3,
+            margin_bottom = 3,
+            margin_start = 3
         };
         grid.attach (image, 0, 0, 1, 2);
         grid.attach (title_label, 1, 0);
diff --git a/src/Widgets/PartitionMenu.vala b/src/Widgets/PartitionMenu.vala
index bb8c97e7c..18654f18d 100644
--- a/src/Widgets/PartitionMenu.vala
+++ b/src/Widgets/PartitionMenu.vala
@@ -107,8 +107,10 @@ public class Installer.PartitionMenu : Gtk.Popover {
         var bottom_controls = new Gtk.Grid () {
             column_spacing = 12,
             row_spacing = 6,
-            margin = 12,
-            margin_bottom = 9
+            margin_top = 12,
+            margin_end = 12,
+            margin_bottom = 9,
+            margin_start = 12
         };
         bottom_controls.attach (use_as_label, 0, 2);
         bottom_controls.attach (use_as, 1, 2);
@@ -124,8 +126,9 @@ public class Installer.PartitionMenu : Gtk.Popover {
         bottom_grid.attach (separator, 0, 1);
         bottom_grid.attach (bottom_controls, 0, 2);
 
-        var bottom_revealer = new Gtk.Revealer ();
-        bottom_revealer.add (bottom_grid);
+        var bottom_revealer = new Gtk.Revealer () {
+            child = bottom_grid
+        };
 
         var grid = new Gtk.Grid () {
             margin_top = 3,
diff --git a/src/Widgets/Terminal.vala b/src/Widgets/Terminal.vala
index bae333e27..d27e5fd7e 100644
--- a/src/Widgets/Terminal.vala
+++ b/src/Widgets/Terminal.vala
@@ -47,7 +47,8 @@ public class Installer.Terminal : Gtk.ScrolledWindow {
         view.get_style_context ().remove_class (Gtk.STYLE_CLASS_VIEW);
 
         hscrollbar_policy = Gtk.PolicyType.NEVER;
-        expand = true;
+        hexpand = true;
+        vexpand = true;
         min_content_height = 120;
         add (view);
         get_style_context ().add_class (Granite.STYLE_CLASS_TERMINAL);
diff --git a/src/Widgets/VariantWidget.vala b/src/Widgets/VariantWidget.vala
index baff79994..c48884f6a 100644
--- a/src/Widgets/VariantWidget.vala
+++ b/src/Widgets/VariantWidget.vala
@@ -22,28 +22,34 @@ public class VariantWidget : Gtk.Frame {
     public signal void going_to_main ();
 
     private Gtk.Button back_button;
-    private Gtk.Grid variant_grid;
+    private Gtk.Box variant_box;
     private Gtk.Label variant_title;
     private Hdy.Deck deck;
 
     construct {
         main_listbox = new Gtk.ListBox ();
 
-        var main_scrolled = new Gtk.ScrolledWindow (null, null);
-        main_scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        main_scrolled.add (main_listbox);
+        var main_scrolled = new Gtk.ScrolledWindow (null, null) {
+            child = main_listbox,
+            hscrollbar_policy = NEVER
+        };
 
         variant_listbox = new Gtk.ListBox ();
         variant_listbox.activate_on_single_click = false;
 
-        var variant_scrolled = new Gtk.ScrolledWindow (null, null);
-        variant_scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        variant_scrolled.vexpand = true;
-        variant_scrolled.add (variant_listbox);
+        var variant_scrolled = new Gtk.ScrolledWindow (null, null) {
+            child = variant_listbox,
+            hscrollbar_policy = NEVER,
+            vexpand = true
+        };
 
-        back_button = new Gtk.Button ();
-        back_button.halign = Gtk.Align.START;
-        back_button.margin = 6;
+        back_button = new Gtk.Button () {
+            halign = START,
+            margin_top = 6,
+            margin_end = 6,
+            margin_bottom = 6,
+            margin_start = 6
+        };
         back_button.get_style_context ().add_class (Granite.STYLE_CLASS_BACK_BUTTON);
 
         variant_title = new Gtk.Label (null);
@@ -56,18 +62,17 @@ public class VariantWidget : Gtk.Frame {
         header_box.add (back_button);
         header_box.set_center_widget (variant_title);
 
-        variant_grid = new Gtk.Grid ();
-        variant_grid.orientation = Gtk.Orientation.VERTICAL;
-        variant_grid.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
-        variant_grid.add (header_box);
-        variant_grid.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
-        variant_grid.add (variant_scrolled);
+        variant_box = new Gtk.Box (VERTICAL, 0);
+        variant_box.get_style_context ().add_class (Gtk.STYLE_CLASS_VIEW);
+        variant_box.add (header_box);
+        variant_box.add (new Gtk.Separator (Gtk.Orientation.HORIZONTAL));
+        variant_box.add (variant_scrolled);
 
         deck = new Hdy.Deck () {
             can_swipe_back = true
         };
         deck.add (main_scrolled);
-        deck.add (variant_grid);
+        deck.add (variant_box);
 
         add (deck);
 
@@ -80,7 +85,7 @@ public class VariantWidget : Gtk.Frame {
     public void show_variants (string back_button_label, string variant_title_label) {
         back_button.label = back_button_label;
         variant_title.label = variant_title_label;
-        deck.visible_child = variant_grid;
+        deck.visible_child = variant_box;
     }
 
     public void clear_variants () {