diff --git a/editor/src/messages/frontend/frontend_message.rs b/editor/src/messages/frontend/frontend_message.rs
index 12f8ff9ad..aa7710c1c 100644
--- a/editor/src/messages/frontend/frontend_message.rs
+++ b/editor/src/messages/frontend/frontend_message.rs
@@ -1,7 +1,7 @@
 use super::utility_types::{FrontendDocumentDetails, FrontendImageData, MouseCursorIcon};
 use crate::messages::layout::utility_types::layout_widget::SubLayout;
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::menu_widgets::MenuColumn;
+use crate::messages::layout::utility_types::widgets::menu_widgets::MenuBarEntry;
 use crate::messages::portfolio::document::utility_types::layer_panel::{LayerPanelEntry, RawBuffer};
 use crate::messages::prelude::*;
 use crate::messages::tool::utility_types::HintData;
@@ -141,7 +141,7 @@ pub enum FrontendMessage {
 	UpdateMenuBarLayout {
 		#[serde(rename = "layoutTarget")]
 		layout_target: LayoutTarget,
-		layout: Vec<MenuColumn>,
+		layout: Vec<MenuBarEntry>,
 	},
 	UpdateMouseCursor {
 		cursor: MouseCursorIcon,
diff --git a/editor/src/messages/layout/layout_message_handler.rs b/editor/src/messages/layout/layout_message_handler.rs
index 83fff3602..adeae9d10 100644
--- a/editor/src/messages/layout/layout_message_handler.rs
+++ b/editor/src/messages/layout/layout_message_handler.rs
@@ -30,18 +30,31 @@ impl<F: Fn(&MessageDiscriminant) -> Vec<KeysGroup>> MessageHandler<LayoutMessage
 				self.send_layout(layout_target, responses, &action_input_mapping);
 			}
 			UpdateLayout { layout_target, widget_id, value } => {
-				let layout = &mut self.layouts[layout_target as usize];
-				let widget_holder = layout.iter_mut().find(|widget| widget.widget_id == widget_id);
-				if widget_holder.is_none() {
-					log::trace!(
-						"Could not find widget_id:{} on layout_target:{:?}. This could be an indication of a problem or just a user clicking off of an actively edited layer",
+				// Look up the layout
+				let layout = if let Some(layout) = self.layouts.get_mut(layout_target as usize) {
+					layout
+				} else {
+					log::warn!(
+						"UpdateLayout was called referencing an invalid layout. `widget_id: {}`, `layout_target: {:?}`",
 						widget_id,
 						layout_target
 					);
 					return;
-				}
+				};
+
+				let widget_holder = if let Some(widget_holder) = layout.iter_mut().find(|widget| widget.widget_id == widget_id) {
+					widget_holder
+				} else {
+					log::warn!(
+						"UpdateLayout was called referencing an invalid widget ID, although the layout target was valid. `widget_id: {}`, `layout_target: {:?}`",
+						widget_id,
+						layout_target
+					);
+					return;
+				};
+
 				#[remain::sorted]
-				match &mut widget_holder.unwrap().widget {
+				match &mut widget_holder.widget {
 					Widget::CheckboxInput(checkbox_input) => {
 						let update_value = value.as_bool().expect("CheckboxInput update was not of type: bool");
 						checkbox_input.checked = update_value;
diff --git a/editor/src/messages/layout/utility_types/widgets/menu_widgets.rs b/editor/src/messages/layout/utility_types/widgets/menu_widgets.rs
index 0c3cf28a2..eb7348170 100644
--- a/editor/src/messages/layout/utility_types/widgets/menu_widgets.rs
+++ b/editor/src/messages/layout/utility_types/widgets/menu_widgets.rs
@@ -9,9 +9,9 @@ use serde::{Deserialize, Serialize};
 use super::input_widgets::InvisibleStandinInput;
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Default)]
-pub struct MenuEntryGroups(pub Vec<Vec<MenuEntry>>);
+pub struct MenuBarEntryChildren(pub Vec<Vec<MenuBarEntry>>);
 
-impl MenuEntryGroups {
+impl MenuBarEntryChildren {
 	pub fn empty() -> Self {
 		Self(Vec::new())
 	}
@@ -31,15 +31,23 @@ impl MenuEntryGroups {
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
-pub struct MenuEntry {
+pub struct MenuBarEntry {
 	pub label: String,
 	pub icon: Option<String>,
-	pub children: MenuEntryGroups,
-	pub action: WidgetHolder,
 	pub shortcut: Option<ActionKeys>,
+	pub action: WidgetHolder,
+	pub children: MenuBarEntryChildren,
 }
 
-impl MenuEntry {
+impl MenuBarEntry {
+	pub fn new_root(label: String, children: MenuBarEntryChildren) -> Self {
+		Self {
+			label,
+			children,
+			..Default::default()
+		}
+	}
+
 	pub fn create_action(callback: impl Fn(&()) -> Message + 'static) -> WidgetHolder {
 		WidgetHolder::new(Widget::InvisibleStandinInput(InvisibleStandinInput {
 			on_update: WidgetCallback::new(callback),
@@ -47,54 +55,46 @@ impl MenuEntry {
 	}
 
 	pub fn no_action() -> WidgetHolder {
-		MenuEntry::create_action(|_| Message::NoOp)
+		MenuBarEntry::create_action(|_| Message::NoOp)
 	}
 }
 
-impl Default for MenuEntry {
+impl Default for MenuBarEntry {
 	fn default() -> Self {
 		Self {
-			action: MenuEntry::create_action(|_| DialogMessage::RequestComingSoonDialog { issue: None }.into()),
 			label: "".into(),
 			icon: None,
-			children: MenuEntryGroups::empty(),
 			shortcut: None,
+			action: MenuBarEntry::no_action(),
+			children: MenuBarEntryChildren::empty(),
 		}
 	}
 }
 
-#[derive(Debug, Default, Clone, Serialize, Deserialize, PartialEq)]
-pub struct MenuColumn {
-	pub label: String,
-	pub children: MenuEntryGroups,
-}
-
 #[derive(Debug, Default, Clone, PartialEq, Serialize, Deserialize)]
 pub struct MenuLayout {
-	pub layout: Vec<MenuColumn>,
+	pub layout: Vec<MenuBarEntry>,
 }
 
 impl MenuLayout {
-	pub fn new(layout: Vec<MenuColumn>) -> Self {
+	pub fn new(layout: Vec<MenuBarEntry>) -> Self {
 		Self { layout }
 	}
 
 	pub fn iter(&self) -> impl Iterator<Item = &WidgetHolder> + '_ {
-		MenuLayoutIter {
-			stack: self.layout.iter().flat_map(|column| column.children.0.iter()).flat_map(|group| group.iter()).collect(),
-		}
+		MenuLayoutIter { stack: self.layout.iter().collect() }
 	}
 
 	pub fn iter_mut(&mut self) -> impl Iterator<Item = &mut WidgetHolder> + '_ {
 		MenuLayoutIterMut {
-			stack: self.layout.iter_mut().flat_map(|column| column.children.0.iter_mut()).flat_map(|group| group.iter_mut()).collect(),
+			stack: self.layout.iter_mut().collect(),
 		}
 	}
 }
 
 #[derive(Debug, Default)]
 pub struct MenuLayoutIter<'a> {
-	pub stack: Vec<&'a MenuEntry>,
+	pub stack: Vec<&'a MenuBarEntry>,
 }
 
 impl<'a> Iterator for MenuLayoutIter<'a> {
@@ -114,7 +114,7 @@ impl<'a> Iterator for MenuLayoutIter<'a> {
 }
 
 pub struct MenuLayoutIterMut<'a> {
-	pub stack: Vec<&'a mut MenuEntry>,
+	pub stack: Vec<&'a mut MenuBarEntry>,
 }
 
 impl<'a> Iterator for MenuLayoutIterMut<'a> {
diff --git a/editor/src/messages/portfolio/document/utility_types/layer_panel.rs b/editor/src/messages/portfolio/document/utility_types/layer_panel.rs
index 05f2d4f3a..7195d90ff 100644
--- a/editor/src/messages/portfolio/document/utility_types/layer_panel.rs
+++ b/editor/src/messages/portfolio/document/utility_types/layer_panel.rs
@@ -47,6 +47,7 @@ impl LayerMetadata {
 #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 pub struct LayerPanelEntry {
 	pub name: String,
+	pub tooltip: String,
 	pub visible: bool,
 	#[serde(rename = "layerType")]
 	pub layer_type: LayerDataTypeDiscriminant,
@@ -59,9 +60,16 @@ pub struct LayerPanelEntry {
 impl LayerPanelEntry {
 	pub fn new(layer_metadata: &LayerMetadata, transform: DAffine2, layer: &Layer, path: Vec<LayerId>, font_cache: &FontCache) -> Self {
 		let name = layer.name.clone().unwrap_or_else(|| String::from(""));
+
+		let tooltip = if cfg!(debug_assertions) {
+			let joined = &path.iter().map(|id| id.to_string()).collect::<Vec<_>>().join(" / ");
+			name.clone() + "\nLayer Path: " + joined.as_str()
+		} else {
+			name.clone()
+		};
+
 		let arr = layer.data.bounding_box(transform, font_cache).unwrap_or([DVec2::ZERO, DVec2::ZERO]);
 		let arr = arr.iter().map(|x| (*x).into()).collect::<Vec<(f64, f64)>>();
-
 		let mut thumbnail = String::new();
 		let mut svg_defs = String::new();
 		let render_data = RenderData::new(ViewMode::Normal, font_cache, None, false);
@@ -84,6 +92,7 @@ impl LayerPanelEntry {
 
 		LayerPanelEntry {
 			name,
+			tooltip,
 			visible: layer.visible,
 			layer_type: (&layer.data).into(),
 			layer_metadata: *layer_metadata,
diff --git a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
index 041805320..60bf907f8 100644
--- a/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
+++ b/editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
@@ -1,7 +1,7 @@
 use crate::messages::input_mapper::utility_types::macros::action_keys;
 use crate::messages::layout::utility_types::layout_widget::{Layout, PropertyHolder};
 use crate::messages::layout::utility_types::misc::LayoutTarget;
-use crate::messages::layout::utility_types::widgets::menu_widgets::{MenuColumn, MenuEntry, MenuEntryGroups, MenuLayout};
+use crate::messages::layout::utility_types::widgets::menu_widgets::{MenuBarEntry, MenuBarEntryChildren, MenuLayout};
 use crate::messages::portfolio::document::utility_types::clipboards::Clipboard;
 use crate::messages::prelude::*;
 
@@ -27,295 +27,300 @@ impl MessageHandler<MenuBarMessage, ()> for MenuBarMessageHandler {
 impl PropertyHolder for MenuBarMessageHandler {
 	fn properties(&self) -> Layout {
 		Layout::MenuLayout(MenuLayout::new(vec![
-			MenuColumn {
-				label: "File".into(),
-				children: MenuEntryGroups(vec![
+			MenuBarEntry {
+				icon: Some("GraphiteLogo".into()),
+				action: MenuBarEntry::create_action(|_| FrontendMessage::TriggerVisitLink { url: "https://graphite.rs".into() }.into()),
+				..Default::default()
+			},
+			MenuBarEntry::new_root(
+				"File".into(),
+				MenuBarEntryChildren(vec![
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "New…".into(),
 							icon: Some("File".into()),
-							action: MenuEntry::create_action(|_| DialogMessage::RequestNewDocumentDialog.into()),
+							action: MenuBarEntry::create_action(|_| DialogMessage::RequestNewDocumentDialog.into()),
 							shortcut: action_keys!(DialogMessageDiscriminant::RequestNewDocumentDialog),
-							children: MenuEntryGroups::empty(),
+							children: MenuBarEntryChildren::empty(),
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Open…".into(),
 							shortcut: action_keys!(PortfolioMessageDiscriminant::OpenDocument),
-							action: MenuEntry::create_action(|_| PortfolioMessage::OpenDocument.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| PortfolioMessage::OpenDocument.into()),
+							..MenuBarEntry::default()
 						},
 					],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Close".into(),
 							shortcut: action_keys!(PortfolioMessageDiscriminant::CloseActiveDocumentWithConfirmation),
-							action: MenuEntry::create_action(|_| PortfolioMessage::CloseActiveDocumentWithConfirmation.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| PortfolioMessage::CloseActiveDocumentWithConfirmation.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Close All".into(),
 							shortcut: action_keys!(DialogMessageDiscriminant::CloseAllDocumentsWithConfirmation),
-							action: MenuEntry::create_action(|_| DialogMessage::CloseAllDocumentsWithConfirmation.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DialogMessage::CloseAllDocumentsWithConfirmation.into()),
+							..MenuBarEntry::default()
 						},
 					],
-					vec![MenuEntry {
+					vec![MenuBarEntry {
 						label: "Save".into(),
 						shortcut: action_keys!(DocumentMessageDiscriminant::SaveDocument),
-						action: MenuEntry::create_action(|_| DocumentMessage::SaveDocument.into()),
-						..MenuEntry::default()
+						action: MenuBarEntry::create_action(|_| DocumentMessage::SaveDocument.into()),
+						..MenuBarEntry::default()
 					}],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Import…".into(),
 							shortcut: action_keys!(PortfolioMessageDiscriminant::Import),
-							action: MenuEntry::create_action(|_| PortfolioMessage::Import.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| PortfolioMessage::Import.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Export…".into(),
 							shortcut: action_keys!(DialogMessageDiscriminant::RequestExportDialog),
-							action: MenuEntry::create_action(|_| DialogMessage::RequestExportDialog.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DialogMessage::RequestExportDialog.into()),
+							..MenuBarEntry::default()
 						},
 					],
 				]),
-			},
-			MenuColumn {
-				label: "Edit".into(),
-				children: MenuEntryGroups(vec![
+			),
+			MenuBarEntry::new_root(
+				"Edit".into(),
+				MenuBarEntryChildren(vec![
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Undo".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::Undo),
-							action: MenuEntry::create_action(|_| DocumentMessage::Undo.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::Undo.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Redo".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::Redo),
-							action: MenuEntry::create_action(|_| DocumentMessage::Redo.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::Redo.into()),
+							..MenuBarEntry::default()
 						},
 					],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Cut".into(),
 							shortcut: action_keys!(PortfolioMessageDiscriminant::Cut),
-							action: MenuEntry::create_action(|_| PortfolioMessage::Cut { clipboard: Clipboard::Device }.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| PortfolioMessage::Cut { clipboard: Clipboard::Device }.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Copy".into(),
 							icon: Some("Copy".into()),
 							shortcut: action_keys!(PortfolioMessageDiscriminant::Copy),
-							action: MenuEntry::create_action(|_| PortfolioMessage::Copy { clipboard: Clipboard::Device }.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| PortfolioMessage::Copy { clipboard: Clipboard::Device }.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Paste".into(),
 							icon: Some("Paste".into()),
 							shortcut: action_keys!(FrontendMessageDiscriminant::TriggerPaste),
-							action: MenuEntry::create_action(|_| FrontendMessage::TriggerPaste.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| FrontendMessage::TriggerPaste.into()),
+							..MenuBarEntry::default()
 						},
 					],
 				]),
-			},
-			MenuColumn {
-				label: "Layer".into(),
-				children: MenuEntryGroups(vec![
+			),
+			MenuBarEntry::new_root(
+				"Layer".into(),
+				MenuBarEntryChildren(vec![
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Select All".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::SelectAllLayers),
-							action: MenuEntry::create_action(|_| DocumentMessage::SelectAllLayers.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::SelectAllLayers.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Deselect All".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::DeselectAllLayers),
-							action: MenuEntry::create_action(|_| DocumentMessage::DeselectAllLayers.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::DeselectAllLayers.into()),
+							..MenuBarEntry::default()
 						},
 					],
-					vec![MenuEntry {
+					vec![MenuBarEntry {
 						label: "Delete Selected".into(),
 						icon: Some("Trash".into()),
 						shortcut: action_keys!(DocumentMessageDiscriminant::DeleteSelectedLayers),
-						action: MenuEntry::create_action(|_| DocumentMessage::DeleteSelectedLayers.into()),
-						..MenuEntry::default()
+						action: MenuBarEntry::create_action(|_| DocumentMessage::DeleteSelectedLayers.into()),
+						..MenuBarEntry::default()
 					}],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Grab Selected".into(),
 							shortcut: action_keys!(TransformLayerMessageDiscriminant::BeginGrab),
-							action: MenuEntry::create_action(|_| TransformLayerMessage::BeginGrab.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| TransformLayerMessage::BeginGrab.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Rotate Selected".into(),
 							shortcut: action_keys!(TransformLayerMessageDiscriminant::BeginRotate),
-							action: MenuEntry::create_action(|_| TransformLayerMessage::BeginRotate.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| TransformLayerMessage::BeginRotate.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Scale Selected".into(),
 							shortcut: action_keys!(TransformLayerMessageDiscriminant::BeginScale),
-							action: MenuEntry::create_action(|_| TransformLayerMessage::BeginScale.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| TransformLayerMessage::BeginScale.into()),
+							..MenuBarEntry::default()
 						},
 					],
-					vec![MenuEntry {
+					vec![MenuBarEntry {
 						label: "Order".into(),
-						action: MenuEntry::no_action(),
-						children: MenuEntryGroups(vec![vec![
-							MenuEntry {
+						action: MenuBarEntry::no_action(),
+						children: MenuBarEntryChildren(vec![vec![
+							MenuBarEntry {
 								label: "Raise To Front".into(),
 								shortcut: action_keys!(DocumentMessageDiscriminant::SelectedLayersRaiseToFront),
-								action: MenuEntry::create_action(|_| DocumentMessage::SelectedLayersRaiseToFront.into()),
-								..MenuEntry::default()
+								action: MenuBarEntry::create_action(|_| DocumentMessage::SelectedLayersRaiseToFront.into()),
+								..MenuBarEntry::default()
 							},
-							MenuEntry {
+							MenuBarEntry {
 								label: "Raise".into(),
 								shortcut: action_keys!(DocumentMessageDiscriminant::SelectedLayersRaise),
-								action: MenuEntry::create_action(|_| DocumentMessage::SelectedLayersRaise.into()),
-								..MenuEntry::default()
+								action: MenuBarEntry::create_action(|_| DocumentMessage::SelectedLayersRaise.into()),
+								..MenuBarEntry::default()
 							},
-							MenuEntry {
+							MenuBarEntry {
 								label: "Lower".into(),
 								shortcut: action_keys!(DocumentMessageDiscriminant::SelectedLayersLower),
-								action: MenuEntry::create_action(|_| DocumentMessage::SelectedLayersLower.into()),
-								..MenuEntry::default()
+								action: MenuBarEntry::create_action(|_| DocumentMessage::SelectedLayersLower.into()),
+								..MenuBarEntry::default()
 							},
-							MenuEntry {
+							MenuBarEntry {
 								label: "Lower to Back".into(),
 								shortcut: action_keys!(DocumentMessageDiscriminant::SelectedLayersLowerToBack),
-								action: MenuEntry::create_action(|_| DocumentMessage::SelectedLayersLowerToBack.into()),
-								..MenuEntry::default()
+								action: MenuBarEntry::create_action(|_| DocumentMessage::SelectedLayersLowerToBack.into()),
+								..MenuBarEntry::default()
 							},
 						]]),
-						..MenuEntry::default()
+						..MenuBarEntry::default()
 					}],
 				]),
-			},
-			MenuColumn {
-				label: "Document".into(),
-				children: MenuEntryGroups(vec![vec![MenuEntry {
+			),
+			MenuBarEntry::new_root(
+				"Document".into(),
+				MenuBarEntryChildren(vec![vec![MenuBarEntry {
 					label: "Clear Artboards".into(),
-					action: MenuEntry::create_action(|_| ArtboardMessage::ClearArtboards.into()),
-					..MenuEntry::default()
+					action: MenuBarEntry::create_action(|_| ArtboardMessage::ClearArtboards.into()),
+					..MenuBarEntry::default()
 				}]]),
-			},
-			MenuColumn {
-				label: "View".into(),
-				children: MenuEntryGroups(vec![
+			),
+			MenuBarEntry::new_root(
+				"View".into(),
+				MenuBarEntryChildren(vec![
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Zoom to Fit".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::ZoomCanvasToFitAll),
-							action: MenuEntry::create_action(|_| DocumentMessage::ZoomCanvasToFitAll.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::ZoomCanvasToFitAll.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Zoom to 100%".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::ZoomCanvasTo100Percent),
-							action: MenuEntry::create_action(|_| DocumentMessage::ZoomCanvasTo100Percent.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::ZoomCanvasTo100Percent.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Zoom to 200%".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::ZoomCanvasTo200Percent),
-							action: MenuEntry::create_action(|_| DocumentMessage::ZoomCanvasTo200Percent.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::ZoomCanvasTo200Percent.into()),
+							..MenuBarEntry::default()
 						},
 					],
-					vec![MenuEntry {
+					vec![MenuBarEntry {
 						label: "Node Graph (In Development)".into(),
-						action: MenuEntry::create_action(|_| WorkspaceMessage::NodeGraphToggleVisibility.into()),
-						..MenuEntry::default()
+						action: MenuBarEntry::create_action(|_| WorkspaceMessage::NodeGraphToggleVisibility.into()),
+						..MenuBarEntry::default()
 					}],
 				]),
-			},
-			MenuColumn {
-				label: "Help".into(),
-				children: MenuEntryGroups(vec![
-					vec![MenuEntry {
+			),
+			MenuBarEntry::new_root(
+				"Help".into(),
+				MenuBarEntryChildren(vec![
+					vec![MenuBarEntry {
 						label: "About Graphite".into(),
 						icon: Some("GraphiteLogo".into()),
-						action: MenuEntry::create_action(|_| DialogMessage::RequestAboutGraphiteDialog.into()),
-						..MenuEntry::default()
+						action: MenuBarEntry::create_action(|_| DialogMessage::RequestAboutGraphiteDialog.into()),
+						..MenuBarEntry::default()
 					}],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Report a Bug".into(),
-							action: MenuEntry::create_action(|_| {
+							action: MenuBarEntry::create_action(|_| {
 								FrontendMessage::TriggerVisitLink {
 									url: "https://github.com/GraphiteEditor/Graphite/issues/new".into(),
 								}
 								.into()
 							}),
-							..MenuEntry::default()
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Visit on GitHub".into(),
-							action: MenuEntry::create_action(|_| {
+							action: MenuBarEntry::create_action(|_| {
 								FrontendMessage::TriggerVisitLink {
 									url: "https://github.com/GraphiteEditor/Graphite".into(),
 								}
 								.into()
 							}),
-							..MenuEntry::default()
+							..MenuBarEntry::default()
 						},
 					],
 					vec![
-						MenuEntry {
+						MenuBarEntry {
 							label: "Debug: Print Messages".into(),
-							action: MenuEntry::no_action(),
-							children: MenuEntryGroups(vec![vec![
-								MenuEntry {
+							action: MenuBarEntry::no_action(),
+							children: MenuBarEntryChildren(vec![vec![
+								MenuBarEntry {
 									label: "Off".into(),
 									// icon: Some("Checkmark".into()), // TODO: Find a way to set this icon on the active mode
 									shortcut: action_keys!(DebugMessageDiscriminant::MessageOff),
-									action: MenuEntry::create_action(|_| DebugMessage::MessageOff.into()),
-									..MenuEntry::default()
+									action: MenuBarEntry::create_action(|_| DebugMessage::MessageOff.into()),
+									..MenuBarEntry::default()
 								},
-								MenuEntry {
+								MenuBarEntry {
 									label: "Only Names".into(),
 									shortcut: action_keys!(DebugMessageDiscriminant::MessageNames),
-									action: MenuEntry::create_action(|_| DebugMessage::MessageNames.into()),
-									..MenuEntry::default()
+									action: MenuBarEntry::create_action(|_| DebugMessage::MessageNames.into()),
+									..MenuBarEntry::default()
 								},
-								MenuEntry {
+								MenuBarEntry {
 									label: "Full Contents".into(),
 									shortcut: action_keys!(DebugMessageDiscriminant::MessageContents),
-									action: MenuEntry::create_action(|_| DebugMessage::MessageContents.into()),
-									..MenuEntry::default()
+									action: MenuBarEntry::create_action(|_| DebugMessage::MessageContents.into()),
+									..MenuBarEntry::default()
 								},
 							]]),
-							..MenuEntry::default()
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Debug: Print Trace Logs".into(),
 							icon: Some(if let log::LevelFilter::Trace = log::max_level() { "CheckboxChecked" } else { "CheckboxUnchecked" }.into()),
 							shortcut: action_keys!(DebugMessageDiscriminant::ToggleTraceLogs),
-							action: MenuEntry::create_action(|_| DebugMessage::ToggleTraceLogs.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DebugMessage::ToggleTraceLogs.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Debug: Print Document".into(),
 							shortcut: action_keys!(DocumentMessageDiscriminant::DebugPrintDocument),
-							action: MenuEntry::create_action(|_| DocumentMessage::DebugPrintDocument.into()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| DocumentMessage::DebugPrintDocument.into()),
+							..MenuBarEntry::default()
 						},
-						MenuEntry {
+						MenuBarEntry {
 							label: "Debug: Panic (DANGER)".into(),
-							action: MenuEntry::create_action(|_| panic!()),
-							..MenuEntry::default()
+							action: MenuBarEntry::create_action(|_| panic!()),
+							..MenuBarEntry::default()
 						},
 					],
 				]),
-			},
+			),
 		]))
 	}
 }
diff --git a/frontend/src/TwoViewTest.vue b/frontend/src/TwoViewTest.vue
deleted file mode 100644
index 9c3a0659d..000000000
--- a/frontend/src/TwoViewTest.vue
+++ /dev/null
@@ -1,20 +0,0 @@
-<template>
-	<div style="display: flex">
-		<div tabindex="0" style="width: 50%; outline: none">
-			<App />
-		</div>
-		<div tabindex="0" style="width: 50%; outline: none">
-			<App />
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from "vue";
-
-import App from "@/App.vue";
-
-export default defineComponent({
-	components: { App },
-});
-</script>
diff --git a/frontend/src/components/floating-menus/MenuList.vue b/frontend/src/components/floating-menus/MenuList.vue
index 0f7511a45..ecfe1b84e 100644
--- a/frontend/src/components/floating-menus/MenuList.vue
+++ b/frontend/src/components/floating-menus/MenuList.vue
@@ -44,8 +44,8 @@
 						:open="entry.ref?.open || false"
 						:direction="'TopRight'"
 						:entries="entry.children"
-						v-bind="{ defaultAction, minWidth, drawIcon, scrollableY }"
-						:ref="(ref: typeof FloatingMenu) => ref && (entry.ref = ref)"
+						v-bind="{ minWidth, drawIcon, scrollableY }"
+						:ref="(ref: MenuListInstance) => ref && (entry.ref = ref)"
 					/>
 				</LayoutRow>
 			</template>
@@ -160,7 +160,7 @@
 <script lang="ts">
 import { defineComponent, PropType } from "vue";
 
-import { MenuListEntry, SectionsOfMenuListEntries, MenuListEntryData } from "@/wasm-communication/messages";
+import type { MenuListEntry } from "@/wasm-communication/messages";
 
 import FloatingMenu, { MenuDirection } from "@/components/floating-menus/FloatingMenu.vue";
 import LayoutCol from "@/components/layout/LayoutCol.vue";
@@ -169,10 +169,13 @@ import IconLabel from "@/components/widgets/labels/IconLabel.vue";
 import Separator from "@/components/widgets/labels/Separator.vue";
 import UserInputLabel from "@/components/widgets/labels/UserInputLabel.vue";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+type MenuListInstance = InstanceType<typeof MenuList>;
+
 const MenuList = defineComponent({
 	emits: ["update:open", "update:activeEntry", "naturalWidth"],
 	props: {
-		entries: { type: Array as PropType<SectionsOfMenuListEntries>, required: true },
+		entries: { type: Array as PropType<MenuListEntry[][]>, required: true },
 		activeEntry: { type: Object as PropType<MenuListEntry>, required: false },
 		open: { type: Boolean as PropType<boolean>, required: true },
 		direction: { type: String as PropType<MenuDirection>, default: "Bottom" },
@@ -181,7 +184,6 @@ const MenuList = defineComponent({
 		interactive: { type: Boolean as PropType<boolean>, default: false },
 		scrollableY: { type: Boolean as PropType<boolean>, default: false },
 		virtualScrollingEntryHeight: { type: Number as PropType<number>, default: 0 },
-		defaultAction: { type: Function as PropType<() => void>, required: false },
 	},
 	data() {
 		return {
@@ -209,33 +211,32 @@ const MenuList = defineComponent({
 		},
 	},
 	methods: {
-		onEntryClick(menuEntry: MenuListEntry): void {
-			// Call the action, or a default, if either are provided
-			if (menuEntry.action) menuEntry.action();
-			else if (this.defaultAction) this.defaultAction();
+		onEntryClick(menuListEntry: MenuListEntry): void {
+			// Call the action if available
+			if (menuListEntry.action) menuListEntry.action();
 
 			// Emit the clicked entry as the new active entry
-			this.$emit("update:activeEntry", menuEntry);
+			this.$emit("update:activeEntry", menuListEntry);
 
 			// Close the containing menu
-			if (menuEntry.ref) menuEntry.ref.isOpen = false;
+			if (menuListEntry.ref) menuListEntry.ref.isOpen = false;
 			this.$emit("update:open", false);
 			this.isOpen = false; // TODO: This is a hack for MenuBarInput submenus, remove it when we get rid of using `ref`
 		},
-		onEntryPointerEnter(menuEntry: MenuListEntry): void {
-			if (!menuEntry.children?.length) return;
+		onEntryPointerEnter(menuListEntry: MenuListEntry): void {
+			if (!menuListEntry.children?.length) return;
 
-			if (menuEntry.ref) menuEntry.ref.isOpen = true;
+			if (menuListEntry.ref) menuListEntry.ref.isOpen = true;
 			else this.$emit("update:open", true);
 		},
-		onEntryPointerLeave(menuEntry: MenuListEntry): void {
-			if (!menuEntry.children?.length) return;
+		onEntryPointerLeave(menuListEntry: MenuListEntry): void {
+			if (!menuListEntry.children?.length) return;
 
-			if (menuEntry.ref) menuEntry.ref.isOpen = false;
+			if (menuListEntry.ref) menuListEntry.ref.isOpen = false;
 			else this.$emit("update:open", false);
 		},
-		isEntryOpen(menuEntry: MenuListEntry): boolean {
-			if (!menuEntry.children?.length) return false;
+		isEntryOpen(menuListEntry: MenuListEntry): boolean {
+			if (!menuListEntry.children?.length) return false;
 
 			return this.open;
 		},
@@ -249,7 +250,7 @@ const MenuList = defineComponent({
 			const flatEntries = this.entries.flat().filter((entry) => !entry.disabled);
 			const openChild = flatEntries.findIndex((entry) => entry.children?.length && entry.ref?.isOpen);
 
-			const openSubmenu = (highlighted: MenuListEntry<string>): void => {
+			const openSubmenu = (highlighted: MenuListEntry): void => {
 				if (highlighted.ref && highlighted.children?.length) {
 					highlighted.ref.isOpen = true;
 
@@ -316,7 +317,7 @@ const MenuList = defineComponent({
 			// By default, keep the menu stack open
 			return false;
 		},
-		setHighlighted(newHighlight: MenuListEntry<string> | undefined) {
+		setHighlighted(newHighlight: MenuListEntry | undefined) {
 			this.highlighted = newHighlight;
 			// Interactive menus should keep the active entry the same as the highlighted one
 			if (this.interactive && newHighlight?.value !== this.activeEntry?.value) this.$emit("update:activeEntry", newHighlight);
@@ -327,14 +328,6 @@ const MenuList = defineComponent({
 		},
 	},
 	computed: {
-		entriesWithoutRefs(): MenuListEntryData[][] {
-			return this.entries.map((menuListEntries) =>
-				menuListEntries.map((entry) => {
-					const { ref, ...entryWithoutRef } = entry;
-					return entryWithoutRef;
-				})
-			);
-		},
 		virtualScrollingTotalHeight() {
 			return this.entries[0].length * this.virtualScrollingEntryHeight;
 		},
diff --git a/frontend/src/components/panels/LayerTree.vue b/frontend/src/components/panels/LayerTree.vue
index 21cfe4649..54fa5940c 100644
--- a/frontend/src/components/panels/LayerTree.vue
+++ b/frontend/src/components/panels/LayerTree.vue
@@ -4,7 +4,7 @@
 			<WidgetLayout :layout="layerTreeOptionsLayout" />
 		</LayoutRow>
 		<LayoutRow class="layer-tree-rows" :scrollableY="true">
-			<LayoutCol class="list" ref="layerTreeList" @click="() => deselectAllLayers()" @dragover="(e) => draggable && updateInsertLine(e)" @dragend="() => draggable && drop()">
+			<LayoutCol class="list" ref="layerTreeList" @click="() => deselectAllLayers()" @dragover="(e: DragEvent) => draggable && updateInsertLine(e)" @dragend="() => draggable && drop()">
 				<LayoutRow
 					class="layer-row"
 					v-for="(listing, index) in layers"
@@ -13,7 +13,7 @@
 				>
 					<LayoutRow class="visibility">
 						<IconButton
-							:action="(e) => (toggleLayerVisibility(listing.entry.path), e?.stopPropagation())"
+							:action="(e: MouseEvent) => (toggleLayerVisibility(listing.entry.path), e?.stopPropagation())"
 							:size="24"
 							:icon="listing.entry.visible ? 'EyeVisible' : 'EyeHidden'"
 							:title="listing.entry.visible ? 'Visible' : 'Hidden'"
@@ -34,15 +34,15 @@
 						:data-index="index"
 						:title="listing.entry.tooltip"
 						:draggable="draggable"
-						@dragstart="(e) => draggable && dragStart(e, listing)"
-						@click.exact="(e) => selectLayer(false, false, false, listing, e)"
-						@click.shift.exact="(e) => selectLayer(false, false, true, listing, e)"
-						@click.ctrl.exact="(e) => selectLayer(true, false, false, listing, e)"
-						@click.ctrl.shift.exact="(e) => selectLayer(true, false, true, listing, e)"
-						@click.meta.exact="(e) => selectLayer(false, true, false, listing, e)"
-						@click.meta.shift.exact="(e) => selectLayer(false, true, true, listing, e)"
-						@click.ctrl.meta="(e) => e.stopPropagation()"
-						@click.alt="(e) => e.stopPropagation()"
+						@dragstart="(e: DragEvent) => draggable && dragStart(e, listing)"
+						@click.exact="(e: MouseEvent) => selectLayer(false, false, false, listing, e)"
+						@click.shift.exact="(e: MouseEvent) => selectLayer(false, false, true, listing, e)"
+						@click.ctrl.exact="(e: MouseEvent) => selectLayer(true, false, false, listing, e)"
+						@click.ctrl.shift.exact="(e: MouseEvent) => selectLayer(true, false, true, listing, e)"
+						@click.meta.exact="(e: MouseEvent) => selectLayer(false, true, false, listing, e)"
+						@click.meta.shift.exact="(e: MouseEvent) => selectLayer(false, true, true, listing, e)"
+						@click.ctrl.meta="(e: MouseEvent) => e.stopPropagation()"
+						@click.alt="(e: MouseEvent) => e.stopPropagation()"
 					>
 						<LayoutRow class="layer-type-icon">
 							<IconLabel v-if="listing.entry.layerType === 'Folder'" :icon="'NodeFolder'" :iconStyle="'Node'" title="Folder" />
diff --git a/frontend/src/components/panels/NodeGraph.vue b/frontend/src/components/panels/NodeGraph.vue
index 74d0bad9d..643a8ecde 100644
--- a/frontend/src/components/panels/NodeGraph.vue
+++ b/frontend/src/components/panels/NodeGraph.vue
@@ -3,11 +3,11 @@
 		<LayoutRow class="options-bar"></LayoutRow>
 		<LayoutRow
 			class="graph"
-			@wheel="(e) => scroll(e)"
+			@wheel="(e: WheelEvent) => scroll(e)"
 			ref="graph"
-			@pointerdown="(e) => pointerDown(e)"
-			@pointermove="(e) => pointerMove(e)"
-			@pointerup="(e) => pointerUp(e)"
+			@pointerdown="(e: PointerEvent) => pointerDown(e)"
+			@pointermove="(e: PointerEvent) => pointerMove(e)"
+			@pointerup="(e: PointerEvent) => pointerUp(e)"
 			:style="`--grid-spacing: ${gridSpacing}px; --grid-offset-x: ${transform.x * transform.scale}px; --grid-offset-y: ${transform.y * transform.scale}px; --dot-radius: ${dotRadius}px`"
 		>
 			<div
diff --git a/frontend/src/components/widgets/WidgetRow.vue b/frontend/src/components/widgets/WidgetRow.vue
index b82a5aff0..9207b667b 100644
--- a/frontend/src/components/widgets/WidgetRow.vue
+++ b/frontend/src/components/widgets/WidgetRow.vue
@@ -12,12 +12,7 @@
 				v-model:open="open"
 				@update:selectedIndex="(value: number) => updateLayout(component.widgetId, value)"
 			/>
-			<FontInput
-				v-if="component.props.kind === 'FontInput'"
-				v-bind="component.props"
-				v-model:open="open"
-				@changeFont="(value: { name: string, style: string, file: string }) => updateLayout(component.widgetId, value)"
-			/>
+			<FontInput v-if="component.props.kind === 'FontInput'" v-bind="component.props" v-model:open="open" @changeFont="(value: unknown) => updateLayout(component.widgetId, value)" />
 			<IconButton v-if="component.props.kind === 'IconButton'" v-bind="component.props" :action="() => updateLayout(component.widgetId, null)" />
 			<IconLabel v-if="component.props.kind === 'IconLabel'" v-bind="component.props" />
 			<NumberInput
@@ -29,8 +24,8 @@
 			/>
 			<OptionalInput v-if="component.props.kind === 'OptionalInput'" v-bind="component.props" @update:checked="(value: boolean) => updateLayout(component.widgetId, value)" />
 			<PopoverButton v-if="component.props.kind === 'PopoverButton'" v-bind="component.props">
-				<h3>{{ component.props.header }}</h3>
-				<p>{{ component.props.text }}</p>
+				<h3>{{ (component.props as any).header }}</h3>
+				<p>{{ (component.props as any).text }}</p>
 			</PopoverButton>
 			<RadioInput v-if="component.props.kind === 'RadioInput'" v-bind="component.props" @update:selectedIndex="(value: number) => updateLayout(component.widgetId, value)" />
 			<Separator v-if="component.props.kind === 'Separator'" v-bind="component.props" />
@@ -38,7 +33,7 @@
 			<TextAreaInput v-if="component.props.kind === 'TextAreaInput'" v-bind="component.props" @commitText="(value: string) => updateLayout(component.widgetId, value)" />
 			<TextButton v-if="component.props.kind === 'TextButton'" v-bind="component.props" :action="() => updateLayout(component.widgetId, null)" />
 			<TextInput v-if="component.props.kind === 'TextInput'" v-bind="component.props" @commitText="(value: string) => updateLayout(component.widgetId, value)" />
-			<TextLabel v-if="component.props.kind === 'TextLabel'" v-bind="withoutValue(component.props)">{{ component.props.value }}</TextLabel>
+			<TextLabel v-if="component.props.kind === 'TextLabel'" v-bind="withoutValue(component.props)">{{ (component.props as any).value }}</TextLabel>
 		</template>
 	</div>
 </template>
@@ -124,7 +119,8 @@ export default defineComponent({
 		updateLayout(widgetId: bigint, value: unknown) {
 			this.editor.instance.updateLayout(this.layoutTarget, widgetId, value);
 		},
-		withoutValue(props: Record<string, unknown>): Record<string, unknown> {
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		withoutValue(props: Record<string, any>): Record<string, unknown> {
 			const { value: _, ...rest } = props;
 			return rest;
 		},
diff --git a/frontend/src/components/widgets/inputs/ColorInput.vue b/frontend/src/components/widgets/inputs/ColorInput.vue
index 6971c72fa..f84e3ae63 100644
--- a/frontend/src/components/widgets/inputs/ColorInput.vue
+++ b/frontend/src/components/widgets/inputs/ColorInput.vue
@@ -1,12 +1,12 @@
 <template>
 	<LayoutRow class="color-input" :title="tooltip">
-		<OptionalInput v-if="!noTransparency" :icon="'CloseX'" :checked="Boolean(value)" @update:checked="(val) => updateEnabled(val)"></OptionalInput>
+		<OptionalInput v-if="!noTransparency" :icon="'CloseX'" :checked="Boolean(value)" @update:checked="(state: boolean) => updateEnabled(state)"></OptionalInput>
 		<TextInput :value="displayValue" :label="label" :disabled="disabled || !value" @commitText="(value: string) => textInputUpdated(value)" :center="true" />
 		<Separator :type="'Related'" />
 		<LayoutRow class="swatch">
 			<button class="swatch-button" :class="{ 'disabled-swatch': !value }" :style="`--swatch-color: #${value}`" @click="() => $emit('update:open', true)"></button>
 			<FloatingMenu v-model:open="isOpen" :type="'Popover'" :direction="'Bottom'">
-				<ColorPicker @update:color="(color) => colorPickerUpdated(color)" :color="color" />
+				<ColorPicker @update:color="(color: RGBA) => colorPickerUpdated(color)" :color="color" />
 			</FloatingMenu>
 		</LayoutRow>
 	</LayoutRow>
diff --git a/frontend/src/components/widgets/inputs/DropdownInput.vue b/frontend/src/components/widgets/inputs/DropdownInput.vue
index 2aca44c62..ec9fb207f 100644
--- a/frontend/src/components/widgets/inputs/DropdownInput.vue
+++ b/frontend/src/components/widgets/inputs/DropdownInput.vue
@@ -6,7 +6,7 @@
 			:style="{ minWidth: `${minWidth}px` }"
 			@click="() => !disabled && (open = true)"
 			@blur="(e: FocusEvent) => blur(e)"
-			@keydown="(e) => keydown(e)"
+			@keydown="(e: KeyboardEvent) => keydown(e)"
 			ref="dropdownBox"
 			tabindex="0"
 			data-hover-menu-spawner
@@ -99,7 +99,7 @@
 <script lang="ts">
 import { defineComponent, PropType, toRaw } from "vue";
 
-import { MenuListEntry, SectionsOfMenuListEntries } from "@/wasm-communication/messages";
+import { MenuListEntry } from "@/wasm-communication/messages";
 
 import MenuList from "@/components/floating-menus/MenuList.vue";
 import LayoutRow from "@/components/layout/LayoutRow.vue";
@@ -110,7 +110,7 @@ const DASH_ENTRY = { label: "-" };
 export default defineComponent({
 	emits: ["update:selectedIndex"],
 	props: {
-		entries: { type: Array as PropType<SectionsOfMenuListEntries>, required: true },
+		entries: { type: Array as PropType<MenuListEntry[][]>, required: true },
 		selectedIndex: { type: Number as PropType<number>, required: false }, // When not provided, a dash is displayed
 		drawIcon: { type: Boolean as PropType<boolean>, default: false },
 		interactive: { type: Boolean as PropType<boolean>, default: true },
diff --git a/frontend/src/components/widgets/inputs/MenuBarInput.vue b/frontend/src/components/widgets/inputs/MenuBarInput.vue
index 060fffa08..8199603d6 100644
--- a/frontend/src/components/widgets/inputs/MenuBarInput.vue
+++ b/frontend/src/components/widgets/inputs/MenuBarInput.vue
@@ -1,31 +1,26 @@
 <template>
 	<div class="menu-bar-input" data-menu-bar-input>
-		<div class="entry-container">
-			<button @click="() => visitWebsite('https://graphite.rs')" class="entry">
-				<IconLabel :icon="'GraphiteLogo'" />
-			</button>
-		</div>
 		<div class="entry-container" v-for="(entry, index) in entries" :key="index">
 			<div
-				@click="(e) => onClick(entry, e.target)"
-				tabindex="0"
-				@blur="(e: FocusEvent) => blur(e,entry)"
-				@keydown="entry.ref?.keydown"
+				@click="(e: MouseEvent) => onClick(entry, e.target)"
+				@blur="(e: FocusEvent) => blur(entry, e.target)"
+				@keydown="(e: KeyboardEvent) => entry.ref?.keydown(e, false)"
 				class="entry"
 				:class="{ open: entry.ref?.isOpen }"
+				tabindex="0"
 				data-hover-menu-spawner
 			>
 				<IconLabel v-if="entry.icon" :icon="entry.icon" />
 				<span v-if="entry.label">{{ entry.label }}</span>
 			</div>
 			<MenuList
+				v-if="entry.children && entry.children.length > 0"
 				:open="entry.ref?.open || false"
 				:entries="entry.children || []"
 				:direction="'Bottom'"
 				:minWidth="240"
 				:drawIcon="true"
-				:defaultAction="() => editor.instance.requestComingSoonDialog()"
-				:ref="(ref: typeof MenuList) => ref && (entry.ref = ref)"
+				:ref="(ref: MenuListInstance) => ref && (entry.ref = ref)"
 			/>
 		</div>
 	</div>
@@ -73,11 +68,14 @@
 import { defineComponent } from "vue";
 
 import { platformIsMac } from "@/utility-functions/platform";
-import { MenuEntry, UpdateMenuBarLayout, MenuListEntry, KeyRaw, KeysGroup } from "@/wasm-communication/messages";
+import { MenuBarEntry, UpdateMenuBarLayout, MenuListEntry, KeyRaw, KeysGroup } from "@/wasm-communication/messages";
 
 import MenuList from "@/components/floating-menus/MenuList.vue";
 import IconLabel from "@/components/widgets/labels/IconLabel.vue";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+type MenuListInstance = InstanceType<typeof MenuList>;
+
 // TODO: Apparently, Safari does not support the Keyboard.lock() API but does relax its authority over certain keyboard shortcuts in fullscreen mode, which we should take advantage of
 const accelKey = platformIsMac() ? "Command" : "Control";
 const LOCK_REQUIRING_SHORTCUTS: KeyRaw[][] = [
@@ -88,12 +86,6 @@ const LOCK_REQUIRING_SHORTCUTS: KeyRaw[][] = [
 	[accelKey, "Shift", "KeyT"],
 ];
 
-type FrontendMenuColumn = {
-	label: string;
-	children: FrontendMenuEntry[][];
-};
-type FrontendMenuEntry = Omit<MenuEntry, "action" | "children"> & { shortcutRequiresLock: boolean | undefined; action: () => void; children: FrontendMenuEntry[][] | undefined };
-
 export default defineComponent({
 	inject: ["editor"],
 	mounted() {
@@ -106,39 +98,47 @@ export default defineComponent({
 				return LOCK_REQUIRING_SHORTCUTS.some((lockKeyCombo) => arraysEqual(shortcutKeys, lockKeyCombo));
 			};
 
-			const menuEntryToFrontendMenuEntry = (subLayout: MenuEntry[][]): FrontendMenuEntry[][] =>
-				subLayout.map((group) =>
-					group.map((entry) => ({
-						...entry,
-						children: entry.children ? menuEntryToFrontendMenuEntry(entry.children) : undefined,
-						action: (): void => this.editor.instance.updateLayout(updateMenuBarLayout.layoutTarget, entry.action.widgetId, undefined),
-						shortcutRequiresLock: entry.shortcut ? shortcutRequiresLock(entry.shortcut.keys) : undefined,
-					}))
-				);
+			const menuBarEntryToMenuListEntry = (entry: MenuBarEntry): MenuListEntry => ({
+				// From `MenuEntryCommon`
+				...entry,
 
-			this.entries = updateMenuBarLayout.layout.map((column) => ({ ...column, children: menuEntryToFrontendMenuEntry(column.children) }));
+				// Shared names with fields that need to be converted from the type used in `MenuBarEntry` to that of `MenuListEntry`
+				action: (): void => this.editor.instance.updateLayout(updateMenuBarLayout.layoutTarget, entry.action.widgetId, undefined),
+				children: entry.children ? entry.children.map((entries) => entries.map((entry) => menuBarEntryToMenuListEntry(entry))) : undefined,
+
+				// New fields in `MenuListEntry`
+				shortcutRequiresLock: entry.shortcut ? shortcutRequiresLock(entry.shortcut.keys) : undefined,
+				value: undefined,
+				disabled: undefined,
+				font: undefined,
+				ref: undefined,
+			});
+
+			this.entries = updateMenuBarLayout.layout.map(menuBarEntryToMenuListEntry);
 		});
 	},
 	methods: {
-		onClick(menuEntry: MenuListEntry, target: EventTarget | null) {
+		onClick(menuListEntry: MenuListEntry, target: EventTarget | null) {
+			// If there's no menu to open, trigger the action but don't try to open its non-existant children
+			if (!menuListEntry.children || menuListEntry.children.length === 0) {
+				if (menuListEntry.action && !menuListEntry.disabled) menuListEntry.action();
+
+				return;
+			}
+
 			// Focus the target so that keyboard inputs are sent to the dropdown
 			(target as HTMLElement)?.focus();
 
-			if (menuEntry.ref) menuEntry.ref.isOpen = true;
+			if (menuListEntry.ref) menuListEntry.ref.isOpen = true;
 			else throw new Error("The menu bar floating menu has no associated ref");
 		},
-		blur(e: FocusEvent, menuEntry: MenuListEntry) {
-			if ((e.target as HTMLElement).closest("[data-menu-bar-input]") !== this.$el && menuEntry.ref) menuEntry.ref.isOpen = false;
-		},
-		// TODO: Move to backend
-		visitWebsite(url: string) {
-			// This method is required because `window` isn't accessible from the Vue component HTML
-			window.open(url, "_blank");
+		blur(menuListEntry: MenuListEntry, target: EventTarget | null) {
+			if ((target as HTMLElement)?.closest("[data-menu-bar-input]") !== this.$el && menuListEntry.ref) menuListEntry.ref.isOpen = false;
 		},
 	},
 	data() {
 		return {
-			entries: [] as FrontendMenuColumn[],
+			entries: [] as MenuListEntry[],
 			open: false,
 		};
 	},
diff --git a/frontend/src/components/widgets/inputs/OptionalInput.vue b/frontend/src/components/widgets/inputs/OptionalInput.vue
index 660fe83fc..4318454cb 100644
--- a/frontend/src/components/widgets/inputs/OptionalInput.vue
+++ b/frontend/src/components/widgets/inputs/OptionalInput.vue
@@ -1,6 +1,6 @@
 <template>
 	<LayoutRow class="optional-input">
-		<CheckboxInput :checked="checked" @input="(e) => $emit('update:checked', (e.target as HTMLInputElement).checked)" :icon="icon" :tooltip="tooltip" />
+		<CheckboxInput :checked="checked" @input="(e: Event) => $emit('update:checked', (e.target as HTMLInputElement).checked)" :icon="icon" :tooltip="tooltip" />
 	</LayoutRow>
 </template>
 
diff --git a/frontend/src/components/widgets/inputs/RadioInput.vue b/frontend/src/components/widgets/inputs/RadioInput.vue
index 133afea7a..345e05bcd 100644
--- a/frontend/src/components/widgets/inputs/RadioInput.vue
+++ b/frontend/src/components/widgets/inputs/RadioInput.vue
@@ -77,11 +77,11 @@ export default defineComponent({
 		selectedIndex: { type: Number as PropType<number>, required: true },
 	},
 	methods: {
-		handleEntryClick(menuEntry: RadioEntryData) {
-			const index = this.entries.indexOf(menuEntry);
+		handleEntryClick(radioEntryData: RadioEntryData) {
+			const index = this.entries.indexOf(radioEntryData);
 			this.$emit("update:selectedIndex", index);
 
-			menuEntry.action?.();
+			radioEntryData.action?.();
 		},
 	},
 	components: {
diff --git a/frontend/src/components/window/workspace/Panel.vue b/frontend/src/components/window/workspace/Panel.vue
index bbbeaf9a4..e94e8a454 100644
--- a/frontend/src/components/window/workspace/Panel.vue
+++ b/frontend/src/components/window/workspace/Panel.vue
@@ -8,11 +8,11 @@
 					data-tab
 					v-for="(tabLabel, tabIndex) in tabLabels"
 					:key="tabIndex"
-					@click="(e) => (e?.stopPropagation(), clickAction?.(tabIndex))"
-					@click.middle="(e) => (e?.stopPropagation(), closeAction?.(tabIndex))"
+					@click="(e: MouseEvent) => (e?.stopPropagation(), clickAction?.(tabIndex))"
+					@click.middle="(e: MouseEvent) => (e?.stopPropagation(), closeAction?.(tabIndex))"
 				>
 					<span>{{ tabLabel }}</span>
-					<IconButton :action="(e) => (e?.stopPropagation(), closeAction?.(tabIndex))" :icon="'CloseX'" :size="16" v-if="tabCloseButtons" />
+					<IconButton :action="(e: MouseEvent) => (e?.stopPropagation(), closeAction?.(tabIndex))" :icon="'CloseX'" :size="16" v-if="tabCloseButtons" />
 				</LayoutRow>
 			</LayoutRow>
 			<PopoverButton :icon="'VerticalEllipsis'">
diff --git a/frontend/src/components/window/workspace/Workspace.vue b/frontend/src/components/window/workspace/Workspace.vue
index ce3a1945e..2121be336 100644
--- a/frontend/src/components/window/workspace/Workspace.vue
+++ b/frontend/src/components/window/workspace/Workspace.vue
@@ -8,23 +8,23 @@
 						:tabCloseButtons="true"
 						:tabMinWidths="true"
 						:tabLabels="portfolio.state.documents.map((doc) => doc.displayName)"
-						:clickAction="(tabIndex) => editor.instance.selectDocument(portfolio.state.documents[tabIndex].id)"
-						:closeAction="(tabIndex) => editor.instance.closeDocumentWithConfirmation(portfolio.state.documents[tabIndex].id)"
+						:clickAction="(tabIndex: number) => editor.instance.selectDocument(portfolio.state.documents[tabIndex].id)"
+						:closeAction="(tabIndex: number) => editor.instance.closeDocumentWithConfirmation(portfolio.state.documents[tabIndex].id)"
 						:tabActiveIndex="portfolio.state.activeDocumentIndex"
 						ref="documentsPanel"
 					/>
 				</LayoutRow>
-				<LayoutRow class="workspace-grid-resize-gutter" @pointerdown="(e) => resizePanel(e)" v-if="nodeGraphVisible"></LayoutRow>
+				<LayoutRow class="workspace-grid-resize-gutter" @pointerdown="(e: PointerEvent) => resizePanel(e)" v-if="nodeGraphVisible"></LayoutRow>
 				<LayoutRow class="workspace-grid-subdivision" v-if="nodeGraphVisible">
 					<Panel :panelType="'NodeGraph'" :tabLabels="['Node Graph']" :tabActiveIndex="0" />
 				</LayoutRow>
 			</LayoutCol>
-			<LayoutCol class="workspace-grid-resize-gutter" @pointerdown="(e) => resizePanel(e)"></LayoutCol>
+			<LayoutCol class="workspace-grid-resize-gutter" @pointerdown="(e: PointerEvent) => resizePanel(e)"></LayoutCol>
 			<LayoutCol class="workspace-grid-subdivision" style="flex-grow: 0.17">
 				<LayoutRow class="workspace-grid-subdivision" style="flex-grow: 402">
 					<Panel :panelType="'Properties'" :tabLabels="['Properties']" :tabActiveIndex="0" />
 				</LayoutRow>
-				<LayoutRow class="workspace-grid-resize-gutter" @pointerdown="(e) => resizePanel(e)"></LayoutRow>
+				<LayoutRow class="workspace-grid-resize-gutter" @pointerdown="(e: PointerEvent) => resizePanel(e)"></LayoutRow>
 				<LayoutRow class="workspace-grid-subdivision" style="flex-grow: 590">
 					<Panel :panelType="'LayerTree'" :tabLabels="['Layer Tree']" :tabActiveIndex="0" />
 				</LayoutRow>
diff --git a/frontend/src/io-managers/input.ts b/frontend/src/io-managers/input.ts
index f494a4979..9276a8cf3 100644
--- a/frontend/src/io-managers/input.ts
+++ b/frontend/src/io-managers/input.ts
@@ -244,7 +244,7 @@ export function createInputManager(editor: Editor, container: HTMLElement, dialo
 		if (editor.instance.hasCrashed()) return;
 
 		// Skip the message during development, since it's annoying when testing
-		if (process.env.NODE_ENV === "development") return;
+		if (editor.instance.inDevelopmentMode()) return;
 
 		const allDocumentsSaved = document.state.documents.reduce((acc, doc) => acc && doc.isSaved, true);
 		if (!allDocumentsSaved) {
diff --git a/frontend/src/volar.d.ts b/frontend/src/volar.d.ts
deleted file mode 100644
index 008c4b5c2..000000000
--- a/frontend/src/volar.d.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { type RGBA as RGBA_ } from "@/wasm-communication/messages";
-
-import FloatingMenu from "@/components/floating-menus/FloatingMenu.vue";
-import MenuList from "@/components/floating-menus/MenuList.vue";
-
-// TODO: When a Volar bug is fixed (likely in v0.34.16):
-// TODO: - Uncomment this block
-// TODO: - Remove the `MenuList` and `FloatingMenu` lines from the `declare global` section below
-// TODO: - And possibly add the empty export line of code `export {};` to the bottom of this file, for some reason
-// declare module "vue" {
-// 	interface ComponentCustomProperties {
-// 		const MenuList: MenuList;
-// 		const FloatingMenu: FloatingMenu;
-// 	}
-// }
-
-// Satisfies Volar
-// TODO: Move this back into `DropdownInput.vue` and `SwatchPairInput.vue` after https://github.com/johnsoncodehk/volar/issues/1321 is fixed
-declare global {
-	const MenuList: MenuList;
-	const FloatingMenu: FloatingMenu;
-	type RGBA = RGBA_;
-}
diff --git a/frontend/src/wasm-communication/messages.ts b/frontend/src/wasm-communication/messages.ts
index 4d391f4b1..f8aa377ca 100644
--- a/frontend/src/wasm-communication/messages.ts
+++ b/frontend/src/wasm-communication/messages.ts
@@ -2,9 +2,11 @@
 
 import { Transform, Type, plainToClass } from "class-transformer";
 
-import { IconName, IconSize, IconStyle } from "@/utility-functions/icons";
+import type { IconName, IconSize, IconStyle } from "@/utility-functions/icons";
 import type { WasmEditorInstance, WasmRawInstance } from "@/wasm-communication/editor";
 
+import type MenuList from "@/components/floating-menus/MenuList.vue";
+
 export class JsMessage {
 	// The marker provides a way to check if an object is a sub-class constructor for a jsMessage.
 	static readonly jsMessageMarker = true;
@@ -324,6 +326,8 @@ export class UpdateDocumentLayerDetails extends JsMessage {
 export class LayerPanelEntry {
 	name!: string;
 
+	tooltip!: string;
+
 	visible!: boolean;
 
 	layerType!: LayerType;
@@ -410,36 +414,32 @@ export class ColorInput extends WidgetProps {
 	tooltip!: string;
 }
 
-export type MenuColumn = {
+type MenuEntryCommon = {
 	label: string;
-	children: MenuEntry[][];
-};
-
-export type MenuEntry = {
-	shortcut: ActionKeys | undefined;
-	action: Widget;
-	label: string;
-	icon: string | undefined;
-	children: undefined | MenuEntry[][];
-};
-
-export interface MenuListEntryData<Value = string> {
-	value?: Value;
-	label?: string;
 	icon?: IconName;
-	font?: URL;
 	shortcut?: ActionKeys;
-	shortcutRequiresLock?: boolean;
-	disabled?: boolean;
+};
+
+// The entry in the expanded menu or a sub-menu as received from the Rust backend
+export type MenuBarEntry = MenuEntryCommon & {
+	action: Widget;
+	children?: MenuBarEntry[][];
+};
+
+// An entry in the all-encompassing MenuList component which defines all types of menus ranging from `MenuBarInput` to `DropdownInput` widgets
+export type MenuListEntry = MenuEntryCommon & {
 	action?: () => void;
-	children?: SectionsOfMenuListEntries;
-}
-export type MenuListEntry<Value = string> = MenuListEntryData<Value> & { ref?: typeof FloatingMenu | typeof MenuList };
-export type MenuListEntries<Value = string> = MenuListEntry<Value>[];
-export type SectionsOfMenuListEntries<Value = string> = MenuListEntries<Value>[];
+	children?: MenuListEntry[][];
+
+	shortcutRequiresLock?: boolean;
+	value?: string;
+	disabled?: boolean;
+	font?: URL;
+	ref?: InstanceType<typeof MenuList>;
+};
 
 export class DropdownInput extends WidgetProps {
-	entries!: SectionsOfMenuListEntries;
+	entries!: MenuListEntry[][];
 
 	selectedIndex!: number | undefined;
 
@@ -793,16 +793,19 @@ export class UpdateMenuBarLayout extends JsMessage {
 	// TODO: Replace `any` with correct typing
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	@Transform(({ value }: { value: any }) => createMenuLayout(value))
-	layout!: MenuColumn[];
+	layout!: MenuBarEntry[];
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function createMenuLayout(menuLayout: any[]): MenuColumn[] {
-	return menuLayout.map((column) => ({ ...column, children: createMenuLayoutRecursive(column.children) }));
+function createMenuLayout(menuBarEntry: any[]): MenuBarEntry[] {
+	return menuBarEntry.map((entry) => ({
+		...entry,
+		children: createMenuLayoutRecursive(entry.children),
+	}));
 }
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-function createMenuLayoutRecursive(subLayout: any[][]): MenuEntry[][] {
-	return subLayout.map((groups) =>
+function createMenuLayoutRecursive(children: any[][]): MenuBarEntry[][] {
+	return children.map((groups) =>
 		groups.map((entry) => ({
 			...entry,
 			action: hoistWidgetHolders([entry.action])[0],
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 81ec0ceae..e12920246 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -98,11 +98,11 @@ License information is required on production builds. Aborting.`);
 	let licenses = (rustLicenses || []).map((rustLicense) => ({
 		licenseName: htmlDecode(rustLicense.licenseName),
 		licenseText: trimBlankLines(htmlDecode(rustLicense.licenseText)),
-		packages: rustLicense.packages.map((package) => ({
-			name: htmlDecode(package.name),
-			version: htmlDecode(package.version),
-			author: htmlDecode(package.author).replace(/\[(.*), \]/, "$1"),
-			repository: htmlDecode(package.repository),
+		packages: rustLicense.packages.map((packageInfo) => ({
+			name: htmlDecode(packageInfo.name),
+			version: htmlDecode(packageInfo.version),
+			author: htmlDecode(packageInfo.author).replace(/\[(.*), \]/, "$1"),
+			repository: htmlDecode(packageInfo.repository),
 		})),
 	}));
 
@@ -119,7 +119,7 @@ License information is required on production builds. Aborting.`);
 
 	// Delete the internal Graphite crates, which are not third-party and belong elsewhere
 	licenses = licenses.filter((license) => {
-		license.packages = license.packages.filter((package) => !(package.repository && package.repository.includes("github.com/GraphiteEditor/Graphite")));
+		license.packages = license.packages.filter((packageInfo) => !(packageInfo.repository && packageInfo.repository.includes("github.com/GraphiteEditor/Graphite")));
 		return license.packages.length > 0;
 	});
 
@@ -151,8 +151,8 @@ License information is required on production builds. Aborting.`);
 
 	licenses.forEach((license) => {
 		let packagesWithSameLicense = "";
-		license.packages.forEach((package) => {
-			const { name, version, author, repository } = package;
+		license.packages.forEach((packageInfo) => {
+			const { name, version, author, repository } = packageInfo;
 			packagesWithSameLicense += `${name} ${version}${author ? ` - ${author}` : ""}${repository ? ` - ${repository}` : ""}\n`;
 		});
 		packagesWithSameLicense = packagesWithSameLicense.trim();
diff --git a/frontend/wasm/src/editor_api.rs b/frontend/wasm/src/editor_api.rs
index 6d22bc42e..bd34846be 100644
--- a/frontend/wasm/src/editor_api.rs
+++ b/frontend/wasm/src/editor_api.rs
@@ -137,6 +137,12 @@ impl JsEditorHandle {
 		EDITOR_HAS_CRASHED.load(Ordering::SeqCst)
 	}
 
+	/// Answer whether or not the editor is in development mode
+	#[wasm_bindgen(js_name = inDevelopmentMode)]
+	pub fn in_development_mode(&self) -> bool {
+		cfg!(debug_assertions)
+	}
+
 	/// Get the constant `FILE_SAVE_SUFFIX`
 	#[wasm_bindgen(js_name = fileSaveSuffix)]
 	pub fn file_save_suffix(&self) -> String {
@@ -218,12 +224,6 @@ impl JsEditorHandle {
 		self.dispatch(message);
 	}
 
-	#[wasm_bindgen(js_name = requestComingSoonDialog)]
-	pub fn request_coming_soon_dialog(&self, issue: Option<i32>) {
-		let message = DialogMessage::RequestComingSoonDialog { issue };
-		self.dispatch(message);
-	}
-
 	/// Send new bounds when document panel viewports get resized or moved within the editor
 	/// [left, top, right, bottom]...
 	#[wasm_bindgen(js_name = boundsOfViewports)]
@@ -468,6 +468,7 @@ impl JsEditorHandle {
 
 impl Drop for JsEditorHandle {
 	fn drop(&mut self) {
+		// Consider removing after https://github.com/rustwasm/wasm-bindgen/pull/2984 is merged and released
 		EDITOR_INSTANCES.with(|instances| instances.borrow_mut().remove(&self.editor_id));
 	}
 }
diff --git a/graphene/src/layers/vector/subpath.rs b/graphene/src/layers/vector/subpath.rs
index a5ece88a1..f8a81f8cd 100644
--- a/graphene/src/layers/vector/subpath.rs
+++ b/graphene/src/layers/vector/subpath.rs
@@ -148,6 +148,7 @@ impl Subpath {
 		// do row operations to eliminate `a` coefficients
 		c[0] /= -b[0];
 		d[0] /= -b[0];
+		#[allow(clippy::assign_op_pattern)]
 		for i in 1..n {
 			b[i] += c[i - 1];
 			// for some reason the below line makes the borrow checker mad
@@ -160,6 +161,7 @@ impl Subpath {
 		// at this point b[i] == -a[i + 1], a[i] == 0,
 		// do row operations to eliminate 'c' coefficients and solve
 		d[n - 1] *= -1.0;
+		#[allow(clippy::assign_op_pattern)]
 		for i in (0..n - 1).rev() {
 			d[i] = d[i] - (c[i] * d[i + 1]);
 			d[i] *= -1.0; //d[i] /= b[i]
diff --git a/libraries/bezier-rs/src/bezier/core.rs b/libraries/bezier-rs/src/bezier/core.rs
index a1e52b4c9..43572ecba 100644
--- a/libraries/bezier-rs/src/bezier/core.rs
+++ b/libraries/bezier-rs/src/bezier/core.rs
@@ -42,6 +42,7 @@ impl Bezier {
 
 	// TODO: Consider removing this function
 	/// Create a cubic bezier using the provided coordinates as the start, handles, and end points.
+	#[allow(clippy::too_many_arguments)]
 	pub fn from_cubic_coordinates(x1: f64, y1: f64, x2: f64, y2: f64, x3: f64, y3: f64, x4: f64, y4: f64) -> Self {
 		Bezier {
 			start: DVec2::new(x1, y1),
diff --git a/node-graph/gcore/src/raster.rs b/node-graph/gcore/src/raster.rs
index 7772ddb0a..147f712f3 100644
--- a/node-graph/gcore/src/raster.rs
+++ b/node-graph/gcore/src/raster.rs
@@ -52,7 +52,7 @@ mod test {
 
 	#[test]
 	fn map_node() {
-		let array = &mut [Color::from_rgbaf32(1.0, 0.0, 0.0, 1.0).unwrap()];
+		// let array = &mut [Color::from_rgbaf32(1.0, 0.0, 0.0, 1.0).unwrap()];
 		(&GrayscaleNode).eval(Color::from_rgbf32_unchecked(1., 0., 0.));
 		/*let map = ForEachNode(MutWrapper(GrayscaleNode));
 		(&map).eval(array.iter_mut());
diff --git a/node-graph/gstd/src/any.rs b/node-graph/gstd/src/any.rs
index 17f807418..b3fdbaf6d 100644
--- a/node-graph/gstd/src/any.rs
+++ b/node-graph/gstd/src/any.rs
@@ -91,10 +91,10 @@ impl<'n, N: RefNode<Any<'n>, Output = Any<'n>> + 'n> DynNodeOwned<'n> for N {}
 #[cfg(test)]
 mod test {
 	use super::*;
-	use graphene_core::ops::{AddNode, IdNode};
+	use graphene_core::ops::AddNode;
 	use graphene_core::value::ValueNode;
 	/*#[test]
-	pub fn dyn_input_compositon() {
+	pub fn dyn_input_composition() {
 		use graphene_core::structural::After;
 		use graphene_core::structural::ComposeNode;
 		let id: DynAnyNode<_, u32> = DynAnyNode::new(IdNode);
diff --git a/website/other/bezier-rs-demos/wasm/src/lib.rs b/website/other/bezier-rs-demos/wasm/src/lib.rs
index f96209210..3bae2ee3b 100644
--- a/website/other/bezier-rs-demos/wasm/src/lib.rs
+++ b/website/other/bezier-rs-demos/wasm/src/lib.rs
@@ -34,6 +34,13 @@ pub enum WasmMaximizeArcs {
 #[derive(Clone)]
 pub struct WasmBezier(Bezier);
 
+impl Drop for WasmBezier {
+	fn drop(&mut self) {
+		// Is it correct to keep this empty?
+		// Consider removing after https://github.com/rustwasm/wasm-bindgen/pull/2984 is merged and released
+	}
+}
+
 /// Convert a `DVec2` into a `Point`.
 fn vec_to_point(p: &DVec2) -> Point {
 	Point { x: p.x, y: p.y }