ui improvements and fixes