Add tooltips for servings
Merge and rebuild