re-organized dropdown
Merge finish