Finished text groups

Change-Id: I946da5db3defe175fa2ef0fcf97e17ae8880f41b