almost done positioning drinks section
fixed merge conflict