many ui improvements and fixes