#1776 and #1722 dropdown position issue
Merge pull request #1777 from yonjah/master

#1776 and #1722 dropdown position issue