Content and style changes

Change-Id: Ib131fcea556c674ee3f7f426b7e42b78659500d0