Dropdown issues

Should fix #20 and fix #23