Rectified UI issues in unit setup.
Rectified Ui issue and pagination issue.
Merge branch 'dev-branch' of https://github.com/Gooru/Gooru-Web into dev-branch
Merge pull request #1633 from VinRudramurthy/dev-branch

	Rectified Ui issue and pagination issue.