Adjust CSS classes

Change-Id: I4f63d15b708177a92889c79acfb44fe06b778729
Merge "Adjust CSS classes"