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

UI/UX fixes and improvements