Fix responsiveness of bottle
Refactor JS