add js dropdown
merge chagnes