Fixed some bugs on dropdown