ui improvements + issue #3 fixed