fix dropdown menu
Merge remote-tracking branch 'zhen/master'