diff --git a/src/main.cpp b/src/main.cpp
index 0f3fa1c..b6aada4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,7 +20,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 /* ================ LICENSE END ================ */
 
 #include <clargs/parser.hpp>
-#include <ruis/layout.hpp>
+#include <ruis/layouts/layout.hpp>
 #include <ruisapp/application.hpp>
 
 #include "spo2/contec_cms50d_plus.hpp"
diff --git a/src/spo2/spo2_parameter_window.cpp b/src/spo2/spo2_parameter_window.cpp
index ba5d6a2..15e19ec 100644
--- a/src/spo2/spo2_parameter_window.cpp
+++ b/src/spo2/spo2_parameter_window.cpp
@@ -24,7 +24,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <ratio>
 #include <vector>
 
-#include <ruis/layout.hpp>
+#include <ruis/layouts/layout.hpp>
 #include <ruis/widgets/label/rectangle.hpp>
 
 using namespace std::string_literals;
@@ -61,7 +61,7 @@ std::vector<utki::shared_ref<ruis::widget>> build_layout(utki::shared_ref<ruis::
                 .widget_params = {
                     .id = "pw_waveform"s,
                     .lp = {
-                        .dims = {0, ruis::lp::fill},
+                        .dims = {lp::fill, lp::fill},
                         .weight = 3
                     }
                 },
@@ -74,7 +74,7 @@ std::vector<utki::shared_ref<ruis::widget>> build_layout(utki::shared_ref<ruis::
             {
                 .widget_params = {
                     .lp = {
-                        .dims = {c.get().units.pp_to_px(1), ruis::lp::fill}
+                        .dims = {c.get().units.pp_to_px(1), lp::fill}
                     }
                 },
                 .color_params = {
@@ -86,7 +86,7 @@ std::vector<utki::shared_ref<ruis::widget>> build_layout(utki::shared_ref<ruis::
             {
                 .widget_params = {
                     .lp = {
-                        .dims = {0, lp::min},
+                        .dims = {lp::fill, lp::min},
                         .weight = 1
                     }
                 },
@@ -158,18 +158,19 @@ spo2_parameter_window::spo2_parameter_window(utki::shared_ref<ruis::context> con
 	ruis::widget( //
 		std::move(context),
 		{//
-		 .lp =
-			 {//
-			  .dims = {ruis::lp::fill, ruis::lp::min}
-			 }
+		 .widget_params =
+			 {.lp =
+				  {//
+				   .dims = {ruis::lp::fill, ruis::lp::min}
+				  }}
 		}
 	),
 	ruis::container( //
 		this->context,
-		{},
-		{//
-		 .layout = ruis::layout::row
-		},
+		{.container_params =
+			 {//
+			  .layout = ruis::layout::row
+			 }},
 		build_layout(this->context)
 	),
 	spo2_value(this->get_widget_as<ruis::text>("spo2_value")),
diff --git a/src/spo2/spo2_parameter_window.hpp b/src/spo2/spo2_parameter_window.hpp
index aad0d70..0c4e310 100644
--- a/src/spo2/spo2_parameter_window.hpp
+++ b/src/spo2/spo2_parameter_window.hpp
@@ -21,8 +21,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <ruis/widget.hpp>
 #include <ruis/widgets/label/text.hpp>
+#include <ruis/widgets/widget.hpp>
 
 #include "../waveform.hpp"
 
diff --git a/src/waveform.cpp b/src/waveform.cpp
index 1e47389..f294471 100644
--- a/src/waveform.cpp
+++ b/src/waveform.cpp
@@ -29,19 +29,18 @@ namespace {
 constexpr auto default_max_value = 100;
 } // namespace
 
-waveform::waveform(
-	utki::shared_ref<ruis::context> context,
-	ruis::widget::parameters widget_params,
-	ruis::color_widget::parameters color_params
-) :
-	ruis::widget(std::move(context), std::move(widget_params)),
-	ruis::color_widget(this->context, std::move(color_params)),
-	paths{
-		{//
-		 {.vao{this->context.get().renderer}},
-		 {.vao{this->context.get().renderer}}
-		}
-},
+waveform::waveform(utki::shared_ref<ruis::context> context, all_parameters params) :
+	ruis::widget(
+		std::move(context),
+		{
+			.widget_params = std::move(params.widget_params)
+}
+	),
+	ruis::color_widget(this->context, std::move(params.color_params)),
+	paths{{//
+		   {.vao{this->context.get().renderer}},
+		   {.vao{this->context.get().renderer}}
+	}},
 	value_max(default_max_value)
 {
 	constexpr auto default_sweep_speed_mm_per_sec = 100;
diff --git a/src/waveform.hpp b/src/waveform.hpp
index 96e7ce2..9bbe82e 100644
--- a/src/waveform.hpp
+++ b/src/waveform.hpp
@@ -24,8 +24,8 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <deque>
 
 #include <ruis/paint/path_vao.hpp>
-#include <ruis/widget.hpp>
 #include <ruis/widgets/base/color_widget.hpp>
+#include <ruis/widgets/widget.hpp>
 
 namespace bedsidemon {
 
@@ -50,11 +50,12 @@ class waveform :
 	ruis::real gap_px;
 
 public:
-	waveform(
-		utki::shared_ref<ruis::context> context,
-		ruis::widget::parameters widget_params,
-		ruis::color_widget::parameters color_params
-	);
+	struct all_parameters {
+		ruis::widget::parameters widget_params;
+		ruis::color_widget::parameters color_params;
+	};
+
+	waveform(utki::shared_ref<ruis::context> context, all_parameters params);
 
 	void render(const ruis::matrix4& matrix) const override;
 
@@ -68,21 +69,12 @@ class waveform :
 
 namespace make {
 
-struct waveform_parameters {
-	ruis::widget::parameters widget_params;
-	ruis::color_widget::parameters color_params;
-};
-
 inline utki::shared_ref<ruis::widget> waveform( //
 	utki::shared_ref<ruis::context> context,
-	waveform_parameters params
+	waveform::all_parameters params
 )
 {
-	return utki::make_shared<bedsidemon::waveform>(
-		std::move(context),
-		std::move(params.widget_params),
-		std::move(params.color_params)
-	);
+	return utki::make_shared<bedsidemon::waveform>(std::move(context), std::move(params));
 }
 } // namespace make