Integrated UI for unitsetup using widget.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1541 from VinRudramurthy/dev-branch

Integrated UI for unitsetup using widget.