Feature/responsive fix

Should be merged after the `feature/drink-view` branch is merged.