--HR-359 change for edit screen
--HR-359 fix for view page
Merge pull request #660 from PoonamNalawade/hr359

--HR-359 change for edit screen