Merge pull request #560 from nutan-gooru/dev-branch

fixed css issue
fixed tag issue
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch