change cost to dropdown menu
merge origin master