HTML changes to make styling with CSS easier

Change-Id: Ifbcc20aa2c64002f48237ec3bbd578a1bdc04d2f
Merge "HTML changes to make styling with CSS easier"