UI improvements and fixes