diff --git a/Cargo.toml b/Cargo.toml
index 5d939a4..6b26d6c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,10 +13,10 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.5.0-beta", features = ["csr"] }
+leptos = { version = "0.5.0-beta2",  features = ["csr"] }
 stylers = { git = "https://github.com/abishekatp/stylers", rev = "4bfd2df" }
 web-sys = { version = "0.3.62", features = ["DomRect"] }
-leptos_dom = { version = "0.5.0-beta" }
+leptos_dom = { version = "0.5.0-beta2" }
 wasm-bindgen = "0.2.85"
 icondata = { version = "0.0.7", features = [
     "AiCloseOutlined",
diff --git a/gh-pages/Cargo.toml b/gh-pages/Cargo.toml
index 90fdc01..8ce4aa6 100644
--- a/gh-pages/Cargo.toml
+++ b/gh-pages/Cargo.toml
@@ -6,12 +6,12 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-leptos = { version = "0.5.0-beta", features = ["csr"] }
+leptos = { version = "0.5.0-beta2", features = ["csr"] }
 melt-ui = { path = "../" }
 icondata = { version = "0.0.7", features = [
     "AiCloseOutlined",
     "AiCheckOutlined",
 ] }
-leptos_router = { version = "0.5.0-beta", features = ["csr"] }
+leptos_router = { version = "0.5.0-beta2", features = ["csr"] }
 indoc = "2.0.1"
 regex = "1.8.2"
diff --git a/gh-pages/src/app.rs b/gh-pages/src/app.rs
index 98fb360..1a130da 100644
--- a/gh-pages/src/app.rs
+++ b/gh-pages/src/app.rs
@@ -10,12 +10,6 @@ pub fn App() -> impl IntoView {
                 <Route path="/" view=move || view! {
                     <Home />
                 } />
-                <Route path="/menu" view=move || view! {
-                    <MenuPage />
-                } />
-                <Route path="/slider" view=move || view! {
-                    <SliderPage />
-                } />
                 <Route path="/components" view=move || view! {
                     <ComponentsPage />
                 } >
@@ -56,15 +50,13 @@ pub fn App() -> impl IntoView {
                         <SelectPage />
                     } />
                 </Route>
-            </Routes>
-            <Routes base="/melt-ui/mobile".to_string()>
-                <Route path="/tabbar" view=move || view! {
+                <Route path="/mobile/tabbar" view=move || view! {
                     <TabbarPage />
                 } />
-                <Route path="/nav-bar" view=move || view! {
+                <Route path="/mobile/nav-bar" view=move || view! {
                     <NavBarPage />
                 } />
-                <Route path="/toast" view=move || view! {
+                <Route path="/mobile/toast" view=move || view! {
                     <ToastPage />
                 } />
             </Routes>
diff --git a/src/icon/mod.rs b/src/icon/mod.rs
index 54c6d2b..7309210 100644
--- a/src/icon/mod.rs
+++ b/src/icon/mod.rs
@@ -45,19 +45,19 @@ pub fn Icon(
     svg = svg.attr(
         "width",
         Attribute::String(match (width, icon.width) {
-            (Some(a), Some(_b)) => std::borrow::Cow::from(a.get()),
-            (Some(a), None) => std::borrow::Cow::from(a.get()),
-            (None, Some(_b)) => std::borrow::Cow::from("1em"),
-            (None, None) => std::borrow::Cow::from("1em"),
+            (Some(a), Some(_b)) => Oco::from(a.get()),
+            (Some(a), None) => Oco::from(a.get()),
+            (None, Some(_b)) => Oco::from("1em"),
+            (None, None) => Oco::from("1em"),
         }),
     );
     svg = svg.attr(
         "height",
         Attribute::String(match (height, icon.height) {
-            (Some(a), Some(_b)) => std::borrow::Cow::from(a.get()),
-            (Some(a), None) => std::borrow::Cow::from(a.get()),
-            (None, Some(_b)) => std::borrow::Cow::from("1em"),
-            (None, None) => std::borrow::Cow::from("1em"),
+            (Some(a), Some(_b)) => Oco::from(a.get()),
+            (Some(a), None) => Oco::from(a.get()),
+            (None, Some(_b)) => Oco::from("1em"),
+            (None, None) => Oco::from("1em"),
         }),
     );
     if let Some(view_box) = icon.view_box {
diff --git a/src/theme/common.rs b/src/theme/common.rs
index 76e2897..7f3bbf4 100644
--- a/src/theme/common.rs
+++ b/src/theme/common.rs
@@ -31,24 +31,20 @@ impl CommonTheme {
     fn common() -> Self {
         Self {
             font_family: "-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,'Noto Sans',sans-serif,'Apple Color Emoji','Segoe UI Emoji','Segoe UI Symbol','Noto Color Emoji'".into(),
-            
             color_primary: "".into(),
             color_success: "".into(),
             color_warning: "".into(),
             color_error: "".into(),
-
             font_size: "14px".into(),
             font_size_small: "12px".into(),
             font_size_medium: "16px".into(),
             font_size_large: "20px".into(),
             font_size_huge: "24px".into(),
-
             line_height: "22px".into(),
             line_height_small: "20px".into(),
             line_height_medium: "24px".into(),
             line_height_large: "28px".into(),
             line_height_huge: "32px".into(),
-
             border_radius: "3px".into(),
             border_radius_small: "2px".into(),
             border_radius_medium: "4px".into(),