Fix dropdown menu bug
Merge origin/master