diff --git a/src/bedsidemon/gui.cpp b/src/bedsidemon/gui.cpp
index ee8a060..da17c4f 100644
--- a/src/bedsidemon/gui.cpp
+++ b/src/bedsidemon/gui.cpp
@@ -22,10 +22,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "gui.hpp"
 
 #include <ruis/widget/button/push_button.hpp>
-#include <ruis/widget/group/margins.hpp>
 #include <ruis/widget/group/overlay.hpp>
 #include <ruis/widget/label/gap.hpp>
 #include <ruis/widget/label/image.hpp>
+#include <ruis/widget/label/margins.hpp>
 #include <ruis/widget/label/rectangle.hpp>
 #include <ruis/widget/label/text.hpp>
 
diff --git a/src/bedsidemon/menu.cpp b/src/bedsidemon/menu.cpp
index 63b9ddd..885bdc0 100644
--- a/src/bedsidemon/menu.cpp
+++ b/src/bedsidemon/menu.cpp
@@ -21,8 +21,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include "menu.hpp"
 
-#include <ruis/widget/group/margins.hpp>
 #include <ruis/widget/label/gap.hpp>
+#include <ruis/widget/label/margins.hpp>
 #include <ruis/widget/label/text.hpp>
 
 #include "application.hpp"
diff --git a/src/bedsidemon/quit_dialog.cpp b/src/bedsidemon/quit_dialog.cpp
index d74bf22..625cded 100644
--- a/src/bedsidemon/quit_dialog.cpp
+++ b/src/bedsidemon/quit_dialog.cpp
@@ -77,7 +77,7 @@ std::vector<utki::shared_ref<ruis::widget>> make_root_widget_structure(utki::sha
         m::gap(c,
             {
                 .layout_params{
-                    .dims = {0_px, dimension_gap}
+                    .dims = {1_px, dimension_gap}
                 }
             }
         ),
@@ -88,7 +88,7 @@ std::vector<utki::shared_ref<ruis::widget>> make_root_widget_structure(utki::sha
                 m::gap(c,
                     {
                         .layout_params{
-                            .dims = {dimension_gap, 0_px}
+                            .dims = {dimension_gap, 1_px}
                         }
                     }
                 ),
@@ -98,7 +98,7 @@ std::vector<utki::shared_ref<ruis::widget>> make_root_widget_structure(utki::sha
         m::gap(c,
             {
                 .layout_params{
-                    .dims = {0_px, dimension_gap}
+                    .dims = {1_px, dimension_gap}
                 }
             }
         )
@@ -111,7 +111,7 @@ quit_dialog::quit_dialog(utki::shared_ref<ruis::context> context) :
 	ruis::widget(
 		std::move(context), //
 		{
-			.dims{ruis::dim::max, ruis::dim::max}
+			.dims{ruis::dim::fill, ruis::dim::fill}
 },
 		{}
 	),
diff --git a/src/bedsidemon/rectangle_button.hpp b/src/bedsidemon/rectangle_button.hpp
index a9c18e1..bb204c7 100644
--- a/src/bedsidemon/rectangle_button.hpp
+++ b/src/bedsidemon/rectangle_button.hpp
@@ -22,7 +22,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #pragma once
 
 #include <ruis/widget/button/base/button.hpp>
-#include <ruis/widget/group/margins.hpp> // TODO: should be moved into rectangle
+#include <ruis/widget/label/margins.hpp> // TODO: should be moved into rectangle
 #include <ruis/widget/label/rectangle.hpp>
 
 namespace ruis {
diff --git a/src/bedsidemon/settings_menu.cpp b/src/bedsidemon/settings_menu.cpp
index aa6d5b5..1a9ec09 100644
--- a/src/bedsidemon/settings_menu.cpp
+++ b/src/bedsidemon/settings_menu.cpp
@@ -25,8 +25,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <ratio>
 
 #include <ruis/widget/button/selection_box.hpp>
-#include <ruis/widget/group/margins.hpp>
 #include <ruis/widget/label/gap.hpp>
+#include <ruis/widget/label/margins.hpp>
 #include <ruis/widget/label/text.hpp>
 
 #include "application.hpp"
diff --git a/src/bedsidemon/spo2/spo2_parameter_window.cpp b/src/bedsidemon/spo2/spo2_parameter_window.cpp
index eabe33a..8caf72a 100644
--- a/src/bedsidemon/spo2/spo2_parameter_window.cpp
+++ b/src/bedsidemon/spo2/spo2_parameter_window.cpp
@@ -25,8 +25,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <vector>
 
 #include <ruis/layout/layout.hpp>
-#include <ruis/widget/group/margins.hpp>
 #include <ruis/widget/label/image.hpp>
+#include <ruis/widget/label/margins.hpp>
 #include <ruis/widget/label/rectangle.hpp>
 #include <ruis/widget/proxy/click_proxy.hpp>
 
diff --git a/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp b/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp
index 87d8a53..567b2c8 100644
--- a/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp
+++ b/src/bedsidemon/spo2/spo2_parameter_window_menu.cpp
@@ -22,8 +22,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include "spo2_parameter_window_menu.hpp"
 
 #include <ruis/widget/button/selection_box.hpp>
-#include <ruis/widget/group/margins.hpp>
 #include <ruis/widget/label/gap.hpp>
+#include <ruis/widget/label/margins.hpp>
 #include <ruis/widget/label/rectangle.hpp>
 
 #include "../style.hpp"