Merge pull request #15232 from surajshetty3416/fixes-and-improvements

UI enhancements