Drink button improvement.
Merged...