Multiple UI improvements