HR-394 Modification to roles screen and funding screen
--Tweaks
HR-394 Modification to roles and funding screens
--Tweaks
--Fixes
--Modification to js
--Tweaks
Merge pull request #695 from NileemaJadhav/HR-394-work

HR-394 Modification to roles screen and funding screen