Fixed Hovering Issues