Multiple UI fixes for selectors