diff --git a/thaw/src/drawer/mod.rs b/thaw/src/drawer/mod.rs
index cca2b93..aa872bf 100644
--- a/thaw/src/drawer/mod.rs
+++ b/thaw/src/drawer/mod.rs
@@ -113,8 +113,8 @@ pub fn Drawer(
                     >
                         <div
                             class=class_list![
-                                "thaw-drawer", move || format!("thaw-drawer--placement-{}", placement
-                                .get()), class.map(| c | move || c.get())
+                                "thaw-drawer", move || format!("thaw-drawer--placement-{}",
+                                placement.get()), class.map(| c | move || c.get())
                             ]
 
                             style=move || display.get()
diff --git a/thaw/src/layout/mod.rs b/thaw/src/layout/mod.rs
index 0adf4e2..6fef62b 100644
--- a/thaw/src/layout/mod.rs
+++ b/thaw/src/layout/mod.rs
@@ -58,6 +58,7 @@ pub fn Layout(
                     )
                 })
             >
+
                 {children()}
             </Scrollbar>
         </div>
diff --git a/thaw/src/modal/mod.rs b/thaw/src/modal/mod.rs
index 4d94be2..396ad7d 100644
--- a/thaw/src/modal/mod.rs
+++ b/thaw/src/modal/mod.rs
@@ -64,7 +64,7 @@ pub fn Modal(
     });
 
     view! {
-         <Teleport immediate=show.signal()>
+        <Teleport immediate=show.signal()>
             <FocusTrap disabled=!close_on_esc active=show.signal() on_esc>
                 <div
                     class="thaw-modal-container"
@@ -73,7 +73,13 @@ pub fn Modal(
                 >
                     <Scrollbar
                         content_style="min-height: 100%; display: flex;"
-                        style=Signal::derive(move || if displayed.get() { String::new() } else { String::from("display: none") })
+                        style=Signal::derive(move || {
+                            if displayed.get() {
+                                String::new()
+                            } else {
+                                String::from("display: none")
+                            }
+                        })
                         comp_ref=scrollbar_ref
                     >
                         <CSSTransition
diff --git a/thaw/src/scrollbar/mod.rs b/thaw/src/scrollbar/mod.rs
index 581eb0f..6b801ab 100644
--- a/thaw/src/scrollbar/mod.rs
+++ b/thaw/src/scrollbar/mod.rs
@@ -291,12 +291,14 @@ pub fn Scrollbar(
                     class=class_list![
                         "thaw-scrollbar__content", content_class.map(| c | move || c.get())
                     ]
+
                     style=move || {
                         format!(
                             "width: fit-content; {}",
                             content_style.as_ref().map_or(String::new(), |s| s.get()),
                         )
                     }
+
                     ref=content_ref
                 >
                     {children()}
diff --git a/thaw_components/src/focus_trap/mod.rs b/thaw_components/src/focus_trap/mod.rs
index 7bc8b56..4dfab3a 100644
--- a/thaw_components/src/focus_trap/mod.rs
+++ b/thaw_components/src/focus_trap/mod.rs
@@ -1,9 +1,8 @@
-use leptos::{leptos_dom::helpers::WindowListenerHandle, *};
-use std::cell::RefCell;
+use leptos::*;
 
 #[cfg(any(feature = "csr", feature = "hydrate"))]
 thread_local! {
-    static STACK: RefCell<Vec<uuid::Uuid>> = Default::default();
+    static STACK: std::cell::RefCell<Vec<uuid::Uuid>> = Default::default();
 }
 
 #[component]
@@ -15,6 +14,7 @@ pub fn FocusTrap(
 ) -> impl IntoView {
     #[cfg(any(feature = "csr", feature = "hydrate"))]
     if disabled == false {
+        use leptos::leptos_dom::helpers::WindowListenerHandle;
         let esc_handle = StoredValue::new(None::<WindowListenerHandle>);
         let id = StoredValue::new(uuid::Uuid::new_v4());
 
@@ -55,5 +55,12 @@ pub fn FocusTrap(
         });
     }
 
+    #[cfg(not(any(feature = "csr", feature = "hydrate")))]
+    {
+        let _ = disabled;
+        let _ = active;
+        let _ = on_esc;
+    }
+
     children()
 }
diff --git a/thaw_components/src/teleport/mod.rs b/thaw_components/src/teleport/mod.rs
index afd547c..5c2b653 100644
--- a/thaw_components/src/teleport/mod.rs
+++ b/thaw_components/src/teleport/mod.rs
@@ -60,17 +60,7 @@ pub fn Teleport(
     } else {
         let _ = mount;
         let _ = immediate;
-        #[cfg(not(feature = "ssr"))]
-        {
-            let _ = element;
-            let _ = children;
-        }
-        #[cfg(feature = "ssr")]
-        if element.is_none() {
-            if let Some(children) = children {
-                // Consumed hydration `id`
-                let _ = children();
-            }
-        }
+        let _ = element;
+        let _ = children;
     }}
 }