Pridavanie/Update Bottle Type + some bug fixes