UI tweaks. Now have drop-down.