Multiple UI fixes