|#673|+Shibha| UI changes for edit role and user-admin-role assignment