Merge pull request #3675 from ussuri/ui-adjustments

UI adjustments