dev/ui improvements

See #4