edit dropdowns
Merge branch 'pr-19'