update claims dictionary and update popups
Merge pull request #35 from hashinisenaratne/master

update claims dictionary and update popups