started to add dropdown
Merged and fixed dropdown