ui-dev branch + working modal search

and with some unused files removed