Merge pull request #717 from NileemaJadhav/HR-14-fixes

--HR-394 Total pay modification on pay screen
--HR-394 Tweaks for roles screen bug