Group and center UI cleanup for demoing to GK

Hi Keith/Vishwas,

This commit included Group and center UI clean for demoing to GK


Regards
Ashok