Merge pull request #16273 from surajshetty3416/general-ui-fixes

General UI fixes and changes