diff --git a/color.go b/color.go
index 4e6aa95..4ba4f0b 100644
--- a/color.go
+++ b/color.go
@@ -11,7 +11,8 @@ type (
 	BeadColor struct {
 		Checkbox        *walk.CheckBox
 		backgroundColor walk.Brush
-		tooltip         walk.ToolTip
+		InfoTooltip     *walk.ToolTip
+		WarningTooltip  *walk.ToolTip
 		info            *walk.ImageView
 		warning         *walk.ImageView
 		Brand           string
@@ -37,7 +38,7 @@ func LoadBeads(mw *MyMainWindow) {
 					for _, bead := range series.Beads.Color {
 						log.Println("Loading bead: " + bead.ColorName + " ...")
 						if !bead.Disabled {
-							bc := NewBeadColor(mw, bead.ColorName, bead.ColorIndex, bead.Red, bead.Green, bead.Blue)
+							bc := NewBeadColor(mw, bead.ColorName, bead.ColorIndex, bead.OnHand, bead.Red, bead.Green, bead.Blue)
 							bc.Brand = brand.BrandName
 							bc.Series = series.SerieName
 							bc.Weight = series.Weight
@@ -47,10 +48,13 @@ func LoadBeads(mw *MyMainWindow) {
 							bc.Green = bead.Green
 							bc.Blue = bead.Blue
 							bc.inStock = bead.InStock
-							bc.onHand = bead.OnHand
 							mw.beads = append(mw.beads, bc)
 							if bead.OnHand <= 200 {
 								bc.warning.SetVisible(true)
+								bc.info.SetVisible(false)
+							} else {
+								bc.warning.SetVisible(false)
+								bc.info.SetVisible(true)
 							}
 						}
 					}
@@ -60,7 +64,7 @@ func LoadBeads(mw *MyMainWindow) {
 	}
 }
 
-func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, blue byte) *BeadColor {
+func NewBeadColor(mw *MyMainWindow, name string, id int, onhand int, red byte, green byte, blue byte) *BeadColor {
 	var err error
 	log.Println("Creating bead color: " + name + " ...")
 	cm, _ := walk.NewComposite(mw.colors)
@@ -71,6 +75,7 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
 	color := new(BeadColor)
 	log.Println("Bead color struct: ", color)
 	color.SetBackgroundColor(walk.RGB(red, green, blue))
+	color.onHand = onhand
 	log.Println("Creating checkbox")
 	color.Checkbox, err = walk.NewCheckBox(cm)
 	if err != nil {
@@ -83,15 +88,27 @@ func NewBeadColor(mw *MyMainWindow, name string, id int, red byte, green byte, b
 	walk.NewHSpacer(cm)
 	color.info, err = walk.NewImageView(cm)
 	if err != nil {
-		log.Println("Error creating image view: ", err)
+		log.Println("Error creating info image view: ", err)
 	}
+	//Setup info tooltip
+	color.InfoTooltip, _ = walk.NewToolTip()
+	color.InfoTooltip.SetInfoTitle("On hand")
 	color.info.SetImage(walk.IconInformation())
+	color.InfoTooltip.AddTool(color.info)
+	color.InfoTooltip.SetText(color.info, "Approx. "+fmt.Sprint(color.onHand)+" left on hand")
+	color.info.SetVisible(false)
 	color.warning, err = walk.NewImageView(cm)
 	if err != nil {
-		log.Println("Error creating image view: ", err)
+		log.Println("Error creating warning image view: ", err)
 	}
+	//Setup warning tooltip
+	color.WarningTooltip, _ = walk.NewToolTip()
+	color.WarningTooltip.SetWarningTitle("Low on hand")
 	color.warning.SetImage(walk.IconWarning())
+	color.WarningTooltip.AddTool(color.warning)
+	color.WarningTooltip.SetText(color.warning, "Only "+fmt.Sprint(color.onHand)+" left on hand")
 	color.warning.SetVisible(false)
+
 	lbl, _ := walk.NewLabel(cm)
 	lbl.SetText(fmt.Sprint("Color ID: ", id))
 	cm.SetBackground(color.backgroundColor)
@@ -120,6 +137,6 @@ func (bc *BeadColor) GetColorID() int {
 }
 
 func (bc *BeadColor) AddOnHand(grams int) {
-	addbeads := bc.Weight * grams / 1000
+	addbeads := grams / bc.Weight * 1000
 	bc.onHand += int(addbeads)
 }
diff --git a/main.go b/main.go
index 8465a38..a35ef4a 100644
--- a/main.go
+++ b/main.go
@@ -28,7 +28,7 @@ type MyMainWindow struct {
 
 const (
 	AppName   string = "BeadImager"
-	Version   string = "0.0.24"
+	Version   string = "0.0.25"
 	CopyRight string = "©2022 Jan Lerking"
 	STD_MESS  string = "Ready"
 	LogFile   string = "BeadImager.log"
@@ -172,7 +172,7 @@ func main() {
 				Children: []Widget{
 					Composite{
 						Layout:  VBox{MarginsZero: true},
-						MaxSize: Size{260, 0},
+						MaxSize: Size{280, 0},
 						Children: []Widget{
 							DD_Pallette,
 							DD_Beads,
@@ -199,7 +199,7 @@ func main() {
 					GroupBox{
 						Title:   "Settings",
 						Layout:  VBox{},
-						MaxSize: Size{260, 0},
+						MaxSize: Size{220, 0},
 						Children: []Widget{
 							ScrollView{
 								AssignTo: &mw.propScroll,
diff --git a/pallettes/pallette.xml b/pallettes/pallette.xml
index 1d8ddff..1c9b939 100644
--- a/pallettes/pallette.xml
+++ b/pallettes/pallette.xml
@@ -759,7 +759,7 @@
                             <isGrayscale>false</isGrayscale>
                             <disabled>false</disabled>
                             <inStock>true</inStock>
-                            <onHand>100</onHand>
+                            <onHand>500</onHand>
                         </color>
                         <color colorIndex="56">
                             <colorname>Flourecent red</colorname>
@@ -774,7 +774,7 @@
                             <isGrayscale>false</isGrayscale>
                             <disabled>false</disabled>
                             <inStock>true</inStock>
-                            <onHand>100</onHand>
+                            <onHand>500</onHand>
                         </color>
                         <color colorIndex="57">
                             <colorname>Flourecent blue</colorname>
@@ -789,7 +789,7 @@
                             <isGrayscale>false</isGrayscale>
                             <disabled>false</disabled>
                             <inStock>true</inStock>
-                            <onHand>100</onHand>
+                            <onHand>500</onHand>
                         </color>
                         <color colorIndex="60">
                             <colorname>Teddybear brown</colorname>
@@ -834,7 +834,7 @@
                             <isGrayscale>false</isGrayscale>
                             <disabled>false</disabled>
                             <inStock>true</inStock>
-                            <onHand>100</onHand>
+                            <onHand>500</onHand>
                         </color>
                         <color colorIndex="63">
                             <colorname>Bronze</colorname>