fix and change dropdown behavior