diff --git a/src/grid/grid_item.rs b/src/grid/grid_item.rs
index 3fef57c..232a923 100644
--- a/src/grid/grid_item.rs
+++ b/src/grid/grid_item.rs
@@ -4,7 +4,7 @@ use leptos::*;
 #[component]
 pub fn GridItem(
     #[prop(default = MaybeSignal::Static(1u16), into)] column: MaybeSignal<u16>,
-    #[prop(optional, into)] offset: MaybeSignal<i32>,
+    #[prop(optional, into)] offset: MaybeSignal<u16>,
     children: Children,
 ) -> impl IntoView {
     let grid = use_grid();
@@ -12,7 +12,7 @@ pub fn GridItem(
     let style = create_memo(move |_| {
         let mut style = String::new();
         let offset = offset.get();
-        let column = i32::from(column.get());
+        let column = column.get();
         let x_gap = grid.x_gap.get();
 
         if offset > 0 {
diff --git a/src/grid/mod.rs b/src/grid/mod.rs
index 16b5dfd..b058427 100644
--- a/src/grid/mod.rs
+++ b/src/grid/mod.rs
@@ -6,8 +6,8 @@ use leptos::*;
 #[component]
 pub fn Grid(
     #[prop(default = MaybeSignal::Static(1u16), into)] cols: MaybeSignal<u16>,
-    #[prop(optional, into)] x_gap: MaybeSignal<i32>,
-    #[prop(optional, into)] y_gap: MaybeSignal<i32>,
+    #[prop(optional, into)] x_gap: MaybeSignal<u16>,
+    #[prop(optional, into)] y_gap: MaybeSignal<u16>,
     children: Children,
 ) -> impl IntoView {
     let grid_injection_key = GridInjection::new(x_gap);
@@ -32,11 +32,11 @@ pub fn Grid(
 
 #[derive(Clone)]
 pub(crate) struct GridInjection {
-    x_gap: MaybeSignal<i32>,
+    x_gap: MaybeSignal<u16>,
 }
 
 impl GridInjection {
-    pub fn new(x_gap: MaybeSignal<i32>) -> Self {
+    pub fn new(x_gap: MaybeSignal<u16>) -> Self {
         Self { x_gap }
     }
 }