Fixed UI: several popup have issues
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1181 from nutan-gooru/dev-branch

Fixed UI: several popup have issues