re-wrote dropdown
removed unneeded fn
merged