Modified HTML structure for GCP-8963

Reviewer:
Dan Jao