implemented UI for following
resolved conflicts
Merge pull request #490 from nutan-gooru/dev-branch

Implemented UI for following