Updated Drugs- and MainActivity