refactor addition of multi-select option
tweak UI code
update submodule