diff --git a/dash-frontend/src/tab/monado.rs b/dash-frontend/src/tab/monado.rs
index c9a74734..14407744 100644
--- a/dash-frontend/src/tab/monado.rs
+++ b/dash-frontend/src/tab/monado.rs
@@ -302,8 +302,7 @@ impl SubtabGeneralSettings {
 		let slider_keying_value_range = state.fetch_component_as::<ComponentSlider>("slider_keying_value_range")?;
 
 		{
-			let mut lc = frontend.layout.start_common();
-			let mut common = lc.common();
+			let mut common = frontend.layout.common();
 
 			// set initial values
 			let (rgb, range_h, range_s, range_v) = config.chroma_key_params.get_rgb_and_hsv_ranges();
@@ -338,8 +337,6 @@ impl SubtabGeneralSettings {
 			slider_keying_saturation_range.on_value_changed(get_slider_callback(&tasks));
 			slider_keying_value_range.on_value_changed(get_slider_callback(&tasks));
 			cs_keying.on_changed(get_color_selector_callback(&tasks));
-
-			lc.finish()?;
 		}
 
 		Ok(Self {
diff --git a/wgui/src/components/bar_graph.rs b/wgui/src/components/bar_graph.rs
index 37026997..6e3df392 100644
--- a/wgui/src/components/bar_graph.rs
+++ b/wgui/src/components/bar_graph.rs
@@ -70,11 +70,7 @@ impl ComponentTrait for ComponentBarGraph {
 
 	fn refresh(&self, data: &mut RefreshData) {
 		let state = self.state.borrow();
-
-		// FIXME: refactor this after merging feat-skybox-catalog branch
-		let mut lc = data.layout.start_common();
-		self.update_limits_text(&state, &mut lc.common());
-		let _ = lc.finish();
+		self.update_limits_text(&state, &mut data.layout.common());
 	}
 }
 
diff --git a/wgui/src/components/button.rs b/wgui/src/components/button.rs
index e498d736..ab2bfda8 100644
--- a/wgui/src/components/button.rs
+++ b/wgui/src/components/button.rs
@@ -123,21 +123,16 @@ impl ComponentTrait for ComponentButton {
 	fn refresh(&self, data: &mut RefreshData) {
 		let mut state = self.state.borrow_mut();
 
-		// FIXME: refactor this after merging feat-skybox-catalog branch
-		let mut lc = data.layout.start_common();
-
 		if state.active_tooltip.is_some() {
-			let common = lc.common();
-			if let Some(node_id) = common.state.nodes.get(self.base.get_id()) {
-				if !widget::is_node_visible(&common.state.tree, *node_id) {
+			let l_state = &data.layout.state;
+			if let Some(node_id) = l_state.nodes.get(self.base.get_id()) {
+				if !widget::is_node_visible(&l_state.tree, *node_id) {
 					state.active_tooltip = None; // destroy the tooltip, this button is now hidden
 				}
 			} else {
 				debug_assert!(false);
 			}
 		}
-
-		let _ = lc.finish();
 	}
 }
 
diff --git a/wgui/src/components/color_selector.rs b/wgui/src/components/color_selector.rs
index bbda2afe..935cf390 100644
--- a/wgui/src/components/color_selector.rs
+++ b/wgui/src/components/color_selector.rs
@@ -91,18 +91,12 @@ impl ComponentTrait for ComponentColorSelector {
 			}
 		}
 
-		// FIXME: refactor this after merging feat-skybox-catalog branch
-		let mut lc = data.layout.start_common();
-		let mut common = lc.common();
-
 		self.data.button.set_text(
-			&mut common,
+			&mut data.layout.common(),
 			Translation::from_raw_text_string(format!("{}", state.color.to_hex_rgb())),
 		);
 
-		self.data.button.set_color(&mut common, state.color);
-
-		let _ = lc.finish();
+		self.data.button.set_color(&mut data.layout.common(), state.color);
 	}
 }
 
@@ -169,12 +163,10 @@ impl ComponentColorSelector {
 		let slider_b = parser_state.fetch_component_as::<ComponentSlider>("slider_b")?;
 
 		{
-			let mut lc = layout.start_common();
-			let common = &mut lc.common();
-
-			slider_r.set_value(common, state.color.r * 255.0);
-			slider_g.set_value(common, state.color.g * 255.0);
-			slider_b.set_value(common, state.color.b * 255.0);
+			let mut common = layout.common();
+			slider_r.set_value(&mut common, state.color.r * 255.0);
+			slider_g.set_value(&mut common, state.color.g * 255.0);
+			slider_b.set_value(&mut common, state.color.b * 255.0);
 		}
 
 		slider_r.on_value_changed(self.gen_slider_callback(ColorIndex::Red));
diff --git a/wgui/src/components/editbox.rs b/wgui/src/components/editbox.rs
index 0b9032bf..c28650e6 100644
--- a/wgui/src/components/editbox.rs
+++ b/wgui/src/components/editbox.rs
@@ -147,15 +147,9 @@ impl ComponentTrait for ComponentEditBox {
 	}
 
 	fn refresh(&self, data: &mut RefreshData) {
-		// FIXME: refactor this after merging feat-skybox-catalog branch
-		let mut lc = data.layout.start_common();
-		let mut common = lc.common();
-
 		let mut state = self.state.borrow_mut();
-		let res = refresh_all(&mut common, &self.data, &mut state);
+		let res = refresh_all(&mut data.layout.common(), &self.data, &mut state);
 		debug_assert!(res.is_some());
-
-		let _ = lc.finish();
 	}
 
 	fn on_focus_change(&self, data: &mut FocusChangeData) {
diff --git a/wgui/src/components/slider.rs b/wgui/src/components/slider.rs
index 36ae9421..0814f329 100644
--- a/wgui/src/components/slider.rs
+++ b/wgui/src/components/slider.rs
@@ -111,13 +111,10 @@ pub struct ComponentSlider {
 
 impl ComponentTrait for ComponentSlider {
 	fn refresh(&self, data: &mut RefreshData) {
-		// FIXME: refactor this after merging feat-skybox-catalog branch
-		let mut lc = data.layout.start_common();
-		let mut common = lc.common();
+		let mut common = data.layout.common();
 		let mut state = self.state.borrow_mut();
 		let value = state.values.value;
 		state.set_value(&mut common, &self.data, value);
-		let _ = lc.finish();
 	}
 
 	fn base(&self) -> &ComponentBase {