Group and center UI code cleanup for demoing to GK

Hi Vishwas,

This commit includes Group and center UI code cleanup for demoing to GK.

Regards
Ashok