diff --git a/src/main/java/org/betterx/ui/layout/components/AbstractStack.java b/src/main/java/org/betterx/ui/layout/components/AbstractStack.java
index d2a338d2..dc1fc991 100644
--- a/src/main/java/org/betterx/ui/layout/components/AbstractStack.java
+++ b/src/main/java/org/betterx/ui/layout/components/AbstractStack.java
@@ -117,6 +117,7 @@ public abstract class AbstractStack<R extends ComponentRenderer, T extends Abstr
     public void setFocused(@Nullable GuiEventListener guiEventListener) {
         focused = guiEventListener;
     }
+    
 
     public Image addIcon(ResourceLocation location, Size resourceSize) {
         Image i = new Image(Value.fixed(24), Value.fixed(24), location, resourceSize);
@@ -222,5 +223,16 @@ public abstract class AbstractStack<R extends ComponentRenderer, T extends Abstr
         add(c);
         return c;
     }
+
+    public ColorPicker addColorPicker(
+            Value width,
+            Value height,
+            net.minecraft.network.chat.Component titleOrNull,
+            int color
+    ) {
+        ColorPicker c = new ColorPicker(width, height, titleOrNull, color);
+        add(c);
+        return c;
+    }
 }
 
diff --git a/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java b/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java
index 24a7188f..59a4a7e0 100644
--- a/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java
+++ b/src/main/java/org/betterx/ui/layout/components/AbstractVanillaComponent.java
@@ -135,7 +135,7 @@ public abstract class AbstractVanillaComponent<C extends AbstractWidget, V exten
     @Override
     public boolean isMouseOver(double x, double y) {
         if (vanillaComponent != null && enabled)
-            return vanillaComponent.isMouseOver(x, y);
+            return vanillaComponent.isMouseOver(x - relativeBounds.left, y - relativeBounds.top);
         return false;
     }
 
diff --git a/src/main/java/org/betterx/ui/layout/components/Input.java b/src/main/java/org/betterx/ui/layout/components/Input.java
index 6e599aba..ce07475a 100644
--- a/src/main/java/org/betterx/ui/layout/components/Input.java
+++ b/src/main/java/org/betterx/ui/layout/components/Input.java
@@ -88,4 +88,9 @@ public class Input extends AbstractVanillaComponent<EditBox, Input> {
     public boolean changeFocus(boolean bl) {
         return super.changeFocus(bl);
     }
+
+    @Override
+    public boolean mouseClicked(double x, double y, int button) {
+        return super.mouseClicked(x, y, button);
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/Panel.java b/src/main/java/org/betterx/ui/layout/components/Panel.java
index cbc5d76c..9dae2761 100644
--- a/src/main/java/org/betterx/ui/layout/components/Panel.java
+++ b/src/main/java/org/betterx/ui/layout/components/Panel.java
@@ -100,15 +100,6 @@ public class Panel implements ComponentWithBounds, RelativeContainerEventHandler
         }
     }
 
-    @Override
-    public boolean isMouseOver(double x, double y) {
-        if (child != null) {
-            if (child.isMouseOver(x - bounds.left, y - bounds.top))
-                return true;
-        }
-        return bounds.contains(x, y);
-    }
-
 //    @Override
 //    public void mouseMoved(double x, double y) {
 //        if (child != null)
diff --git a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
index 41edd1a4..9a198d22 100644
--- a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
+++ b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
@@ -255,13 +255,14 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
             );
         }
         if (!didCapture) {
-            scrollerY = scrollerY + delta;
+            scrollerY = Math.max(0, Math.min(travel, scrollerY)) + delta;
             return true;
+        } else {
+            System.out.println("Child did capture scroll");
         }
         return false;
     }
 
-
     GuiEventListener focused;
 
     @Nullable
@@ -283,7 +284,6 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
         dragging = bl;
     }
 
-
     @Override
     public boolean isMouseOver(double x, double y) {
         if (child != null) {
@@ -292,6 +292,4 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
         }
         return relativeBounds.contains(x, y);
     }
-
-
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java b/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
index 655d813f..0921796c 100644
--- a/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
+++ b/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
@@ -16,10 +16,13 @@ public interface RelativeContainerEventHandler extends ContainerEventHandler {
 
     default Optional<GuiEventListener> getChildAt(double d, double e) {
         Rectangle r = getInputBounds();
-        return ContainerEventHandler.super.getChildAt(d - r.left, e - r.top);
+        return ContainerEventHandler.super.getChildAt(d, e);
     }
 
     default boolean mouseClicked(double d, double e, int i) {
+        if (getFocused() != null) {
+            getFocused().mouseClicked(d, e, i);
+        }
         Rectangle r = getInputBounds();
         return ContainerEventHandler.super.mouseClicked(d - r.left, e - r.top, i);
     }