fixed UI changes
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
resolved conflict
Merge pull request #704 from nutan-gooru/dev-branch

fixed UI changes