fixed drop down form
merge conflicts
show view