Moved a drink button under button layout.

Merge test with binary files.