Unified the way a drop-down menu button is clicked (take 2)