Various UI improvements and fixes