many ui improvements