Made Bottle class better, did stuff to ViewBottleActivity
wtf