Multiple UI fixes for selectors
Merge pull request #52 from dpanov/development

Multiple UI fixes for selectors