update tests
small push
add selectize and simplify templates
some UI changes
fix merges