fix tests
ui tweaks