improves
improve drop buttons logic