various ui improvements and fixes