Merge pull request #985 from RoanKanninga/master

small bug fixes + added scrollable modal
fixed boolean and autocomplete bug