Fixes #18

but it's messy. Didn't have the brains to figure out something
cleaner tonight.
Cleans up more dropdown remnants