--HR-394 Tweaks for roles screen bug
Merge pull request #718 from NileemaJadhav/HR-14-fixes

--HR-394 Tweaks for roles screen bug