Group and center UI code cleanup for demoing to GK
Merge pull request #235 from ashok-conflux/groupcodecleanup

Group and center UI code cleanup for demoing to GK