more tests
ui improvements