visual tweaks to dropdown
push
some cleanup
Use key names
Revert "Use key names"

This reverts commit d56cba8a0255d9da0f9cf4c597ea3bad1c75ca02.