--HR-394 Fix for navigation error on roles screen
--Funding templates minor changes
Merge pull request #716 from NileemaJadhav/HR-14-fixes

--HR-394 Fix for navigation error on roles screen