Fix several issues in Drug
Fix DrugEditActivity