Add UI improvements and fixes