Fixing issues with Drop Down selector in UI